PRD: rule file updates from latest in EKB

Change-Id: I56d37f5d07ce875994b4903b8e24c20982074617
RTC: 163791
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31977
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32247
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

8 files changed, 161 insertions, 88 deletions

diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_actions.rule
index b51e9e455..a4da7741a 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_common_actions.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_common_actions.rule
@@ -175,6 +175,13 @@ actionclass level2_M_self_L_th_1
     threshold1;
 };
 
+actionclass self_M_level2_L_th_1
+{
+    calloutSelfMed;
+    callout2ndLvlLow;
+    threshold1;
+};
+
 ################################################################################
 #                               Dump Types                                     #
 ################################################################################
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 49607a722..a8cb431fc 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
@@ -247,17 +247,17 @@ group gEC_LFIR filter singlebit
     /** EC_LFIR[1]
      *  Errors from Control
      */
-    (rEC_LFIR, bit(1)) ? defaultMaskedError;
+    (rEC_LFIR, bit(1)) ? self_th_32perDay;
 
     /** EC_LFIR[2]
      *  local err from CC (PCB error)
      */
-    (rEC_LFIR, bit(2)) ? defaultMaskedError;
+    (rEC_LFIR, bit(2)) ? self_th_32perDay;
 
     /** EC_LFIR[3]
      *  local err from CC
      */
-    (rEC_LFIR, bit(3)) ? defaultMaskedError;
+    (rEC_LFIR, bit(3)) ? self_th_32perDay;
 
     /** EC_LFIR[4]
      *  local err from PSC
@@ -415,7 +415,7 @@ group gCOREFIR filter singlebit
     /** COREFIR[14]
      *  Machine check and ME = 0 Err
      */
-    (rCOREFIR, bit(14)) ? defaultMaskedError;
+    (rCOREFIR, bit(14)) ? self_th_1;
 
     /** COREFIR[15]
      *  LSU or IFU detected UE from L2
@@ -640,7 +640,7 @@ group gCOREFIR filter singlebit
     /** COREFIR[55]
      *  Nest hang detected, recovery attempted
      */
-    (rCOREFIR, bit(55)) ? defaultMaskedError;
+    (rCOREFIR, bit(55)) ? self_M_level2_L_th_1;
 
     /** COREFIR[56]
      *  Other Core Recoverable error
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_eq.rule b/src/usr/diag/prdf/common/plat/p9/p9_eq.rule
index 73b1ef4e5..efa788f40 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_eq.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_eq.rule
@@ -204,17 +204,17 @@ group gEQ_LFIR filter singlebit
     /** EQ_LFIR[1]
      *  Errors from Control
      */
-    (rEQ_LFIR, bit(1)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(1)) ? self_th_32perDay;
 
     /** EQ_LFIR[2]
      *  local err from CC (PCB error)
      */
-    (rEQ_LFIR, bit(2)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(2)) ? self_th_32perDay;
 
     /** EQ_LFIR[3]
      *  local err from CC
      */
-    (rEQ_LFIR, bit(3)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(3)) ? self_th_32perDay;
 
     /** EQ_LFIR[4]
      *  local err from PSC
@@ -297,44 +297,44 @@ group gEQ_LFIR filter singlebit
     (rEQ_LFIR, bit(19)) ? defaultMaskedError;
 
     /** EQ_LFIR[20]
-     *  spare
+     *  Duty cycle adjust err for cache clk
      */
-    (rEQ_LFIR, bit(20)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(20)) ? self_th_32perDay;
 
     /** EQ_LFIR[21]
-     *  local err from duty cycle adjust
+     *  Duty cycle adjust err for ex00_c0
      */
-    (rEQ_LFIR, bit(21)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(21)) ? self_th_32perDay;
 
     /** EQ_LFIR[22]
-     *  local err from duty cycle adjust
+     *  Duty cycle adjust err for ex00_c1
      */
-    (rEQ_LFIR, bit(22)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(22)) ? self_th_32perDay;
 
     /** EQ_LFIR[23]
-     *  local err from duty cycle adjust
+     *  Duty cycle adjust err for ex00_l2
      */
-    (rEQ_LFIR, bit(23)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(23)) ? self_th_32perDay;
 
     /** EQ_LFIR[24]
-     *  local err from duty cycle adjust
+     *  local err from duty cycle adjust ex01_c0
      */
