PRD: Fix to core recovery workaround

Change-Id: I972c5c5db7491100c530a6731141e899b93a8c4e
CQ: SW380201
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36579
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36600
Tested-by: Jenkins Server <pfd-jenkins+hostboot@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>

1 files changed, 16 insertions, 32 deletions

diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule b/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
index b87afac84..0f81c235b 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
@@ -181,48 +181,32 @@ chip p9_ec
  ##############################################################################
 
 ################################################################################
-# EC Chiplet FIR
+# Summary for EC
 ################################################################################
 
-rule rEC_CHIPLET_FIR
-{
-  CHECK_STOP:
-     EC_CHIPLET_CS_FIR       & ~EC_CHIPLET_FIR_MASK & `1fffffffffffffff`;
-  RECOVERABLE:
-    (EC_CHIPLET_RE_FIR >> 2) & ~EC_CHIPLET_FIR_MASK & `1fffffffffffffff`;
-};
+# We prefer to use the EC chiplet FIRs, however, COREFIR recoverable errors will
+# not report through the chiplet FIRs due to a bug in Nimbus DD1.0. Instead, we
+# will bypass the chiplet FIRS completely and use the summary construct.
 
-group gEC_CHIPLET_FIR attntype CHECK_STOP, RECOVERABLE filter singlebit
+rule rEC
 {
-    /** EC_CHIPLET_FIR[3]
-     *  Attention from EC_LFIR
-     */
-    (rEC_CHIPLET_FIR, bit(3)) ? analyze(gEC_LFIR);
-
-    /** EC_CHIPLET_FIR[4]
-     *  Attention from COREFIR
-     */
-    (rEC_CHIPLET_FIR, bit(4)) ? analyze(gCOREFIR);
-
-};
+  CHECK_STOP:
+    summary( 0, rEC_LFIR ) |
+    summary( 1, rCOREFIR );
 
-################################################################################
-# EC Chiplet Unit Checkstop FIR
-################################################################################
+  RECOVERABLE:
+    summary( 0, rEC_LFIR ) |
+    summary( 1, rCOREFIR );
 
-rule rEC_CHIPLET_UCS_FIR
-{
   UNIT_CS:
-    EC_CHIPLET_UCS_FIR & ~EC_CHIPLET_UCS_FIR_MASK & `7fffffffffffffff`;
+    summary( 1, rCOREFIR );
+
 };
 
-group gEC_CHIPLET_UCS_FIR attntype UNIT_CS filter singlebit
+group gEC attntype CHECK_STOP, RECOVERABLE, UNIT_CS filter singlebit
 {
-    /** EC_CHIPLET_UCS_FIR[1]
-     *  Attention from COREFIR
-     */
-    (rEC_CHIPLET_UCS_FIR, bit(1)) ? analyze(gCOREFIR);
-
+    (rEC, bit(0)) ? analyze(gEC_LFIR);
+    (rEC, bit(1)) ? analyze(gCOREFIR);
 };
 
 ################################################################################