PRD: Update actions for all FIR bits

Change-Id: I57eedb72b6e66f2fc0494722819b7d3721b28d40
RTC: 152591
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28754
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29057
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 234 insertions, 933 deletions

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 23d92bdb6..ac67dea03 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
@@ -187,6 +187,10 @@ chip p9_ex
         capture     req nonzero("CMEFIR");
     };
 
+
+# Include registers not defined by the xml
+.include "p9_ex_regs.rule";
+
 };
 
  ##############################################################################
@@ -245,322 +249,177 @@ group gL2FIR filter singlebit
     /** L2FIR[0]
      *  
      */
-    (rL2FIR, bit(0)) ? TBDDefaultCallout;
+    (rL2FIR, bit(0)) ? defaultMaskedError;
 
     /** L2FIR[1]
      *  
      */
-    (rL2FIR, bit(1)) ? TBDDefaultCallout;
+    (rL2FIR, bit(1)) ? defaultMaskedError;
 
     /** L2FIR[2]
-     *  
+     *  L2 cache read SUE
      */
-    (rL2FIR, bit(2)) ? TBDDefaultCallout;
+    (rL2FIR, bit(2)) ? defaultMaskedError;
 
     /** L2FIR[3]
-     *  
+     *  Hw directory initiated line delete
      */
-    (rL2FIR, bit(3)) ? TBDDefaultCallout;
+    (rL2FIR, bit(3)) ? defaultMaskedError;
 
     /** L2FIR[4]
-     *  
+     *  ue or sue detected by on modified line
      */
-    (rL2FIR, bit(4)) ? TBDDefaultCallout;
+    (rL2FIR, bit(4)) ? defaultMaskedError;
 
     /** L2FIR[5]
-     *  
+     *  ue or sue detected on non-modified line
      */
-    (rL2FIR, bit(5)) ? TBDDefaultCallout;
+    (rL2FIR, bit(5)) ? defaultMaskedError;
 
     /** L2FIR[6]
-     *  
+     *  L2 directory read CE
      */
-    (rL2FIR, bit(6)) ? TBDDefaultCallout;
+    (rL2FIR, bit(6)) ? self_th_32perDay;
 
     /** L2FIR[7]
-     *  
+     *  L2 directory read UE
      */
-    (rL2FIR, bit(7)) ? TBDDefaultCallout;
+    (rL2FIR, bit(7)) ? self_th_1;
 
     /** L2FIR[8]
-     *  
+     *  L2 directory CE due to stuck bit
      */
-    (rL2FIR, bit(8)) ? TBDDefaultCallout;
+    (rL2FIR, bit(8)) ? self_th_1;
 
     /** L2FIR[9]
-     *  
+     *  L2 directory stuck bit CE repair failed
      */
-    (rL2FIR, bit(9)) ? TBDDefaultCallout;
+    (rL2FIR, bit(9)) ? self_th_1;
 
     /** L2FIR[10]
-     *  
+     *  Muliple l2 cache dir errors
      */
-    (rL2FIR, bit(10)) ? TBDDefaultCallout;
+    (rL2FIR, bit(10)) ? defaultMaskedError;
 
     /** L2FIR[11]
-     *  
+     *  LRU read error detected
      */
-    (rL2FIR, bit(11)) ? TBDDefaultCallout;
+    (rL2FIR, bit(11)) ? self_th_32perDay;
 
     /** L2FIR[12]
-     *  
+     *  RC Powerbus data timeout
      */
-    (rL2FIR, bit(12)) ? TBDDefaultCallout;
+    (rL2FIR, bit(12)) ? level2_th_1;
 
     /** L2FIR[13]
-     *  
+     *  NCU Powerbus data timeout
      */
-    (rL2FIR, bit(13)) ? TBDDefaultCallout;
+    (rL2FIR, bit(13)) ? level2_th_1;
 
     /** L2FIR[14]
      *  
      */
-    (rL2FIR, bit(14)) ? TBDDefaultCallout;
+    (rL2FIR, bit(14)) ? defaultMaskedError;
 
     /** L2FIR[15]
-     *  
+     *  LRU all members in a class line deleted
      */
-    (rL2FIR, bit(15)) ? TBDDefaultCallout;
+    (rL2FIR, bit(15)) ? self_th_1;
 
     /** L2FIR[16]
-     *  
+     *  Cache line inhibited hit cacheable space
      */
-    (rL2FIR, bit(16)) ? TBDDefaultCallout;
+    (rL2FIR, bit(16)) ? self_th_1;
 
     /** L2FIR[17]
-     *  
+     *  (RC) load received pb cresp addr error
      */
-    (rL2FIR, bit(17)) ? TBDDefaultCallout;
+    (rL2FIR, bit(17)) ? level2_th_1;
 
     /** L2FIR[18]
-     *  
+     *  (RC) store received pb cresp add error
      */
-    (rL2FIR, bit(18)) ? TBDDefaultCallout;
+    (rL2FIR, bit(18)) ? level2_dump_SH;
 
     /** L2FIR[19]
      *  
      */
-    (rL2FIR, bit(19)) ? TBDDefaultCallout;
+    (rL2FIR, bit(19)) ? defaultMaskedError;
 
     /** L2FIR[20]
-     *  
+     *  RC or NCU Pb data UE error
      */
-    (rL2FIR, bit(20)) ? TBDDefaultCallout;
+    (rL2FIR, bit(20)) ? self_th_1;
 
     /** L2FIR[21]
-     *  
+     *  RC or NCU PB data SUE detected
      */
