diff options
| author | crgeddes <crgeddes@us.ibm.com> | 2017-04-25 10:38:03 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-04-27 14:34:10 -0400 |
| commit | c9bd42f923bbfa7fcefbbdff07c79947c0447393 (patch) | |
| tree | 85291bee3815f24c22168642d38e717c5979fe28 | |
| parent | 2fcb6eb5e3670c3825c79c7cb868ec25000a9322 (diff) | |
| download | talos-hostboot-c9bd42f923bbfa7fcefbbdff07c79947c0447393.tar.gz talos-hostboot-c9bd42f923bbfa7fcefbbdff07c79947c0447393.zip | |
Enable testing of getChildren for MCBIST/MCA targets
Was updating other code and noticed this was commented out. Just
adding it back in and updating some comments
Change-Id: I309c750f996a1108eb607266b41536e25e853913
RTC:148761
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39653
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/usr/fapi2/test/fapi2GetChildrenTest.H | 30 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml | 6 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/usr/fapi2/test/fapi2GetChildrenTest.H b/src/usr/fapi2/test/fapi2GetChildrenTest.H index 15ca26fe4..8fd90c851 100644 --- a/src/usr/fapi2/test/fapi2GetChildrenTest.H +++ b/src/usr/fapi2/test/fapi2GetChildrenTest.H @@ -138,21 +138,21 @@ void test_fapi2GetChildren() std::vector<Target<fapi2::TARGET_TYPE_MCA> > l_childMCAs; std::vector<Target<fapi2::TARGET_TYPE_EQ> > l_childEQs; std::vector<Target<fapi2::TARGET_TYPE_EX> > l_childEXs; -// @TODO RTC:148761 -// Need to figure out how we are going to set up this relationship -// l_childMCAs = fapi2_mcbistTarget.getChildren<fapi2::TARGET_TYPE_MCA>(TARGET_STATE_PRESENT); -// l_targetHuid = TARGETING::get_huid(targeting_targets[MY_MCBIST]) ; -// l_actualSize = l_childMCAs.size(); -// -// //Set expected size to be the number of MCAs per MCBIST -// l_expectedSize = MCA_PER_MCS * MCS_PER_PROC / MCBIST_PER_PROC; -// numTests++; -// if(l_actualSize != l_expectedSize) -// { -// FAPI_INF("fapi2TargetTest:: MCAs per MCBIST mismatch"); -// numFails++; -// break; -// } + std::vector<Target<fapi2::TARGET_TYPE_XBUS> > l_childXBUSs; + + l_childMCAs = fapi2_mcbistTarget.getChildren<fapi2::TARGET_TYPE_MCA>(TARGET_STATE_PRESENT); + l_targetHuid = TARGETING::get_huid(targeting_targets[MY_MCBIST]) ; + l_actualSize = l_childMCAs.size(); + + //Set expected size to be the number of MCAs per MCBIST + l_expectedSize = MCA_PER_MCS * MCS_PER_PROC / MCBIST_PER_PROC; + numTests++; + if(l_actualSize != l_expectedSize) + { + FAPI_INF("fapi2TargetTest:: MCAs per MCBIST mismatch"); + numFails++; + break; + } l_childCores = fapi2_procTarget.getChildren<fapi2::TARGET_TYPE_CORE>(TARGET_STATE_PRESENT); l_targetHuid = TARGETING::get_huid(l_nimbusProc) ; diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml index 927a3632b..5ec3dab3b 100644 --- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml @@ -33,9 +33,9 @@ * Each Nimbus has 6 EQ units * Each EQ unit has 2 EX units (a total of 12 per chip) * Each EX has 2 cores, 1 L2, 1 L3 (a total of 24 cores per chip) - * Each Nimbus has 4 MCS - * Each MCS has 2 MCA units (a total of 8 per chip) - * Each Nimbus has 2 MCBIST units (1 per MCU) + * Each Nimbus has has 2 MCBIST units + * Each MCBIST unit has 2 MCS units (a total of 4 per chip) + * Each MCS has 2 MCA units (a total of 8 per chip) * Each Nimbus has 3 PECs * PEC 0 has 1 PHB * PEC 1 has 2 PHBs |