-    (rEQ_LFIR, bit(24)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(24)) ? self_th_32perDay;
 
     /** EQ_LFIR[25]
-     *  local err from duty cycle adjust
+     *  Duty cycle adjust err for ex01_c1
      */
-    (rEQ_LFIR, bit(25)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(25)) ? self_th_32perDay;
 
     /** EQ_LFIR[26]
-     *  local err from duty cycle adjust
+     *  Duty cycle adjust err for ex01_l2
      */
-    (rEQ_LFIR, bit(26)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(26)) ? self_th_32perDay;
 
     /** EQ_LFIR[27]
      *  local err from skew adjust skewadj6way
      */
-    (rEQ_LFIR, bit(27)) ? defaultMaskedError;
+    (rEQ_LFIR, bit(27)) ? self_th_32perDay;
 
     /** EQ_LFIR[28:40]
      *  spare
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 63e381e52..d4bfb2a20 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
@@ -251,12 +251,12 @@ group gL2FIR filter singlebit
     /** L2FIR[0]
      *  L2 cache read CE
      */
-    (rL2FIR, bit(0)) ? defaultMaskedError;
+    (rL2FIR, bit(0)) ? l2_cache_ce;
 
     /** L2FIR[1]
      *  L2 cache read UE
      */
-    (rL2FIR, bit(1)) ? defaultMaskedError;
+    (rL2FIR, bit(1)) ? l2_cache_ue;
 
     /** L2FIR[2]
      *  L2 cache read SUE
@@ -321,7 +321,7 @@ group gL2FIR filter singlebit
     /** L2FIR[14]
      *  Hardware control error
      */
-    (rL2FIR, bit(14)) ? defaultMaskedError;
+    (rL2FIR, bit(14)) ? level2_M_proc_L_th_1;
 
     /** L2FIR[15]
      *  LRU all members in a class line deleted
@@ -346,7 +346,7 @@ group gL2FIR filter singlebit
     /** L2FIR[19]
      *  Rc or NCU Pb data CE error
      */
-    (rL2FIR, bit(19)) ? defaultMaskedError;
+    (rL2FIR, bit(19)) ? l2_power_bus_ce;
 
     /** L2FIR[20]
      *  RC or NCU Pb data UE error
@@ -603,7 +603,7 @@ group gL3FIR filter singlebit
     /** L3FIR[5]
      *  UE detected on L3 cache read
      */
-    (rL3FIR, bit(5)) ? defaultMaskedError;
+    (rL3FIR, bit(5)) ? l3_cache_ue;
 
     /** L3FIR[6]
      *  SUE detected on L3 cache read
@@ -633,7 +633,7 @@ group gL3FIR filter singlebit
     /** L3FIR[11]
      *  L3 cache write data UE from L2
      */
-    (rL3FIR, bit(11)) ? defaultMaskedError;
+    (rL3FIR, bit(11)) ? l3_cache_ue;
 
     /** L3FIR[12]
      *  L3 cache write SUE from L2
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule
index 628ff13c9..980212ddb 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule
@@ -22,6 +22,7 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
+
 actionclass level2_M_self_L_dump_SH
 {
     callout2ndLvlMed;
@@ -29,10 +30,10 @@ actionclass level2_M_self_L_dump_SH
     dumpSH;
 };
 
-actionclass self_M_level2_L_th_1
+actionclass level2_M_proc_L_th_1
 {
-    calloutSelfMed;
-    callout2ndLvlLow;
+    callout2ndLvlMed;
+    callout(connected(TYPE_PROC), MRU_LOW);
     threshold1;
 };
 
@@ -43,3 +44,23 @@ actionclass l3_cache_ce
     funccall("L3CE");
 };
 
+actionclass l3_cache_ue
+{
+    TBDDefaultCallout;
+};
+
+actionclass l2_cache_ce
+{
+    TBDDefaultCallout;
+};
+
+actionclass l2_cache_ue
+{
+    TBDDefaultCallout;
+};
+
+actionclass l2_power_bus_ce
+{
+    TBDDefaultCallout;
+};
+
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 58444583b..1c3c38c70 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule
@@ -2218,19 +2218,19 @@ group gTP_LFIR filter singlebit
     (rTP_LFIR, bit(0)) ? self_th_32perDay;
 
     /** TP_LFIR[1]
-     *  PCB error from GPIO
+     *  GPIO: PCB error during CC access
      */