-    (rL2FIR, bit(21)) ? TBDDefaultCallout;
+    (rL2FIR, bit(21)) ? defaultMaskedError;
 
     /** L2FIR[22]
-     *  
+     *  CopyPaste_Tgt_Nodal_req_cresp_dinc_Err
      */
-    (rL2FIR, bit(22)) ? TBDDefaultCallout;
+    (rL2FIR, bit(22)) ? self_th_1;
 
     /** L2FIR[23]
-     *  
+     *  RC fabric op Ld cresp add error
      */
-    (rL2FIR, bit(23)) ? TBDDefaultCallout;
+    (rL2FIR, bit(23)) ? defaultMaskedError;
 
     /** L2FIR[24]
-     *  
+     *  PE on data from RCDAT
      */
-    (rL2FIR, bit(24)) ? TBDDefaultCallout;
+    (rL2FIR, bit(24)) ? self_th_1;
 
     /** L2FIR[25]
-     *  
+     *  L2 castout or CN cresp addr err
      */
-    (rL2FIR, bit(25)) ? TBDDefaultCallout;
+    (rL2FIR, bit(25)) ? defaultMaskedError;
 
     /** L2FIR[26]
-     *  
+     *  LVDIR tracking PE
      */
-    (rL2FIR, bit(26)) ? TBDDefaultCallout;
+    (rL2FIR, bit(26)) ? self_th_32perDay;
 
     /** L2FIR[27]
-     *  
+     *  RC fabric op cresp=ack_dead error
      */
-    (rL2FIR, bit(27)) ? TBDDefaultCallout;
+    (rL2FIR, bit(27)) ? defaultMaskedError;
 
     /** L2FIR[28]
-     *  
+     *  Darn data timeout
      */
-    (rL2FIR, bit(28)) ? TBDDefaultCallout;
+    (rL2FIR, bit(28)) ? self_th_1;
 
     /** L2FIR[29]
-     *  
-     */
-    (rL2FIR, bit(29)) ? TBDDefaultCallout;
-
-    /** L2FIR[30]
-     *  
+     *  RC fabric op store cresp/misc error
      */
-    (rL2FIR, bit(30)) ? TBDDefaultCallout;
+    (rL2FIR, bit(29)) ? defaultMaskedError;
 
-    /** L2FIR[31]
-     *  
+    /** L2FIR[30:35]
+     *  spare
      */
-    (rL2FIR, bit(31)) ? TBDDefaultCallout;
-
-    /** L2FIR[32]
-     *  
-     */
-    (rL2FIR, bit(32)) ? TBDDefaultCallout;
-
-    /** L2FIR[33]
-     *  
-     */
-    (rL2FIR, bit(33)) ? TBDDefaultCallout;
-
-    /** L2FIR[34]
-     *  
-     */
-    (rL2FIR, bit(34)) ? TBDDefaultCallout;
-
-    /** L2FIR[35]
-     *  
-     */
-    (rL2FIR, bit(35)) ? TBDDefaultCallout;
+    (rL2FIR, bit(30|31|32|33|34|35)) ? defaultMaskedError;
 
     /** L2FIR[36]
-     *  
-     */
-    (rL2FIR, bit(36)) ? TBDDefaultCallout;
-
-    /** L2FIR[37]
-     *  
+     *  Cache CE and UE in short time period
      */
-    (rL2FIR, bit(37)) ? TBDDefaultCallout;
+    (rL2FIR, bit(36)) ? self_th_1;
 
-    /** L2FIR[38]
-     *  
+    /** L2FIR[37:39]
+     *  spare
      */
-    (rL2FIR, bit(38)) ? TBDDefaultCallout;
-
-    /** L2FIR[39]
-     *  
-     */
-    (rL2FIR, bit(39)) ? TBDDefaultCallout;
+    (rL2FIR, bit(37|38|39)) ? defaultMaskedError;
 
     /** L2FIR[40]
-     *  
+     *  scom error
      */
-    (rL2FIR, bit(40)) ? TBDDefaultCallout;
+    (rL2FIR, bit(40)) ? defaultMaskedError;
 
     /** L2FIR[41]
-     *  
-     */
-    (rL2FIR, bit(41)) ? TBDDefaultCallout;
-
-    /** L2FIR[42]
-     *  
-     */
-    (rL2FIR, bit(42)) ? TBDDefaultCallout;
-
-    /** L2FIR[43]
-     *  
-     */
-    (rL2FIR, bit(43)) ? TBDDefaultCallout;
-
-    /** L2FIR[44]
-     *  
-     */
-    (rL2FIR, bit(44)) ? TBDDefaultCallout;
-
-    /** L2FIR[45]
-     *  
-     */
-    (rL2FIR, bit(45)) ? TBDDefaultCallout;
-
-    /** L2FIR[46]
-     *  
-     */
-    (rL2FIR, bit(46)) ? TBDDefaultCallout;
-
-    /** L2FIR[47]
-     *  
-     */
-    (rL2FIR, bit(47)) ? TBDDefaultCallout;
-
-    /** L2FIR[48]
-     *  
-     */
-    (rL2FIR, bit(48)) ? TBDDefaultCallout;
-
-    /** L2FIR[49]
-     *  
-     */
-    (rL2FIR, bit(49)) ? TBDDefaultCallout;
-
-    /** L2FIR[50]
-     *  
-     */
-    (rL2FIR, bit(50)) ? TBDDefaultCallout;
-
-    /** L2FIR[51]
-     *  
+     *  scom error
      */
