diff options
| author | crgeddes <crgeddes@us.ibm.com> | 2016-04-08 13:37:22 -0500 |
|---|---|---|
| committer | Stephen Cprek <smcprek@us.ibm.com> | 2016-04-21 13:51:27 -0500 |
| commit | 4c23b038bd8a58b5965309ad4491e947d1708393 (patch) | |
| tree | d98c3b30d52f34d4158ddce471835f6cefe18be8 /src | |
| parent | 100feff77ba8ef67b09cc2a8115d2bef5f2ff367 (diff) | |
| download | blackbird-hostboot-4c23b038bd8a58b5965309ad4491e947d1708393.tar.gz blackbird-hostboot-4c23b038bd8a58b5965309ad4491e947d1708393.zip | |
Re-enable scom test cases that were turned off
Changes to the EKB's scom translation code we had to re-visit
some of the scom translation test cases so they agree with the
new behavior.
RTC: 149140
Change-Id: I01e8c675b342e9a6c07a8612b4be0399861fb724
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23060
Tested-by: Jenkins Server
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: FSP CI Jenkins
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/scom/scomtrans.C | 3 | ||||
| -rw-r--r-- | src/usr/scom/test/scomtest.H | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/usr/scom/scomtrans.C b/src/usr/scom/scomtrans.C index 2fd7de7f3..c8dadd309 100644 --- a/src/usr/scom/scomtrans.C +++ b/src/usr/scom/scomtrans.C @@ -418,7 +418,8 @@ errlHndl_t p9_translation (TARGETING::Target * &i_target, //check each scom pairing to make sure we have a match for(uint32_t i = 0; i < l_scomPairings.size(); i++) { - if( l_scomPairings[i].chipUnitType == l_chipUnit) + if( (l_scomPairings[i].chipUnitType == l_chipUnit) && + (l_scomPairings[i].chipUnitNum == 0)) { l_scomAddrAndTargetTypeMatch = true; break; diff --git a/src/usr/scom/test/scomtest.H b/src/usr/scom/test/scomtest.H index caaae53dc..2d495ff09 100644 --- a/src/usr/scom/test/scomtest.H +++ b/src/usr/scom/test/scomtest.H @@ -800,8 +800,10 @@ public: { scom_targets[myEX0], 0x0FFFFFFF, 0x0FFFFFFF, true}, { scom_targets[myEX1], 0x21000000, 0x23000000, false}, { scom_targets[myEX1], 0x0FFFFFFF, 0x0FFFFFFF ,true}, -//@TODO RTC:149140 RE-enable scom test addresses -// { scom_targets[myEX1], 0x10012400, 0x10012800, false}, + //This address is tricky, it is within EQ0 chip unit but + //the ring value puts it in the EX1 chip unit space, + // so you cannot use this address with EX targets + { scom_targets[myEX1], 0x10012400, 0x10012400, true}, { scom_targets[myCORE0], 0x20010A46, 0x20010A46, false}, { scom_targets[myCORE0], 0x0FFFFFFF, 0x0FFFFFFF, true}, { scom_targets[myCORE1], 0x20010A46, 0x21010A46, false}, @@ -842,9 +844,8 @@ public: { scom_targets[myPERV32], 0x0D010400, 0x0D010400, true}, { scom_targets[myPEC0], 0x04010C03, 0x04010C03, false}, { scom_targets[myPEC1], 0x04010C03, 0x04011003 ,false}, -//@TODO RTC:149140 RE-enable scom test addresses -// { scom_targets[myPEC0], 0x0FFFFFFF, 0x0FFFFFFF, true}, -// { scom_targets[myPEC1], 0x0FFFFFFF, 0x0FFFFFFF ,true}, + { scom_targets[myPEC0], 0x0FFFFFFF, 0x0FFFFFFF, true}, + { scom_targets[myPEC1], 0x0FFFFFFF, 0x0FFFFFFF ,true}, { scom_targets[myPEC0], 0x12012826, 0x12012826, true}, { scom_targets[myPEC1], 0x24030008, 0x24030008, true}, { scom_targets[myPHB0], 0x04010C4E, 0x04010C4E, false}, |