-    (rTP_LFIR, bit(1)) ? defaultMaskedError;
+    (rTP_LFIR, bit(1)) ? self_th_32perDay;
 
     /** TP_LFIR[2]
-     *  PCB error from CC
+     *  CC: PCB error during CC access
      */
-    (rTP_LFIR, bit(2)) ? defaultMaskedError;
+    (rTP_LFIR, bit(2)) ? self_th_32perDay;
 
     /** TP_LFIR[3]
-     *  local errors from CC
+     *  CC local error
      */
-    (rTP_LFIR, bit(3)) ? defaultMaskedError;
+    (rTP_LFIR, bit(3)) ? self_th_32perDay;
 
     /** TP_LFIR[4]
      *  local errors from PSC (PCB error)
@@ -2300,7 +2300,7 @@ group gTP_LFIR filter singlebit
     /** TP_LFIR[17]
      *  local errors from I2CM ( error)
      */
-    (rTP_LFIR, bit(17)) ? defaultMaskedError;
+    (rTP_LFIR, bit(17)) ? self_th_1;
 
     /** TP_LFIR[18]
      *  local errors from TOD ( error)
@@ -2325,22 +2325,22 @@ group gTP_LFIR filter singlebit
     /** TP_LFIR[22]
      *  FIR error from SBE
      */
-    (rTP_LFIR, bit(22)) ? defaultMaskedError;
+    (rTP_LFIR, bit(22)) ? self_th_1;
 
     /** TP_LFIR[23]
      *  FIR error from SBE
      */
-    (rTP_LFIR, bit(23)) ? defaultMaskedError;
+    (rTP_LFIR, bit(23)) ? self_th_1;
 
     /** TP_LFIR[24]
      *  FIR error from SBE
      */
-    (rTP_LFIR, bit(24)) ? defaultMaskedError;
+    (rTP_LFIR, bit(24)) ? self_th_1;
 
     /** TP_LFIR[25]
      *  FIR_IN25: FIR error from SBE
      */
-    (rTP_LFIR, bit(25)) ? defaultMaskedError;
+    (rTP_LFIR, bit(25)) ? self_th_1;
 
     /** TP_LFIR[26]
      *  FIR_IN26: FIR error from SBE
@@ -2350,7 +2350,7 @@ group gTP_LFIR filter singlebit
     /** TP_LFIR[27]
      *  FIR_IN27: FIR error from SBE
      */
-    (rTP_LFIR, bit(27)) ? defaultMaskedError;
+    (rTP_LFIR, bit(27)) ? self_th_1;
 
     /** TP_LFIR[28]
      *  FIR_IN28: FIR error from SBE
@@ -2360,7 +2360,7 @@ group gTP_LFIR filter singlebit
     /** TP_LFIR[29]
      *  FIR_IN29: FIR error from SBE
      */
-    (rTP_LFIR, bit(29)) ? defaultMaskedError;
+    (rTP_LFIR, bit(29)) ? self_th_1;
 
     /** TP_LFIR[30]
      *  FIR_IN30: FIR error from SBE
@@ -2405,17 +2405,17 @@ group gTP_LFIR filter singlebit
     /** TP_LFIR[38]
      *  local errors from pibmem
      */
-    (rTP_LFIR, bit(38)) ? defaultMaskedError;
+    (rTP_LFIR, bit(38)) ? self_th_1;
 
     /** TP_LFIR[39]
      *  local errors from pibmem
      */
-    (rTP_LFIR, bit(39)) ? defaultMaskedError;
+    (rTP_LFIR, bit(39)) ? self_th_1;
 
     /** TP_LFIR[40]
      *  otp uncorrectable error
      */
-    (rTP_LFIR, bit(40)) ? defaultMaskedError;
+    (rTP_LFIR, bit(40)) ? self_th_1;
 
     /** TP_LFIR[41]
      *  xstop in another chiplet
@@ -2837,17 +2837,17 @@ group gN0_LFIR filter singlebit
     /** N0_LFIR[1]
      *  Errors from Control
      */
