diff options
| -rw-r--r-- | src/usr/fapi2/plat_utils.C | 6 | ||||
| -rw-r--r-- | src/usr/fapi2/test/fapi2GetChildrenTest.H | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C index e6445e219..e340b2d60 100644 --- a/src/usr/fapi2/plat_utils.C +++ b/src/usr/fapi2/plat_utils.C @@ -997,6 +997,8 @@ void processEICDGs(const ErrorInfo & i_errInfo, /// For DIMMs: DIMM Socket Number /// For Chips: Chip Position /// For Chiplets: Chiplet Position +/// @param[o] o_childTargets List of child targets matching input +/// criteria. /// void getChildTargetsForCDG( const fapi2::Target<fapi2::TARGET_TYPE_ALL>& i_parentTarget, @@ -1081,11 +1083,11 @@ void getChildTargetsForCDG( // Match i_childPort and i_childNum if ( ((i_childPort == ErrorInfoChildrenCDG::ALL_CHILD_PORTS) || (i_childPort == - (*l_itr)->getAttr<TARGETING::ATTR_MBA_PORT>())) + (*l_itr)->getAttr<TARGETING::ATTR_CEN_MBA_PORT>())) && ((i_childNum == ErrorInfoChildrenCDG::ALL_CHILD_NUMBERS) || (i_childNum == - (*l_itr)->getAttr<TARGETING::ATTR_MBA_DIMM>())) ) + (*l_itr)->getAttr<TARGETING::ATTR_CEN_MBA_DIMM>())) ) { o_childTargets.push_back(*l_itr); } diff --git a/src/usr/fapi2/test/fapi2GetChildrenTest.H b/src/usr/fapi2/test/fapi2GetChildrenTest.H index 4f012812a..5d2fac45f 100644 --- a/src/usr/fapi2/test/fapi2GetChildrenTest.H +++ b/src/usr/fapi2/test/fapi2GetChildrenTest.H @@ -911,6 +911,8 @@ void test_fapi2getChildTargetsForCDG() TARGETING::Target * l_cumulusProc = nullptr; TARGETING::Target * l_proc = nullptr; size_t l_expectedDimms = 0; + size_t l_expectedDimmsUnderPort0 = 0; + size_t l_expectedDimmsUnderPort1 = 0; do { FAPI_DBG("start of test_fapi2getChildTargetsForCDG()"); @@ -929,12 +931,16 @@ void test_fapi2getChildTargetsForCDG() { l_proc = l_nimbusProc; l_expectedDimms = 16; - + l_expectedDimmsUnderPort0 = l_expectedDimms; + l_expectedDimmsUnderPort1 = 0; } else if (l_cumulusProc != nullptr) { l_proc = l_cumulusProc; l_expectedDimms = 8; + l_expectedDimmsUnderPort0 = l_expectedDimms/2; + l_expectedDimmsUnderPort1 = l_expectedDimms/2; + } else //both are nullptr { @@ -973,10 +979,11 @@ void test_fapi2getChildTargetsForCDG() FAPI_INF("test_fapi2getChildTargetsForCDG: Dimms under proc 0x%.08X port 0 is %d", TARGETING::get_huid(l_proc),l_dimmList.size()); numTests++; - if(l_dimmList.size() != l_expectedDimms) + + if(l_dimmList.size() != l_expectedDimmsUnderPort0) { FAPI_ERR("test_fapi2getChildTargetsForCDG: Dimm count %d under port 0 not equal expected %d", - l_dimmList.size(),l_expectedDimms); + l_dimmList.size(),l_expectedDimmsUnderPort0); numFails++; } @@ -989,10 +996,11 @@ void test_fapi2getChildTargetsForCDG() FAPI_INF("test_fapi2getChildTargetsForCDG: Dimms under proc 0x%.08X port 1 is %d", TARGETING::get_huid(l_proc),l_dimmList.size()); numTests++; - if(l_dimmList.size() != 0) + + if(l_dimmList.size() != l_expectedDimmsUnderPort1) { FAPI_ERR("test_fapi2getChildTargetsForCDG: Dimm count %d under port 1 not equal expected %d", - l_dimmList.size(),0); + l_dimmList.size(),l_expectedDimmsUnderPort1); numFails++; } |
