diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2019-02-16 15:22:54 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2019-02-19 08:46:33 -0600 |
| commit | 5c187fcbf2bc91d5870b49153a4fdf53c91ce1d7 (patch) | |
| tree | b002913f3363eda8f8f0bb57d42c0db63129ae61 | |
| parent | b61b4966edc3812a3c1a5f89dd571de832e06e2d (diff) | |
| download | talos-hostboot-5c187fcbf2bc91d5870b49153a4fdf53c91ce1d7.tar.gz talos-hostboot-5c187fcbf2bc91d5870b49153a4fdf53c91ce1d7.zip | |
Handle partial-bad MCS logic correctly
One of the rewritten PG rules was incorrect for modules that have
a MCS marked bad, e.g. Sforza.
Change-Id: I30672b51f81ba74b51ece6e878e462106c090350
CQ: SW457231
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72010
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matthew Raybuck <matthew.raybuck@ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
| -rw-r--r-- | src/include/usr/hwas/common/pgLogic.H | 14 | ||||
| -rw-r--r-- | src/usr/hwas/common/pgLogic.C | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/include/usr/hwas/common/pgLogic.H b/src/include/usr/hwas/common/pgLogic.H index 8ecb1631c..cfe5d599f 100644 --- a/src/include/usr/hwas/common/pgLogic.H +++ b/src/include/usr/hwas/common/pgLogic.H @@ -163,6 +163,10 @@ namespace PARTIAL_GOOD extern const size_t MCS_R1_CU_MASK; // Rule 2 only applies to chip units 2 & 3 extern const size_t MCS_R2_CU_MASK; + // Rule 3 only applies to chip units 0 & 2 + extern const size_t MCS_R3_CU_MASK; + // Rule 4 only applies to chip units 1 & 3 + extern const size_t MCS_R4_CU_MASK; // NPU // PG/AG Masks @@ -611,7 +615,7 @@ namespace PARTIAL_GOOD MCS_R1_CU_MASK, NO_SPECIAL_RULE ), - // MCS Rule 1: For chip units 2 and 3. Check MCS23 + // MCS Rule 2: For chip units 2 and 3. Check MCS23 new PartialGoodRule ( {&PREDICATE_NIMBUS}, @@ -621,7 +625,7 @@ namespace PARTIAL_GOOD MCS_R2_CU_MASK, NO_SPECIAL_RULE ), - // MCS Rule 3: For chip units 0 and 1. Check bits in the + // MCS Rule 3: For chip units 0 and 2. Check bits in the // MCxx entry including specific IOM bit, but // not the other bits in the partial good // region. @@ -631,10 +635,10 @@ namespace PARTIAL_GOOD MCS_R3_PG_MASK, MCS_ALL_GOOD_MASK, USE_CHIPLET_ID, - MCS_R1_CU_MASK, + MCS_R3_CU_MASK, NO_SPECIAL_RULE ), - // MCS Rule 4: For chip units 2 and 3. Check bits in the + // MCS Rule 4: For chip units 1 and 3. Check bits in the // MCxx entry including specific IOM bit, but // not the other bits in the partial good // region. @@ -644,7 +648,7 @@ namespace PARTIAL_GOOD MCS_R4_PG_MASK, MCS_ALL_GOOD_MASK, USE_CHIPLET_ID, - MCS_R2_CU_MASK, + MCS_R4_CU_MASK, NO_SPECIAL_RULE ), }// End of PG Rules for MCS Target diff --git a/src/usr/hwas/common/pgLogic.C b/src/usr/hwas/common/pgLogic.C index 7c88e9786..307527fc3 100644 --- a/src/usr/hwas/common/pgLogic.C +++ b/src/usr/hwas/common/pgLogic.C @@ -169,6 +169,10 @@ namespace PARTIAL_GOOD const size_t MCS_R1_CU_MASK = 0x0003; // Rule 2 only applies to chip units 2 & 3 const size_t MCS_R2_CU_MASK = 0x000C; + // Rule 3 only applies to chip units 0 & 2 + const size_t MCS_R3_CU_MASK = 0x0005; + // Rule 4 only applies to chip units 1 & 3 + const size_t MCS_R4_CU_MASK = 0x000A; // NPU // PG/AG Masks |