-    (rN0_LFIR, bit(1)) ? defaultMaskedError;
+    (rN0_LFIR, bit(1)) ? self_th_32perDay;
 
     /** N0_LFIR[2]
      *  local errors from CC (PCB error)
      */
-    (rN0_LFIR, bit(2)) ? defaultMaskedError;
+    (rN0_LFIR, bit(2)) ? self_th_32perDay;
 
     /** N0_LFIR[3]
      *  local errors from CC
      */
-    (rN0_LFIR, bit(3)) ? defaultMaskedError;
+    (rN0_LFIR, bit(3)) ? self_th_32perDay;
 
     /** N0_LFIR[4]
      *  local errors from PSC (PCB error)
@@ -2915,14 +2915,19 @@ group gN0_LFIR filter singlebit
     (rN0_LFIR, bit(16|17|18|19|20|21|22|23)) ? defaultMaskedError;
 
     /** N0_LFIR[24]
-     *  Errors from Bsense IO
+     *  spare
      */
     (rN0_LFIR, bit(24)) ? defaultMaskedError;
 
-    /** N0_LFIR[25:40]
+    /** N0_LFIR[25]
+     *  Errors from Bsense IO
+     */
+    (rN0_LFIR, bit(25)) ? defaultMaskedError;
+
+    /** N0_LFIR[26:40]
      *  spare
      */
-    (rN0_LFIR, bit(25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40)) ? defaultMaskedError;
+    (rN0_LFIR, bit(26|27|28|29|30|31|32|33|34|35|36|37|38|39|40)) ? defaultMaskedError;
 
     /** N0_LFIR[41]
      *  Malf-alert Broadcast via OOB
@@ -3493,17 +3498,17 @@ group gN1_LFIR filter singlebit
     /** N1_LFIR[1]
      *  local errors from GPIO
      */
-    (rN1_LFIR, bit(1)) ? defaultMaskedError;
+    (rN1_LFIR, bit(1)) ? self_th_32perDay;
 
     /** N1_LFIR[2]
      *  local errors from CC
      */
-    (rN1_LFIR, bit(2)) ? defaultMaskedError;
+    (rN1_LFIR, bit(2)) ? self_th_32perDay;
 
     /** N1_LFIR[3]
      *  local errors from cc
      */
-    (rN1_LFIR, bit(3)) ? defaultMaskedError;
+    (rN1_LFIR, bit(3)) ? self_th_32perDay;
 
     /** N1_LFIR[4]
      *  pcb error from psc
@@ -3601,14 +3606,19 @@ group gN1_LFIR filter singlebit
     (rN1_LFIR, bit(22|23)) ? defaultMaskedError;
 
     /** N1_LFIR[24]
-     *  errors from bsense I/O
+     *  spare
      */
     (rN1_LFIR, bit(24)) ? defaultMaskedError;
 
-    /** N1_LFIR[25:40]
+    /** N1_LFIR[25]
+     *  Errors from Bsense IO
+     */
+    (rN1_LFIR, bit(25)) ? defaultMaskedError;
+
+    /** N1_LFIR[26:40]
      *  spare
      */
-    (rN1_LFIR, bit(25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40)) ? defaultMaskedError;
+    (rN1_LFIR, bit(26|27|28|29|30|31|32|33|34|35|36|37|38|39|40)) ? defaultMaskedError;
 
     /** N1_LFIR[41]
      *  malfunction alert broadcast via OOB
@@ -4154,17 +4164,17 @@ group gN2_LFIR filter singlebit
     /** N2_LFIR[1]
      *  local errors from GPIO
      */
-    (rN2_LFIR, bit(1)) ? defaultMaskedError;
+    (rN2_LFIR, bit(1)) ? self_th_32perDay;
 
     /** N2_LFIR[2]
      *  local errors from CC
      */
-    (rN2_LFIR, bit(2)) ? defaultMaskedError;
+    (rN2_LFIR, bit(2)) ? self_th_32perDay;
 
     /** N2_LFIR[3]
      *  local errors from cc
      */
