PRD: updates to sync the XML with actual values from hardware

Change-Id: I6e35d3f7ee38572dc9a0bdd9214a37d24adce8f3
CQ: SW445620
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66230
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66641
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>

7 files changed, 30 insertions, 32 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 5aabf302c..2773bc651 100644
--- a/src/usr/diag/prdf/common/plat/cen/cen_centaur.rule
+++ b/src/usr/diag/prdf/common/plat/cen/cen_centaur.rule
@@ -1222,18 +1222,13 @@ group gMBSFIR filter singlebit, cs_root_cause( 0, 1, 2, 4, 6, 8, 10, 13, 16, 18,
     /** MBSFIR[3]
      *  EXTERNAL_TIMEOUT
      */
-    (rMBSFIR, bit(3)) ? level2_th_1;
+    (rMBSFIR, bit(3)) ? defaultMaskedError;
 
     /** MBSFIR[4]
      *  INTERNAL_TIMEOUT
      */
     (rMBSFIR, bit(4)) ? mbs_internal_timeout;
 
-    /** MBSFIR[3,4]
-     *  EXTERNAL_TIMEOUT
-     */
-    (rMBSFIR, bit(3,4)) ? mbs_int_ext_timeout;
-
     /** MBSFIR[5]
      *  INT_BUFFER_CE
      */
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_capp.rule b/src/usr/diag/prdf/common/plat/p9/p9_capp.rule
index 8027b497b..456bb556a 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_capp.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_capp.rule
@@ -311,7 +311,7 @@ group gCXAFIR filter singlebit, cs_root_cause
     /** CXAFIR[35]
      *  CXA: UE on data received from PowerBus
      */
-    (rCXAFIR, bit(35)) ? self_th_1; # NIMBUS_20
+    (rCXAFIR, bit(35)) ? self_th_1; # NIMBUS_20,CUMULUS_10
 
     /** CXAFIR[36]
      *  CXA: SUE on data received from PowerBus
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule b/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule
index 3b8464748..260a1fd15 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule
@@ -2221,29 +2221,29 @@ group gTP_LFIR filter singlebit, cs_root_cause
     (rTP_LFIR, bit(35)) ? defaultMaskedError;
 
     /** TP_LFIR[36]
-     *  Osc switch to backup or lost detected
+     *  system ref osc switch to backup
      */
     (rTP_LFIR, bit(36)) ? defaultMaskedError;
 
     /** TP_LFIR[37]
-     *  Osc switch to backup or lost detected
+     *  PCI osc switch to backup
      */
     (rTP_LFIR, bit(37)) ? defaultMaskedError;
 
     /** TP_LFIR[38]
      *  PIB MEM: Summarized err - PIB access ops
      */
-    (rTP_LFIR, bit(38)) ? self_th_1;
+    (rTP_LFIR, bit(38)) ? defaultMaskedError;
 
     /** TP_LFIR[39]
      *  PIB MEM: Summarized err-fast access ops
      */
-    (rTP_LFIR, bit(39)) ? self_th_1;
+    (rTP_LFIR, bit(39)) ? defaultMaskedError;
 
     /** TP_LFIR[40]
      *  OTP Logic: UE or CE counter overflow
      */
-    (rTP_LFIR, bit(40)) ? self_th_1;
+    (rTP_LFIR, bit(40)) ? defaultMaskedError;
 
     /** TP_LFIR[41]
      *  malfunction alert or Local Checkstop
@@ -3761,7 +3761,7 @@ group gVASFIR filter singlebit, cs_root_cause
     /** VASFIR[33]
      *  MMIO Read to Unimplemented Reg (OS)
      */
-    (rVASFIR, bit(33)) ? self_th_1;
+    (rVASFIR, bit(33)) ? defaultMaskedError;
 
     /** VASFIR[34]
      *  MMIO Write to Unimplemented Reg (HYP)
@@ -3771,7 +3771,7 @@ group gVASFIR filter singlebit, cs_root_cause
     /** VASFIR[35]
      *  MMIO Write to Unimplemented Reg (OS)
      */
-    (rVASFIR, bit(35)) ? self_th_1;
+    (rVASFIR, bit(35)) ? defaultMaskedError;
 
     /** VASFIR[36]
      *  non-8B MMIO Detected (HYP)
@@ -3781,7 +3781,7 @@ group gVASFIR filter singlebit, cs_root_cause
     /** VASFIR[37]
      *  non-8B MMIO Detected (OS)
      */
-    (rVASFIR, bit(37)) ? self_th_1;
+    (rVASFIR, bit(37)) ? defaultMaskedError;
 
     /** VASFIR[38]
      *  Write Monitor Op to non-open Window
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 6a2ee0f9c..d904d988c 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
@@ -182,6 +182,7 @@ chip p9_ec
 ################################################################################
 # EC Chiplet FIR
 ################################################################################
+
 rule rEC_CHIPLET_FIR
 {
   CHECK_STOP:
@@ -206,6 +207,7 @@ group gEC_CHIPLET_FIR attntype CHECK_STOP, RECOVERABLE filter singlebit
      *  Attention from COREFIR
      */
     (rEC_CHIPLET_FIR, bit(4)) ? analyzeCOREFIR;
+
 };
 
 ################################################################################
