From bbad6ad29aab4c1aab253d3a33adecffb0e37960 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Thu, 30 Aug 2018 10:52:10 -0500 Subject: Add OCMB_CHIP and MEM_PORT fapi2 test cases This commit adds test cases for new OCMB_CHIP and MEM_PORT target types that are being added to support the new explorer memory buffer used in Axone. Also this commit fixed up the Axone target generation which was missing a break on the inner loop and removed some changes that were made in target.H which was allowing invalid parets to be looked up for dimm targets. RTC: 172970 Change-Id: I7564fbcfcdde2177ece934015fe40c79011f559f Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65511 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Matt Derksen Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- src/include/usr/fapi2/target.H | 61 ++++++++++-------------------------------- 1 file changed, 14 insertions(+), 47 deletions(-) (limited to 'src/include') diff --git a/src/include/usr/fapi2/target.H b/src/include/usr/fapi2/target.H index 451637196..b67c1187d 100644 --- a/src/include/usr/fapi2/target.H +++ b/src/include/usr/fapi2/target.H @@ -445,27 +445,13 @@ inline Target Target::getParent(void) const // Specific parent checks for each TargetType // valid parents for DIMM - // DIMM -> MEMPORT - // DIMM -> OCMB - // DIMM -> OMI - // DIMM -> OMIC - // DIMM -> MCC - // DIMM -> MI - // DIMM -> MC - // DIMM -> PROC_CHIP // DIMM -> MCA // DIMM -> MBA + // DIMM -> MEM_PORT static_assert(!((T_SELF == fapi2::TARGET_TYPE_DIMM) && (K_PARENT != fapi2::TARGET_TYPE_MCA) && (K_PARENT != fapi2::TARGET_TYPE_MBA) && - (K_PARENT != fapi2::TARGET_TYPE_OCMB_CHIP) && - (K_PARENT != fapi2::TARGET_TYPE_SYSTEM) && - (K_PARENT != fapi2::TARGET_TYPE_OMI) && - (K_PARENT != fapi2::TARGET_TYPE_MCC) && - (K_PARENT != fapi2::TARGET_TYPE_MI) && - (K_PARENT != fapi2::TARGET_TYPE_MC) && - (K_PARENT != fapi2::TARGET_TYPE_OMIC) && - (K_PARENT != fapi2::TARGET_TYPE_PROC_CHIP)), + (K_PARENT != fapi2::TARGET_TYPE_MEM_PORT)), "improper parent of fapi2::TARGET_TYPE_DIMM"); // valid parents for PROC @@ -485,39 +471,15 @@ inline Target Target::getParent(void) const // valid parents for OCMB // OCMB -> SYSTEM // OCMB -> OMI - // OCMB -> MCC - // OCMB -> MI - // OCMB -> MC - // OCMB -> OMIC - // OCMB -> PROC_CHIP static_assert(!((T_SELF == fapi2::TARGET_TYPE_OCMB_CHIP) && (K_PARENT != fapi2::TARGET_TYPE_SYSTEM) && - (K_PARENT != fapi2::TARGET_TYPE_OMI) && - (K_PARENT != fapi2::TARGET_TYPE_MCC) && - (K_PARENT != fapi2::TARGET_TYPE_MI) && - (K_PARENT != fapi2::TARGET_TYPE_MC) && - (K_PARENT != fapi2::TARGET_TYPE_OMIC) && - (K_PARENT != fapi2::TARGET_TYPE_PROC_CHIP)), + (K_PARENT != fapi2::TARGET_TYPE_OMI)), "improper parent of fapi2::TARGET_TYPE_OCMB_CHIP"); // valid parents for MEM_PORT - // MEM_PORT -> SYSTEM // MEM_PORT -> OCMB_CHIP - // MEM_PORT -> OMI - // MEM_PORT -> MCC - // MEM_PORT -> MI - // MEM_PORT -> MC - // MEM_PORT -> OMIC - // MEM_PORT -> PROC_CHIP static_assert(!((T_SELF == fapi2::TARGET_TYPE_MEM_PORT) && - (K_PARENT != fapi2::TARGET_TYPE_SYSTEM) && - (K_PARENT != fapi2::TARGET_TYPE_OCMB_CHIP) && - (K_PARENT != fapi2::TARGET_TYPE_OMI) && - (K_PARENT != fapi2::TARGET_TYPE_MCC) && - (K_PARENT != fapi2::TARGET_TYPE_MI) && - (K_PARENT != fapi2::TARGET_TYPE_MC) && - (K_PARENT != fapi2::TARGET_TYPE_OMIC) && - (K_PARENT != fapi2::TARGET_TYPE_PROC_CHIP)), + (K_PARENT != fapi2::TARGET_TYPE_OCMB_CHIP)), "improper parent of fapi2::TARGET_TYPE_MEM_PORT"); // valid parents for EX @@ -845,10 +807,11 @@ inline std::vector > // valid children for system // SYSTEM -> PROC // SYSTEM -> MEMBUF - // SYSTEM -> DIMM ??? disabled for now + // SYSTEM -> OCMB_CHIP static_assert(!((T_SELF == fapi2::TARGET_TYPE_SYSTEM) && (K_CHILD != fapi2::TARGET_TYPE_PROC_CHIP) && - (K_CHILD != fapi2::TARGET_TYPE_MEMBUF_CHIP)), + (K_CHILD != fapi2::TARGET_TYPE_MEMBUF_CHIP) && + (K_CHILD != fapi2::TARGET_TYPE_OCMB_CHIP)), "improper child of fapi2::TARGET_TYPE_SYSTEM"); // valid children for EQ @@ -917,6 +880,12 @@ inline std::vector > (K_CHILD != fapi2::TARGET_TYPE_OMI)), "improper child of fapi2::TARGET_TYPE_MCC"); + // valid children for OMI + // OMI -> OCMB + static_assert(!((T_SELF == fapi2::TARGET_TYPE_OMI) && + (K_CHILD != fapi2::TARGET_TYPE_OCMB_CHIP)), + "improper child of fapi2::TARGET_TYPE_OMI"); + // valid children for OMIC // OMIC -> OMI static_assert(!((T_SELF == fapi2::TARGET_TYPE_OMIC) && @@ -925,10 +894,8 @@ inline std::vector > // valid children for OCMB // OCMB -> MEM_PORT - // OCMB -> DIMM static_assert(!((T_SELF == fapi2::TARGET_TYPE_OCMB_CHIP) && - (K_CHILD != fapi2::TARGET_TYPE_MEM_PORT) && - (K_CHILD != fapi2::TARGET_TYPE_DIMM)), + (K_CHILD != fapi2::TARGET_TYPE_MEM_PORT)), "improper child of fapi2::TARGET_TYPE_OCMB_CHIP"); // valid children for MEM_PORT -- cgit v1.2.3