diff options
| author | whs <whs@us.ibm.com> | 2016-05-10 07:40:23 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-05-17 14:35:28 -0400 |
| commit | 5dececbd4943dbe3b453d6dad9857c71abb20758 (patch) | |
| tree | fb346eb8d321c7846fdf4d5e76b37bf0b3952a59 /src/usr/fapi2/test | |
| parent | 78c1fff95273d42204726041595c6a2a201c0eb6 (diff) | |
| download | talos-hostboot-5dececbd4943dbe3b453d6dad9857c71abb20758.tar.gz talos-hostboot-5dececbd4943dbe3b453d6dad9857c71abb20758.zip | |
Define parent/child relationship between MCBISTs, MCAs, and MCSs
Update standalone NIMBUS and genHwsvMrwXml to insert MBIST as parent of MCS
Change-Id: I45a417b74cf87421bd82df2ae2ba40be56a9adb8
RTC: 148761
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24332
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2/test')
| -rw-r--r-- | src/usr/fapi2/test/fapi2TestUtils.C | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/src/usr/fapi2/test/fapi2TestUtils.C b/src/usr/fapi2/test/fapi2TestUtils.C index e3d07ec0e..c3221993c 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.C +++ b/src/usr/fapi2/test/fapi2TestUtils.C @@ -112,38 +112,7 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, } } - //Setup MCSs and MCAs - i_pMasterProcChip->tryGetAttr<TARGETING::ATTR_PHYS_PATH>(l_epath); - for(int i = 0; i < NUM_MCS; i++) - { - l_epath.addLast(TARGETING::TYPE_MCS, i); - if(TARGETING::targetService().toTarget(l_epath) != NULL) - { - o_targetList[MY_MCS] = - TARGETING::targetService().toTarget(l_epath); - for(int j = 0; j < NUM_MCAS; j++) - { - l_epath.addLast(TARGETING::TYPE_MCA,j); - if(TARGETING::targetService().toTarget(l_epath) != NULL) - { - o_targetList[MY_MCA] = - TARGETING::targetService().toTarget(l_epath); - break; - } - else - { - l_epath.removeLast(); - } - } - break; - } - else - { - l_epath.removeLast(); - } - } - - //Setup MCBISTs + //Setup MCBISTs, MCSs, and MCAs i_pMasterProcChip->tryGetAttr<TARGETING::ATTR_PHYS_PATH>(l_epath); for(int i = 0; i < NUM_MCBISTS; i++) { @@ -152,6 +121,34 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, { o_targetList[MY_MCBIST] = TARGETING::targetService().toTarget(l_epath); + for(int j = 0; j < NUM_MCS; j++) + { + l_epath.addLast(TARGETING::TYPE_MCS, j); + if(TARGETING::targetService().toTarget(l_epath) != NULL) + { + o_targetList[MY_MCS] = + TARGETING::targetService().toTarget(l_epath); + for(int k = 0; k < NUM_MCAS; k++) + { + l_epath.addLast(TARGETING::TYPE_MCA,k); + if(TARGETING::targetService().toTarget(l_epath)!=NULL) + { + o_targetList[MY_MCA] = + TARGETING::targetService().toTarget(l_epath); + break; + } + else + { + l_epath.removeLast(); + } + } + break; + } + else + { + l_epath.removeLast(); + } + } break; } else |