-    (rL2FIR, bit(51)) ? TBDDefaultCallout;
-
-    /** L2FIR[52]
-     *  
-     */
-    (rL2FIR, bit(52)) ? TBDDefaultCallout;
-
-    /** L2FIR[53]
-     *  
-     */
-    (rL2FIR, bit(53)) ? TBDDefaultCallout;
-
-    /** L2FIR[54]
-     *  
-     */
-    (rL2FIR, bit(54)) ? TBDDefaultCallout;
-
-    /** L2FIR[55]
-     *  
-     */
-    (rL2FIR, bit(55)) ? TBDDefaultCallout;
-
-    /** L2FIR[56]
-     *  
-     */
-    (rL2FIR, bit(56)) ? TBDDefaultCallout;
-
-    /** L2FIR[57]
-     *  
-     */
-    (rL2FIR, bit(57)) ? TBDDefaultCallout;
-
-    /** L2FIR[58]
-     *  
-     */
-    (rL2FIR, bit(58)) ? TBDDefaultCallout;
-
-    /** L2FIR[59]
-     *  
-     */
-    (rL2FIR, bit(59)) ? TBDDefaultCallout;
-
-    /** L2FIR[60]
-     *  
-     */
-    (rL2FIR, bit(60)) ? TBDDefaultCallout;
-
-    /** L2FIR[61]
-     *  
-     */
-    (rL2FIR, bit(61)) ? TBDDefaultCallout;
-
-    /** L2FIR[62]
-     *  
-     */
-    (rL2FIR, bit(62)) ? TBDDefaultCallout;
-
-    /** L2FIR[63]
-     *  
-     */
-    (rL2FIR, bit(63)) ? TBDDefaultCallout;
+    (rL2FIR, bit(41)) ? defaultMaskedError;
 
 };
 
