PRD: updates from latest RAS XML

Change-Id: I0de7818e7bd9aade1d571701cd862b4037f51827
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59716
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59782
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>

4 files changed, 21 insertions, 18 deletions

diff --git a/src/usr/diag/prdf/common/plat/cen/cen_centaur.rule b/src/usr/diag/prdf/common/plat/cen/cen_centaur.rule
index 6c74be378..086744cf4 100644
--- a/src/usr/diag/prdf/common/plat/cen/cen_centaur.rule
+++ b/src/usr/diag/prdf/common/plat/cen/cen_centaur.rule
@@ -1213,7 +1213,7 @@ group gMBSFIR filter singlebit, cs_root_cause( 0, 1, 2, 4, 6, 8, 10, 13, 16, 18,
     /** MBSFIR[2]
      *  INVALID_ADDRESS_ERROR
      */
-    (rMBSFIR, bit(2)) ? calloutBusInterface_dmibus_th1;
+    (rMBSFIR, bit(2)) ? calloutBusInterface_dmibus_th1_UERE;
 
     /** MBSFIR[3]
      *  EXTERNAL_TIMEOUT
diff --git a/src/usr/diag/prdf/common/plat/cen/cen_mba.rule b/src/usr/diag/prdf/common/plat/cen/cen_mba.rule
index 69a532b5d..eb93b3d6f 100644
--- a/src/usr/diag/prdf/common/plat/cen/cen_mba.rule
+++ b/src/usr/diag/prdf/common/plat/cen/cen_mba.rule
@@ -297,7 +297,7 @@ group gMBACALFIR filter priority( 4, 7 ),
     /** MBACALFIR[8]
      *  MBX_TO_MBA_PAR_ERROR
      */
-    (rMBACALFIR, bit(8)) ? self_th_1;
+    (rMBACALFIR, bit(8)) ? self_th_1_UERE;
 
     /** MBACALFIR[9]
      *  MBA_WRD_UE
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mc.rule b/src/usr/diag/prdf/common/plat/p9/p9_mc.rule
index 141c109d6..5a7989344 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_mc.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_mc.rule
@@ -530,17 +530,17 @@ rule rIOMCFIR
     IOMCFIR & ~IOMCFIR_MASK &  IOMCFIR_ACT0 &  IOMCFIR_ACT1;
 };
 
-group gIOMCFIR filter singlebit, cs_root_cause
+group gIOMCFIR filter singlebit, cs_root_cause( 12, 20, 28, 36 )
 {
     /** IOMCFIR[0]
      *  RX_INVALID_STATE_OR_PARITY_ERROR
      */
-    (rIOMCFIR, bit(0)) ? defaultMaskedError;
+    (rIOMCFIR, bit(0)) ? self_th_1;
 
     /** IOMCFIR[1]
      *  TX_INVALID_STATE_OR_PARITY_ERROR
      */
-    (rIOMCFIR, bit(1)) ? defaultMaskedError;
+    (rIOMCFIR, bit(1)) ? self_th_1;
 
     /** IOMCFIR[2]
      *  GCR_HANG_ERROR
@@ -570,12 +570,12 @@ group gIOMCFIR filter singlebit, cs_root_cause
     /** IOMCFIR[11]
      *  RX BUS 0 Recal or dynamic repair error
      */
-    (rIOMCFIR, bit(11)) ? defaultMaskedError;
+    (rIOMCFIR, bit(11)) ? calloutBusInterface_dmi0_th_1;
 
     /** IOMCFIR[12]
      *  RX BUS 0 Too Many Bus Errors
      */
-    (rIOMCFIR, bit(12)) ? tooManyBusErrors_dmi0;
+    (rIOMCFIR, bit(12)) ? tooManyBusErrors_dmi0_UERE;
 
     /** IOMCFIR[13:15]
      *  spare
@@ -600,12 +600,12 @@ group gIOMCFIR filter singlebit, cs_root_cause
     /** IOMCFIR[19]
      *  RX BUS 1 Recal or dynamic repair error
      */
-    (rIOMCFIR, bit(19)) ? defaultMaskedError;
+    (rIOMCFIR, bit(19)) ? calloutBusInterface_dmi1_th_1;
 
     /** IOMCFIR[20]
      *  RX BUS 1 Too Many Bus Errors
      */
-    (rIOMCFIR, bit(20)) ? tooManyBusErrors_dmi1;
+    (rIOMCFIR, bit(20)) ? tooManyBusErrors_dmi1_UERE;
 
     /** IOMCFIR[21:23]
      *  spare
@@ -630,12 +630,12 @@ group gIOMCFIR filter singlebit, cs_root_cause
     /** IOMCFIR[27]
      *  RX BUS 2 Recal or dynamic repair error
      */
-    (rIOMCFIR, bit(27)) ? defaultMaskedError;
+    (rIOMCFIR, bit(27)) ? calloutBusInterface_dmi2_th_1;
 
     /** IOMCFIR[28]
      *  RX BUS 2 Too Many Bus Errors
      */
-    (rIOMCFIR, bit(28)) ? tooManyBusErrors_dmi2;
+    (rIOMCFIR, bit(28)) ? tooManyBusErrors_dmi2_UERE;
 
     /** IOMCFIR[29:31]
      *  spare
@@ -660,12 +660,12 @@ group gIOMCFIR filter singlebit, cs_root_cause
     /** IOMCFIR[35]
      *  RX BUS 3 Recal or dynamic repair error
      */
-    (rIOMCFIR, bit(35)) ? defaultMaskedError;
+    (rIOMCFIR, bit(35)) ? calloutBusInterface_dmi3_th_1;
 
     /** IOMCFIR[36]
      *  RX BUS 3 Too Many Bus Errors
      */
-    (rIOMCFIR, bit(36)) ? tooManyBusErrors_dmi3;
+    (rIOMCFIR, bit(36)) ? tooManyBusErrors_dmi3_UERE;
 
     /** IOMCFIR[37:39]
      *  spare
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mc_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_mc_actions.rule
index 1dab81e59..2985dbff2 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_mc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_mc_actions.rule
@@ -24,6 +24,10 @@
 # IBM_PROLOG_END_TAG
 
 # TODO: RTC 144057 upate actions for all four DMI buses on this MC target.
+actionclass calloutBusInterface_dmi0_th_1 {};
+actionclass calloutBusInterface_dmi1_th_1 {};
+actionclass calloutBusInterface_dmi2_th_1 {};
+actionclass calloutBusInterface_dmi3_th_1 {};
 actionclass spareDeployed_dmi0 {};
 actionclass spareDeployed_dmi1 {};
 actionclass spareDeployed_dmi2 {};
@@ -32,8 +36,7 @@ actionclass maxSparesExceeded_dmi0 {};
 actionclass maxSparesExceeded_dmi1 {};
 actionclass maxSparesExceeded_dmi2 {};
 actionclass maxSparesExceeded_dmi3 {};
-actionclass tooManyBusErrors_dmi0 {};
-actionclass tooManyBusErrors_dmi1 {};
-actionclass tooManyBusErrors_dmi2 {};
-actionclass tooManyBusErrors_dmi3 {};
-
+actionclass tooManyBusErrors_dmi0_UERE {};
+actionclass tooManyBusErrors_dmi1_UERE {};
+actionclass tooManyBusErrors_dmi2_UERE {};
+actionclass tooManyBusErrors_dmi3_UERE {};