-    (rN2_LFIR, bit(3)) ? defaultMaskedError;
+    (rN2_LFIR, bit(3)) ? self_th_32perDay;
 
     /** N2_LFIR[4]
      *  pcb error from psc
@@ -4222,14 +4232,19 @@ group gN2_LFIR filter singlebit
     (rN2_LFIR, bit(14|15|16|17|18|19|20|21|22|23)) ? defaultMaskedError;
 
     /** N2_LFIR[24]
-     *  errors from bsense I/O
+     *  spare
      */
     (rN2_LFIR, bit(24)) ? defaultMaskedError;
 
-    /** N2_LFIR[25:40]
+    /** N2_LFIR[25]
+     *  Errors from Bsense IO
+     */
+    (rN2_LFIR, bit(25)) ? defaultMaskedError;
+
+    /** N2_LFIR[26:40]
      *  spare
      */
-    (rN2_LFIR, bit(25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40)) ? defaultMaskedError;
+    (rN2_LFIR, bit(26|27|28|29|30|31|32|33|34|35|36|37|38|39|40)) ? defaultMaskedError;
 
     /** N2_LFIR[41]
      *  malfunction alert broadcast via OOB
@@ -4475,17 +4490,17 @@ group gN3_LFIR filter singlebit
     /** N3_LFIR[1]
      *  Errors from Control
      */
-    (rN3_LFIR, bit(1)) ? defaultMaskedError;
+    (rN3_LFIR, bit(1)) ? self_th_32perDay;
 
     /** N3_LFIR[2]
      *  local err from CC (PCB error)
      */
-    (rN3_LFIR, bit(2)) ? defaultMaskedError;
+    (rN3_LFIR, bit(2)) ? self_th_32perDay;
 
     /** N3_LFIR[3]
      *  local err from CC
      */
-    (rN3_LFIR, bit(3)) ? defaultMaskedError;
+    (rN3_LFIR, bit(3)) ? self_th_32perDay;
 
     /** N3_LFIR[4]
      *  local err from PSC
@@ -4588,14 +4603,39 @@ group gN3_LFIR filter singlebit
     (rN3_LFIR, bit(23)) ? defaultMaskedError;
 
     /** N3_LFIR[24]
-     *  Errors from Bsense IO
+     *  spare
      */
     (rN3_LFIR, bit(24)) ? defaultMaskedError;
 
-    /** N3_LFIR[25:40]
+    /** N3_LFIR[25]
+     *  Errors from Bsense IO
+     */
+    (rN3_LFIR, bit(25)) ? defaultMaskedError;
+
+    /** N3_LFIR[26:31]
+     *  spare
+     */
+    (rN3_LFIR, bit(26|27|28|29|30|31)) ? defaultMaskedError;
+
+    /** N3_LFIR[32]
+     *  FW asserted failsafe timer
+     */
+    (rN3_LFIR, bit(32)) ? self_th_1;
+
+    /** N3_LFIR[33]
+     *  FW asserted system quisce
+     */
+    (rN3_LFIR, bit(33)) ? self_th_1;
+
+    /** N3_LFIR[34]
+     *  FW asserted Chip Quisce
+     */
+    (rN3_LFIR, bit(34)) ? self_th_1;
+
+    /** N3_LFIR[35:40]
      *  spare
      */
-    (rN3_LFIR, bit(25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40)) ? defaultMaskedError;
+    (rN3_LFIR, bit(35|36|37|38|39|40)) ? defaultMaskedError;
 
     /** N3_LFIR[41]
      *  Malfunction Alert broadcast via OOB
@@ -6887,7 +6927,12 @@ group gINTCQFIR filter singlebit
     /** INTCQFIR[46]
      *  INT_CQ_FIR_FIR_PARITY_ERR:
      */
-    (rINTCQFIR, bit(46)) ? self_th_1; # masked on DD1.0
+    (rINTCQFIR, bit(46)) ? defaultMaskedError;
+
+    /** INTCQFIR[46]
+     *  INT_CQ_FIR_FIR_PARITY_ERR:
+     */
+    (rINTCQFIR, bit(46)) ? self_th_1;
 
     /** INTCQFIR[47]
      *  INT_CQ_FIR_PGM_DBG_ACCESS:
@@ -7655,17 +7700,17 @@ group gXB_LFIR filter singlebit
     /** XB_LFIR[1]
      *  local error from GPIO
      */
-    (rXB_LFIR, bit(1)) ? defaultMaskedError;
+    (rXB_LFIR, bit(1)) ? self_th_32perDay;
 
     /** XB_LFIR[2]
      *  local err from CC
      */