@@ -579,324 +438,129 @@ rule rNCUFIR
 group gNCUFIR filter singlebit
 {
     /** NCUFIR[0]
-     *  
+     *  NCU store queue control error
      */
-    (rNCUFIR, bit(0)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(0)) ? self_th_1;
 
     /** NCUFIR[1]
-     *  
+     *  TLBIE control error.
      */
-    (rNCUFIR, bit(1)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(1)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[2]
-     *  
+     *  TL or  SLBIEG illegal fields from core.
      */
-    (rNCUFIR, bit(2)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(2)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[3]
-     *  
+     *  NCU Store Address Error
      */
-    (rNCUFIR, bit(3)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(3)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[4]
-     *  
+     *  NCU load Address Error
      */
-    (rNCUFIR, bit(4)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(4)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[5]
-     *  
+     *  Store received ack_dead.
      */
-    (rNCUFIR, bit(5)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(5)) ? defaultMaskedError;
 
     /** NCUFIR[6]
-     *  
+     *  Load received ack_dead.
      */
-    (rNCUFIR, bit(6)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(6)) ? defaultMaskedError;
 
     /** NCUFIR[7]
-     *  
+     *  MSGSND received addr_err
      */
-    (rNCUFIR, bit(7)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(7)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[8]
-     *  
+     *  NCU Store Queue Data Parity Err
      */
-    (rNCUFIR, bit(8)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(8)) ? self_th_1;
 
     /** NCUFIR[9]
-     *  
+     *  store timed out on pb
      */
-    (rNCUFIR, bit(9)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(9)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[10]
-     *  
+     *  tlbie master timeout
      */
-    (rNCUFIR, bit(10)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(10)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[11]
-     *  
+     *  NCU no response to snooped TLBIE
      */
-    (rNCUFIR, bit(11)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(11)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[12]
-     *  
+     *  ima cresp addr error
      */
-    (rNCUFIR, bit(12)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(12)) ? self_th_1;
 
     /** NCUFIR[13]
-     *  
+     *  ima received ack_dead
      */
-    (rNCUFIR, bit(13)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(13)) ? defaultMaskedError;
 
     /** NCUFIR[14]
-     *  
+     *  pmisc cresp addr err
      */
-    (rNCUFIR, bit(14)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(14)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[15]
-     *  
+     *  PPE read cresp address error
      */
-    (rNCUFIR, bit(15)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(15)) ? level2_th_1;
 
     /** NCUFIR[16]
-     *  
+     *  PPE write cresp address error
      */
-    (rNCUFIR, bit(16)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(16)) ? level2_th_1;
 
     /** NCUFIR[17]
-     *  
+     *  ppe read received ack dead
      */
-    (rNCUFIR, bit(17)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(17)) ? defaultMaskedError;
 
     /** NCUFIR[18]
-     *  
+     *  ppe write received ack dead
      */
-    (rNCUFIR, bit(18)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(18)) ? defaultMaskedError;
 
     /** NCUFIR[19]
-     *  
+     *  tgt nodal ppe write received ack dead
      */
-    (rNCUFIR, bit(19)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(19)) ? defaultMaskedError;
 
     /** NCUFIR[20]
-     *  
+     *  darn ttype while darn not enabled
      */
-    (rNCUFIR, bit(20)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(20)) ? level2_M_self_L_dump_SH;
 
     /** NCUFIR[21]
-     *  
-     */
-    (rNCUFIR, bit(21)) ? TBDDefaultCallout;
-
-    /** NCUFIR[22]
-     *  
-     */
-    (rNCUFIR, bit(22)) ? TBDDefaultCallout;
-
-    /** NCUFIR[23]
-     *  
-     */
-    (rNCUFIR, bit(23)) ? TBDDefaultCallout;
-
-    /** NCUFIR[24]
-     *  
+     *  addr darn type while darn not enabled
      */
-    (rNCUFIR, bit(24)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(21)) ? level2_M_self_L_dump_SH;
 
-    /** NCUFIR[25]
-     *  
+    /** NCUFIR[22:28]
+     *  spare
      */
-    (rNCUFIR, bit(25)) ? TBDDefaultCallout;
-
-    /** NCUFIR[26]
-     *  
-     */
-    (rNCUFIR, bit(26)) ? TBDDefaultCallout;
-
-    /** NCUFIR[27]
-     *  
-     */
-    (rNCUFIR, bit(27)) ? TBDDefaultCallout;
-
-    /** NCUFIR[28]
-     *  
-     */
-    (rNCUFIR, bit(28)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(22|23|24|25|26|27|28)) ? defaultMaskedError;
 
     /** NCUFIR[29]
-     *  
+     *  scom error
      */
-    (rNCUFIR, bit(29)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(29)) ? defaultMaskedError;
 
     /** NCUFIR[30]
-     *  
-     */
-    (rNCUFIR, bit(30)) ? TBDDefaultCallout;
-
-    /** NCUFIR[31]
-     *  
+     *  scom error
      */
-    (rNCUFIR, bit(31)) ? TBDDefaultCallout;
-
-    /** NCUFIR[32]
-     *  
-     */
-    (rNCUFIR, bit(32)) ? TBDDefaultCallout;
-
-    /** NCUFIR[33]
-     *  
-     */
-    (rNCUFIR, bit(33)) ? TBDDefaultCallout;
-
-    /** NCUFIR[34]
-     *  
-     */
-    (rNCUFIR, bit(34)) ? TBDDefaultCallout;
-
-    /** NCUFIR[35]
-     *  
-     */
-    (rNCUFIR, bit(35)) ? TBDDefaultCallout;
-
-    /** NCUFIR[36]
-     *  
-     */
-    (rNCUFIR, bit(36)) ? TBDDefaultCallout;
-
-    /** NCUFIR[37]
-     *  
-     */
-    (rNCUFIR, bit(37)) ? TBDDefaultCallout;
-
-    /** NCUFIR[38]
-     *  
-     */
-    (rNCUFIR, bit(38)) ? TBDDefaultCallout;
-
-    /** NCUFIR[39]
-     *  
-     */
-    (rNCUFIR, bit(39)) ? TBDDefaultCallout;
-
-    /** NCUFIR[40]
-     *  
-     */
-    (rNCUFIR, bit(40)) ? TBDDefaultCallout;
-
-    /** NCUFIR[41]
-     *  
-     */
-    (rNCUFIR, bit(41)) ? TBDDefaultCallout;
-
-    /** NCUFIR[42]
-     *  
-     */
-    (rNCUFIR, bit(42)) ? TBDDefaultCallout;
-
-    /** NCUFIR[43]
-     *  
-     */
-    (rNCUFIR, bit(43)) ? TBDDefaultCallout;
-
-    /** NCUFIR[44]
-     *  
-     */
-    (rNCUFIR, bit(44)) ? TBDDefaultCallout;
-
-    /** NCUFIR[45]
-     *  
-     */
-    (rNCUFIR, bit(45)) ? TBDDefaultCallout;
-
-    /** NCUFIR[46]
-     *  
-     */
-    (rNCUFIR, bit(46)) ? TBDDefaultCallout;
-
-    /** NCUFIR[47]
-     *  
-     */
-    (rNCUFIR, bit(47)) ? TBDDefaultCallout;
-
-    /** NCUFIR[48]
-     *  
-     */
-    (rNCUFIR, bit(48)) ? TBDDefaultCallout;
-
-    /** NCUFIR[49]
-     *  
-     */
-    (rNCUFIR, bit(49)) ? TBDDefaultCallout;
-
-    /** NCUFIR[50]
-     *  
-     */
-    (rNCUFIR, bit(50)) ? TBDDefaultCallout;
-
-    /** NCUFIR[51]
-     *  
-     */
-    (rNCUFIR, bit(51)) ? TBDDefaultCallout;
-
-    /** NCUFIR[52]
-     *  
-     */
-    (rNCUFIR, bit(52)) ? TBDDefaultCallout;
-
-    /** NCUFIR[53]
-     *  
-     */
-    (rNCUFIR, bit(53)) ? TBDDefaultCallout;
-
-    /** NCUFIR[54]
-     *  
-     */
-    (rNCUFIR, bit(54)) ? TBDDefaultCallout;
-
-    /** NCUFIR[55]
-     *  
-     */
-    (rNCUFIR, bit(55)) ? TBDDefaultCallout;
-
-    /** NCUFIR[56]
-     *  
-     */
-    (rNCUFIR, bit(56)) ? TBDDefaultCallout;
-
-    /** NCUFIR[57]
-     *  
-     */
-    (rNCUFIR, bit(57)) ? TBDDefaultCallout;
-
-    /** NCUFIR[58]
-     *  
-     */
-    (rNCUFIR, bit(58)) ? TBDDefaultCallout;
-
-    /** NCUFIR[59]
-     *  
-     */
-    (rNCUFIR, bit(59)) ? TBDDefaultCallout;
-
-    /** NCUFIR[60]
-     *  
-     */
-    (rNCUFIR, bit(60)) ? TBDDefaultCallout;
-
-    /** NCUFIR[61]
-     *  
-     */
-    (rNCUFIR, bit(61)) ? TBDDefaultCallout;
-
-    /** NCUFIR[62]
-     *  
-     */
-    (rNCUFIR, bit(62)) ? TBDDefaultCallout;
-
-    /** NCUFIR[63]
-     *  
-     */
-    (rNCUFIR, bit(63)) ? TBDDefaultCallout;
+    (rNCUFIR, bit(30)) ? defaultMaskedError;
 
 };
 
@@ -915,324 +579,174 @@ rule rL3FIR
 group gL3FIR filter singlebit
 {
     /** L3FIR[0]
-     *  
+     *  L3_RDDSP_SEGR_LCO_ALL_MEM_UNAVAIL_ERR
      */
-    (rL3FIR, bit(0)) ? TBDDefaultCallout;
+    (rL3FIR, bit(0)) ? self_th_1;
 
-    /** L3FIR[1]
-     *  
-     */
-    (rL3FIR, bit(1)) ? TBDDefaultCallout;
-
-    /** L3FIR[2]
-     *  
+    /** L3FIR[1:2]
+     *  spare
      */
-    (rL3FIR, bit(2)) ? TBDDefaultCallout;
+    (rL3FIR, bit(1|2)) ? defaultMaskedError;
 
     /** L3FIR[3]
-     *  
+     *  L3 cache CE and UE within a short period
      */
-    (rL3FIR, bit(3)) ? TBDDefaultCallout;
+    (rL3FIR, bit(3)) ? self_th_1;
 
     /** L3FIR[4]
      *  
      */
-    (rL3FIR, bit(4)) ? TBDDefaultCallout;
+    (rL3FIR, bit(4)) ? defaultMaskedError;
 
     /** L3FIR[5]
      *  
      */
-    (rL3FIR, bit(5)) ? TBDDefaultCallout;
+    (rL3FIR, bit(5)) ? defaultMaskedError;
 
     /** L3FIR[6]
-     *  
+     *  SUE detected on L3 cache read
      */
-    (rL3FIR, bit(6)) ? TBDDefaultCallout;
+    (rL3FIR, bit(6)) ? defaultMaskedError;
 
     /** L3FIR[7]
-     *  
+     *  L3 cache write data CE from Power Bus
      */
-    (rL3FIR, bit(7)) ? TBDDefaultCallout;
+    (rL3FIR, bit(7)) ? self_th_32perDay;
 
     /** L3FIR[8]
-     *  
+     *  L3 cache write data UE from Power Bus
      */
-    (rL3FIR, bit(8)) ? TBDDefaultCallout;
+    (rL3FIR, bit(8)) ? self_th_1;
 
     /** L3FIR[9]
-     *  
+     *  L3 cache write data sue from Power Bus
      */
-    (rL3FIR, bit(9)) ? TBDDefaultCallout;
+    (rL3FIR, bit(9)) ? defaultMaskedError;
 
     /** L3FIR[10]
-     *  
+     *  L3 cache write data CE from L2
      */
-    (rL3FIR, bit(10)) ? TBDDefaultCallout;
+    (rL3FIR, bit(10)) ? self_th_32perDay;
 
     /** L3FIR[11]
      *  
      */
-    (rL3FIR, bit(11)) ? TBDDefaultCallout;
+    (rL3FIR, bit(11)) ? defaultMaskedError;
 
     /** L3FIR[12]
-     *  
+     *  L3 cache write SUE from L2
      */
-    (rL3FIR, bit(12)) ? TBDDefaultCallout;
+    (rL3FIR, bit(12)) ? defaultMaskedError;
 
     /** L3FIR[13]
-     *  
+     *  L3 DIR read CE
      */
-    (rL3FIR, bit(13)) ? TBDDefaultCallout;
+    (rL3FIR, bit(13)) ? self_th_32perDay;
 
     /** L3FIR[14]
-     *  
+     *  L3 Dir read UE
      */
-    (rL3FIR, bit(14)) ? TBDDefaultCallout;
+    (rL3FIR, bit(14)) ? self_th_1;
 
     /** L3FIR[15]
-     *  
+     *  Dir error not found during corr seq.
      */
-    (rL3FIR, bit(15)) ? TBDDefaultCallout;
+    (rL3FIR, bit(15)) ? defaultMaskedError;
 
     /** L3FIR[16]
-     *  
+     *  addr_error cresp for mem SN or CO
      */
-    (rL3FIR, bit(16)) ? TBDDefaultCallout;
+    (rL3FIR, bit(16)) ? self_M_level2_L_th_1;
 
     /** L3FIR[17]
-     *  
+     *  Received addr_error cresp for Prefetch
      */
-    (rL3FIR, bit(17)) ? TBDDefaultCallout;
+    (rL3FIR, bit(17)) ? self_th_1;
 
     /** L3FIR[18]
-     *  
+     *  An L3 machine hung waiting for PB cresp
      */
-    (rL3FIR, bit(18)) ? TBDDefaultCallout;
+    (rL3FIR, bit(18)) ? defaultMaskedError;
 
     /** L3FIR[19]
-     *  
+     *  No LRU member count=0
      */
-    (rL3FIR, bit(19)) ? TBDDefaultCallout;
+    (rL3FIR, bit(19)) ? self_th_1;
 
     /** L3FIR[20]
-     *  
+     *  CE detected on PowerBus read for PPE
      */
-    (rL3FIR, bit(20)) ? TBDDefaultCallout;
+    (rL3FIR, bit(20)) ? self_th_32perDay;
 
     /** L3FIR[21]
-     *  
+     *  UE detected on PowerBus read for PPE
      */
-    (rL3FIR, bit(21)) ? TBDDefaultCallout;
+    (rL3FIR, bit(21)) ? self_th_1;
 
     /** L3FIR[22]
-     *  
+     *  L3 PPE SUE
      */
-    (rL3FIR, bit(22)) ? TBDDefaultCallout;
+    (rL3FIR, bit(22)) ? defaultMaskedError;
 
     /** L3FIR[23]
-     *  
+     *  L3 mach hang
      */
-    (rL3FIR, bit(23)) ? TBDDefaultCallout;
+    (rL3FIR, bit(23)) ? self_M_level2_L_th_1;
 
     /** L3FIR[24]
-     *  
+     *  L3 Hw control err
      */
-    (rL3FIR, bit(24)) ? TBDDefaultCallout;
+    (rL3FIR, bit(24)) ? self_th_1;
 
     /** L3FIR[25]
-     *  
+     *  Cache inhitited op in L3 directory
      */
-    (rL3FIR, bit(25)) ? TBDDefaultCallout;
+    (rL3FIR, bit(25)) ? self_M_level2_L_th_1;
 
     /** L3FIR[26]
-     *  
+     *  L3 line delete CE done
      */
-    (rL3FIR, bit(26)) ? TBDDefaultCallout;
+    (rL3FIR, bit(26)) ? defaultMaskedError;
 
     /** L3FIR[27]
-     *  
+     *  L3 DRAM logic error
      */
-    (rL3FIR, bit(27)) ? TBDDefaultCallout;
+    (rL3FIR, bit(27)) ? self_th_1;
 
     /** L3FIR[28]
-     *  
+     *  L3 LRU array parity error
      */
-    (rL3FIR, bit(28)) ? TBDDefaultCallout;
+    (rL3FIR, bit(28)) ? self_th_1;
 
     /** L3FIR[29]
-     *  
+     *  L3 cache congruence cache deleted
      */
-    (rL3FIR, bit(29)) ? TBDDefaultCallout;
+    (rL3FIR, bit(29)) ? self_th_1;
 
     /** L3FIR[30]
-     *  
+     *  L3 cache timer refresh error
      */
-    (rL3FIR, bit(30)) ? TBDDefaultCallout;
+    (rL3FIR, bit(30)) ? self_th_1;
 
     /** L3FIR[31]
-     *  
+     *  L3 PowerBus Master Write CRESP ack_dead
      */
-    (rL3FIR, bit(31)) ? TBDDefaultCallout;
+    (rL3FIR, bit(31)) ? defaultMaskedError;
 
     /** L3FIR[32]
-     *  
+     *  PB Master Read received ack_dead CRESP
      */
-    (rL3FIR, bit(32)) ? TBDDefaultCallout;
+    (rL3FIR, bit(32)) ? defaultMaskedError;
 
     /** L3FIR[33]
-     *  
+     *  scom error
      */
-    (rL3FIR, bit(33)) ? TBDDefaultCallout;
+    (rL3FIR, bit(33)) ? defaultMaskedError;
 
     /** L3FIR[34]
-     *  
-     */
-    (rL3FIR, bit(34)) ? TBDDefaultCallout;
-
-    /** L3FIR[35]
-     *  
+     *  scom error
      */
-    (rL3FIR, bit(35)) ? TBDDefaultCallout;
-
-    /** L3FIR[36]
-     *  
-     */
-    (rL3FIR, bit(36)) ? TBDDefaultCallout;
-
-    /** L3FIR[37]
-     *  
-     */
-    (rL3FIR, bit(37)) ? TBDDefaultCallout;
-
-    /** L3FIR[38]
-     *  
-     */
-    (rL3FIR, bit(38)) ? TBDDefaultCallout;
-
-    /** L3FIR[39]
-     *  
-     */
-    (rL3FIR, bit(39)) ? TBDDefaultCallout;
-
-    /** L3FIR[40]
-     *  
-     */
-    (rL3FIR, bit(40)) ? TBDDefaultCallout;
-
-    /** L3FIR[41]
-     *  
-     */
-    (rL3FIR, bit(41)) ? TBDDefaultCallout;
-
-    /** L3FIR[42]
-     *  
-     */
-    (rL3FIR, bit(42)) ? TBDDefaultCallout;
-
-    /** L3FIR[43]
-     *  
-     */
-    (rL3FIR, bit(43)) ? TBDDefaultCallout;
-
-    /** L3FIR[44]
-     *  
-     */
-    (rL3FIR, bit(44)) ? TBDDefaultCallout;
-
-    /** L3FIR[45]
-     *  
-     */
-    (rL3FIR, bit(45)) ? TBDDefaultCallout;
-
-    /** L3FIR[46]
-     *  
-     */
-    (rL3FIR, bit(46)) ? TBDDefaultCallout;
-
-    /** L3FIR[47]
-     *  
-     */
-    (rL3FIR, bit(47)) ? TBDDefaultCallout;
-
-    /** L3FIR[48]
-     *  
-     */
-    (rL3FIR, bit(48)) ? TBDDefaultCallout;
-
-    /** L3FIR[49]
-     *  
-     */
-    (rL3FIR, bit(49)) ? TBDDefaultCallout;
-
-    /** L3FIR[50]
-     *  
-     */
-    (rL3FIR, bit(50)) ? TBDDefaultCallout;
-
-    /** L3FIR[51]
-     *  
-     */
-    (rL3FIR, bit(51)) ? TBDDefaultCallout;
-
-    /** L3FIR[52]
-     *  
-     */
-    (rL3FIR, bit(52)) ? TBDDefaultCallout;
-
-    /** L3FIR[53]
-     *  
-     */
-    (rL3FIR, bit(53)) ? TBDDefaultCallout;
-
-    /** L3FIR[54]
-     *  
-     */
-    (rL3FIR, bit(54)) ? TBDDefaultCallout;
-
-    /** L3FIR[55]
-     *  
-     */
-    (rL3FIR, bit(55)) ? TBDDefaultCallout;
-
-    /** L3FIR[56]
-     *  
-     */
-    (rL3FIR, bit(56)) ? TBDDefaultCallout;
-
-    /** L3FIR[57]
-     *  
-     */
-    (rL3FIR, bit(57)) ? TBDDefaultCallout;
-
-    /** L3FIR[58]
-     *  
-     */
-    (rL3FIR, bit(58)) ? TBDDefaultCallout;
-
-    /** L3FIR[59]
-     *  
-     */
-    (rL3FIR, bit(59)) ? TBDDefaultCallout;
-
-    /** L3FIR[60]
-     *  
-     */
-    (rL3FIR, bit(60)) ? TBDDefaultCallout;
-
-    /** L3FIR[61]
-     *  
-     */
-    (rL3FIR, bit(61)) ? TBDDefaultCallout;
-
-    /** L3FIR[62]
-     *  
-     */
-    (rL3FIR, bit(62)) ? TBDDefaultCallout;
-
-    /** L3FIR[63]
-     *  
-     */
-    (rL3FIR, bit(63)) ? TBDDefaultCallout;
+    (rL3FIR, bit(34)) ? defaultMaskedError;
 
 };
 
@@ -1251,324 +765,109 @@ rule rCMEFIR
 group gCMEFIR filter singlebit
 {
     /** CMEFIR[0]
-     *  
+     *  PPE asserted an internal error
      */
-    (rCMEFIR, bit(0)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(0)) ? defaultMaskedError;
 
     /** CMEFIR[1]
-     *  
+     *  PPE  external interface error
      */
-    (rCMEFIR, bit(1)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(1)) ? defaultMaskedError;
 
     /** CMEFIR[2]
-     *  
+     *  PPE  lack of forward progress
      */
-    (rCMEFIR, bit(2)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(2)) ? defaultMaskedError;
 
     /** CMEFIR[3]
-     *  
+     *  PPE software-requested breakpoint event.
      */
-    (rCMEFIR, bit(3)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(3)) ? defaultMaskedError;
 
     /** CMEFIR[4]
-     *  
+     *  PPE watchdog timeout
      */
-    (rCMEFIR, bit(4)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(4)) ? defaultMaskedError;
 
     /** CMEFIR[5]
-     *  
+     *  PPE asserted a halt condition.
      */
-    (rCMEFIR, bit(5)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(5)) ? defaultMaskedError;
 
     /** CMEFIR[6]
-     *  
+     *  PPE asserted a debug trigger
      */
-    (rCMEFIR, bit(6)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(6)) ? defaultMaskedError;
 
     /** CMEFIR[7]
-     *  
+     *  PPE SRAM Uncorrectable Error.
      */
-    (rCMEFIR, bit(7)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(7)) ? self_th_1;
 
     /** CMEFIR[8]
-     *  
+     *  SRAM Correctable Error
      */
-    (rCMEFIR, bit(8)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(8)) ? threshold_and_mask;
 
     /** CMEFIR[9]
-     *  
+     *  Scrub timer tick, scrub still pending
      */
-    (rCMEFIR, bit(9)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(9)) ? threshold_and_mask;
 
     /** CMEFIR[10]
-     *  
-     */
-    (rCMEFIR, bit(10)) ? TBDDefaultCallout;
-
-    /** CMEFIR[11]
-     *  
+     *  Block Copy Engine Error
      */
-    (rCMEFIR, bit(11)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(10)) ? defaultMaskedError;
 
-    /** CMEFIR[12]
-     *  
+    /** CMEFIR[11:12]
+     *  spare
      */
-    (rCMEFIR, bit(12)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(11|12)) ? defaultMaskedError;
 
     /** CMEFIR[13]
-     *  
+     *  PPE Dropout on Core0 Chiplet iVRM.
      */
-    (rCMEFIR, bit(13)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(13)) ? threshold_and_mask;
 
     /** CMEFIR[14]
-     *  
+     *  CME Dropout Core0 Chiplet iVRM.
      */
-    (rCMEFIR, bit(14)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(14)) ? threshold_and_mask;
 
     /** CMEFIR[15]
-     *  
+     *  CME Dropout Cache Chiplet iVRM.
      */
-    (rCMEFIR, bit(15)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(15)) ? threshold_and_mask;
 
     /** CMEFIR[16]
-     *  
+     *  CME Extreme Droop over time exceeded
      */
-    (rCMEFIR, bit(16)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(16)) ? threshold_and_mask;
 
     /** CMEFIR[17]
-     *  
+     *  CME Large Droop exceeded
      */
-    (rCMEFIR, bit(17)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(17)) ? threshold_and_mask;
 
     /** CMEFIR[18]
-     *  
+     *  CME Small Droop exceeded
      */
-    (rCMEFIR, bit(18)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(18)) ? threshold_and_mask;
 
     /** CMEFIR[19]
-     *  
+     *  Detected non-thermometer code
      */
-    (rCMEFIR, bit(19)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(19)) ? threshold_and_mask;
 
     /** CMEFIR[20]
-     *  
+     *  scom error
      */
-    (rCMEFIR, bit(20)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(20)) ? defaultMaskedError;
 
     /** CMEFIR[21]
-     *  
-     */
-    (rCMEFIR, bit(21)) ? TBDDefaultCallout;
-
-    /** CMEFIR[22]
-     *  
-     */
-    (rCMEFIR, bit(22)) ? TBDDefaultCallout;
-
-    /** CMEFIR[23]
-     *  
-     */
-    (rCMEFIR, bit(23)) ? TBDDefaultCallout;
-
-    /** CMEFIR[24]
-     *  
-     */
-    (rCMEFIR, bit(24)) ? TBDDefaultCallout;
-
-    /** CMEFIR[25]
-     *  
-     */
-    (rCMEFIR, bit(25)) ? TBDDefaultCallout;
-
-    /** CMEFIR[26]
-     *  
-     */
-    (rCMEFIR, bit(26)) ? TBDDefaultCallout;
-
-    /** CMEFIR[27]
-     *  
-     */
-    (rCMEFIR, bit(27)) ? TBDDefaultCallout;
-
-    /** CMEFIR[28]
-     *  
-     */
-    (rCMEFIR, bit(28)) ? TBDDefaultCallout;
-
-    /** CMEFIR[29]
-     *  
-     */
-    (rCMEFIR, bit(29)) ? TBDDefaultCallout;
-
-    /** CMEFIR[30]
-     *  
-     */
-    (rCMEFIR, bit(30)) ? TBDDefaultCallout;
-
-    /** CMEFIR[31]
-     *  
-     */
-    (rCMEFIR, bit(31)) ? TBDDefaultCallout;
-
-    /** CMEFIR[32]
-     *  
-     */
-    (rCMEFIR, bit(32)) ? TBDDefaultCallout;
-
-    /** CMEFIR[33]
-     *  
-     */
-    (rCMEFIR, bit(33)) ? TBDDefaultCallout;
-
-    /** CMEFIR[34]
-     *  
-     */
-    (rCMEFIR, bit(34)) ? TBDDefaultCallout;
-
-    /** CMEFIR[35]
-     *  
-     */
-    (rCMEFIR, bit(35)) ? TBDDefaultCallout;
-
-    /** CMEFIR[36]
-     *  
-     */
-    (rCMEFIR, bit(36)) ? TBDDefaultCallout;
-
-    /** CMEFIR[37]
-     *  
-     */
-    (rCMEFIR, bit(37)) ? TBDDefaultCallout;
-
-    /** CMEFIR[38]
-     *  
-     */
-    (rCMEFIR, bit(38)) ? TBDDefaultCallout;
-
-    /** CMEFIR[39]
-     *  
-     */
-    (rCMEFIR, bit(39)) ? TBDDefaultCallout;
-
-    /** CMEFIR[40]
-     *  
-     */
-    (rCMEFIR, bit(40)) ? TBDDefaultCallout;
-
-    /** CMEFIR[41]
-     *  
-     */
-    (rCMEFIR, bit(41)) ? TBDDefaultCallout;
-
-    /** CMEFIR[42]
-     *  
-     */
-    (rCMEFIR, bit(42)) ? TBDDefaultCallout;
-
-    /** CMEFIR[43]
-     *  
-     */
-    (rCMEFIR, bit(43)) ? TBDDefaultCallout;
-
-    /** CMEFIR[44]
-     *  
-     */
-    (rCMEFIR, bit(44)) ? TBDDefaultCallout;
-
-    /** CMEFIR[45]
-     *  
-     */
-    (rCMEFIR, bit(45)) ? TBDDefaultCallout;
-
-    /** CMEFIR[46]
-     *  
-     */
-    (rCMEFIR, bit(46)) ? TBDDefaultCallout;
-
-    /** CMEFIR[47]
-     *  
-     */
-    (rCMEFIR, bit(47)) ? TBDDefaultCallout;
-
-    /** CMEFIR[48]
-     *  
-     */
-    (rCMEFIR, bit(48)) ? TBDDefaultCallout;
-
-    /** CMEFIR[49]
-     *  
-     */
-    (rCMEFIR, bit(49)) ? TBDDefaultCallout;
-
-    /** CMEFIR[50]
-     *  
-     */
-    (rCMEFIR, bit(50)) ? TBDDefaultCallout;
-
-    /** CMEFIR[51]
-     *  
-     */
-    (rCMEFIR, bit(51)) ? TBDDefaultCallout;
-
-    /** CMEFIR[52]
-     *  
-     */
-    (rCMEFIR, bit(52)) ? TBDDefaultCallout;
-
-    /** CMEFIR[53]
-     *  
-     */
-    (rCMEFIR, bit(53)) ? TBDDefaultCallout;
-
-    /** CMEFIR[54]
-     *  
-     */
-    (rCMEFIR, bit(54)) ? TBDDefaultCallout;
-
-    /** CMEFIR[55]
-     *  
-     */
-    (rCMEFIR, bit(55)) ? TBDDefaultCallout;
-
-    /** CMEFIR[56]
-     *  
-     */
-    (rCMEFIR, bit(56)) ? TBDDefaultCallout;
-
-    /** CMEFIR[57]
-     *  
-     */
-    (rCMEFIR, bit(57)) ? TBDDefaultCallout;
-
-    /** CMEFIR[58]
-     *  
-     */
-    (rCMEFIR, bit(58)) ? TBDDefaultCallout;
-
-    /** CMEFIR[59]
-     *  
-     */
-    (rCMEFIR, bit(59)) ? TBDDefaultCallout;
-
-    /** CMEFIR[60]
-     *  
-     */
-    (rCMEFIR, bit(60)) ? TBDDefaultCallout;
-
-    /** CMEFIR[61]
-     *  
-     */
-    (rCMEFIR, bit(61)) ? TBDDefaultCallout;
-
-    /** CMEFIR[62]
-     *  
-     */
-    (rCMEFIR, bit(62)) ? TBDDefaultCallout;
-
-    /** CMEFIR[63]
-     *  
+     *  scom error
      */
-    (rCMEFIR, bit(63)) ? TBDDefaultCallout;
+    (rCMEFIR, bit(21)) ? defaultMaskedError;
 
 };
 
@@ -1585,4 +884,6 @@ group gCMEFIR filter singlebit
 
 # Include the common action set.
 .include "p9_common_actions.rule";
+# Include the chip-specific action set.
+.include "p9_ex_actions.rule";