@@ -221,9 +223,10 @@ rule rEC_CHIPLET_UCS_FIR
 group gEC_CHIPLET_UCS_FIR attntype UNIT_CS filter singlebit
 {
     /** EC_CHIPLET_UCS_FIR[1]
-     *  Unit Checkstop from COREFIR
+     *  Attention from COREFIR
      */
     (rEC_CHIPLET_UCS_FIR, bit(1)) ? analyzeCOREFIR;
+
 };
 
 ################################################################################
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
index 1c6427704..9d5ecdbba 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
@@ -358,7 +358,7 @@ group gL2FIR filter singlebit, cs_root_cause( 1, 17, 18, 20 )
     (rL2FIR, bit(21)) ? defaultMaskedError;
 
     /** L2FIR[22]
-     *  CopyPaste_Tgt_Nodal_req_cresp_dinc_Err
+     *  TGT_NODAL_REQ_DINC_ERR
      */
     (rL2FIR, bit(22)) ? self_th_1;
 
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 a2276c456..8727bdc53 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_mc.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_mc.rule
@@ -714,22 +714,22 @@ group gMCPPEFIR filter singlebit, cs_root_cause
     /** MCPPEFIR[0]
      *  PPE general error.
      */
-    (rMCPPEFIR, bit(0)) ? threshold_and_mask_self;
+    (rMCPPEFIR, bit(0)) ? defaultMaskedError;
 
     /** MCPPEFIR[1]
      *  PPE general error.
      */
-    (rMCPPEFIR, bit(1)) ? threshold_and_mask_self;
+    (rMCPPEFIR, bit(1)) ? defaultMaskedError;
 
     /** MCPPEFIR[2]
      *  PPE general error.
      */
-    (rMCPPEFIR, bit(2)) ? threshold_and_mask_self;
+    (rMCPPEFIR, bit(2)) ? defaultMaskedError;
 
     /** MCPPEFIR[3]
      *  PPE general error.
      */
-    (rMCPPEFIR, bit(3)) ? threshold_and_mask_self;
+    (rMCPPEFIR, bit(3)) ? defaultMaskedError;
 
     /** MCPPEFIR[4]
      *  PPE halted.
@@ -749,17 +749,17 @@ group gMCPPEFIR filter singlebit, cs_root_cause
     /** MCPPEFIR[7]
      *  Arb missed scrub tick.
      */
-    (rMCPPEFIR, bit(7)) ? threshold_and_mask_self;
+    (rMCPPEFIR, bit(7)) ? defaultMaskedError;
 
     /** MCPPEFIR[8]
      *  Arb ary ue error.
      */
-    (rMCPPEFIR, bit(8)) ? self_th_1;
+    (rMCPPEFIR, bit(8)) ? defaultMaskedError;
 
     /** MCPPEFIR[9]
      *  Arb ary ce error.
      */
-    (rMCPPEFIR, bit(9)) ? threshold_and_mask_self;
+    (rMCPPEFIR, bit(9)) ? defaultMaskedError;
 
     /** MCPPEFIR[10]
      *  spare
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule b/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule
index d0a1d1958..05fda7b6f 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule
@@ -2200,29 +2200,29 @@ group gTP_LFIR filter singlebit, cs_root_cause
     (rTP_LFIR, bit(35)) ? defaultMaskedError;
 
     /** TP_LFIR[36]
-     *  Osc switch to backup or lost detected
+     *  system ref osc switch to backup
      */
     (rTP_LFIR, bit(36)) ? defaultMaskedError;
 
     /** TP_LFIR[37]
-     *  Osc switch to backup or lost detected
+     *  PCI osc switch to backup
      */
     (rTP_LFIR, bit(37)) ? defaultMaskedError;
 
     /** TP_LFIR[38]
      *  PIB MEM: Summarized err - PIB access ops
      */
-    (rTP_LFIR, bit(38)) ? self_th_1;
+    (rTP_LFIR, bit(38)) ? defaultMaskedError;
 
     /** TP_LFIR[39]
      *  PIB MEM: Summarized err-fast access ops
      */
-    (rTP_LFIR, bit(39)) ? self_th_1;
+    (rTP_LFIR, bit(39)) ? defaultMaskedError;
 
     /** TP_LFIR[40]
      *  OTP Logic: UE or CE counter overflow
      */
-    (rTP_LFIR, bit(40)) ? self_th_1;
+    (rTP_LFIR, bit(40)) ? defaultMaskedError;
 
     /** TP_LFIR[41]
      *  malfunction alert or Local Checkstop
@@ -3740,7 +3740,7 @@ group gVASFIR filter singlebit, cs_root_cause
     /** VASFIR[33]
      *  MMIO Read to Unimplemented Reg (OS)
      */
-    (rVASFIR, bit(33)) ? self_th_1;
+    (rVASFIR, bit(33)) ? defaultMaskedError;
 
     /** VASFIR[34]
      *  MMIO Write to Unimplemented Reg (HYP)
@@ -3750,7 +3750,7 @@ group gVASFIR filter singlebit, cs_root_cause
     /** VASFIR[35]
      *  MMIO Write to Unimplemented Reg (OS)
      */
-    (rVASFIR, bit(35)) ? self_th_1;
+    (rVASFIR, bit(35)) ? defaultMaskedError;
 
     /** VASFIR[36]
      *  non-8B MMIO Detected (HYP)
@@ -3760,7 +3760,7 @@ group gVASFIR filter singlebit, cs_root_cause
     /** VASFIR[37]
      *  non-8B MMIO Detected (OS)
      */
-    (rVASFIR, bit(37)) ? self_th_1;
+    (rVASFIR, bit(37)) ? defaultMaskedError;
 
     /** VASFIR[38]
      *  Write Monitor Op to non-open Window