-    (rXB_LFIR, bit(2)) ? defaultMaskedError;
+    (rXB_LFIR, bit(2)) ? self_th_32perDay;
 
     /** XB_LFIR[3]
      *  local err from CC
      */
-    (rXB_LFIR, bit(3)) ? defaultMaskedError;
+    (rXB_LFIR, bit(3)) ? self_th_32perDay;
 
     /** XB_LFIR[4]
      *  local err from PSC
@@ -8048,17 +8093,17 @@ group gMC_LFIR_0 filter singlebit
     /** MC_LFIR_0[1]
      *  local errors from GPIO
      */
-    (rMC_LFIR_0, bit(1)) ? defaultMaskedError;
+    (rMC_LFIR_0, bit(1)) ? self_th_32perDay;
 
     /** MC_LFIR_0[2]
      *  local errors from CC
      */
-    (rMC_LFIR_0, bit(2)) ? defaultMaskedError;
+    (rMC_LFIR_0, bit(2)) ? self_th_32perDay;
 
     /** MC_LFIR_0[3]
      *  local errors from cc
      */
-    (rMC_LFIR_0, bit(3)) ? defaultMaskedError;
+    (rMC_LFIR_0, bit(3)) ? self_th_32perDay;
 
     /** MC_LFIR_0[4]
      *  pcb error from psc
@@ -8358,17 +8403,17 @@ group gMC_LFIR_1 filter singlebit
     /** MC_LFIR_1[1]
      *  local errors from GPIO
      */
-    (rMC_LFIR_1, bit(1)) ? defaultMaskedError;
+    (rMC_LFIR_1, bit(1)) ? self_th_32perDay;
 
     /** MC_LFIR_1[2]
      *  local errors from CC
      */
-    (rMC_LFIR_1, bit(2)) ? defaultMaskedError;
+    (rMC_LFIR_1, bit(2)) ? self_th_32perDay;
 
     /** MC_LFIR_1[3]
      *  local errors from cc
      */
-    (rMC_LFIR_1, bit(3)) ? defaultMaskedError;
+    (rMC_LFIR_1, bit(3)) ? self_th_32perDay;
 
     /** MC_LFIR_1[4]
      *  pcb error from psc
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_obus.rule b/src/usr/diag/prdf/common/plat/p9/p9_obus.rule
index c0547e7a9..271c96608 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_obus.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_obus.rule
@@ -329,17 +329,17 @@ group gOB_LFIR filter singlebit
     /** OB_LFIR[1]
      *  Local errors from GPIO
      */
-    (rOB_LFIR, bit(1)) ? defaultMaskedError;
+    (rOB_LFIR, bit(1)) ? self_th_32perDay;
 
     /** OB_LFIR[2]
      *  local err from CC
      */
-    (rOB_LFIR, bit(2)) ? defaultMaskedError;
+    (rOB_LFIR, bit(2)) ? self_th_32perDay;
 
     /** OB_LFIR[3]
      *  local err from CC
      */
-    (rOB_LFIR, bit(3)) ? defaultMaskedError;
+    (rOB_LFIR, bit(3)) ? self_th_32perDay;
 
     /** OB_LFIR[4]
      *  local err from PSC
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_pec.rule b/src/usr/diag/prdf/common/plat/p9/p9_pec.rule
index 762013338..3739addb8 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_pec.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_pec.rule
@@ -176,17 +176,17 @@ group gPCI_LFIR filter singlebit
     /** PCI_LFIR[1]
      *  local errors from GPIO
      */
-    (rPCI_LFIR, bit(1)) ? defaultMaskedError;
+    (rPCI_LFIR, bit(1)) ? self_th_32perDay;
 
     /** PCI_LFIR[2]
      *  local errors from CC
      */
-    (rPCI_LFIR, bit(2)) ? defaultMaskedError;
+    (rPCI_LFIR, bit(2)) ? self_th_32perDay;
 
     /** PCI_LFIR[3]
      *  local errors from cc
      */
-    (rPCI_LFIR, bit(3)) ? defaultMaskedError;
+    (rPCI_LFIR, bit(3)) ? self_th_32perDay;
 
     /** PCI_LFIR[4]
      *  pcb error from psc