PRD: misc cleanup from latest RAS XML

Change-Id: I791c3307831aca31018f6f810c47029553bff5e5
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75993
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Paul Greenwood <paul.greenwood@ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77245
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>

10 files changed, 94 insertions, 262 deletions

diff --git a/src/usr/diag/prdf/common/plat/axone/axone_mc.rule b/src/usr/diag/prdf/common/plat/axone/axone_mc.rule
index 4f63011fc..fd857ce81 100644
--- a/src/usr/diag/prdf/common/plat/axone/axone_mc.rule
+++ b/src/usr/diag/prdf/common/plat/axone/axone_mc.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2018
+# Contributors Listed Below - COPYRIGHT 2018,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -141,39 +141,39 @@ chip axone_mc
     };
 
     ############################################################################
-    # P9 MC target MCBISTFIR
+    # P9 MC target MCMISCFIR
     ############################################################################
 
-    register MCBISTFIR
+    register MCMISCFIR
     {
-        name        "P9 MC target MCBISTFIR";
+        name        "P9 MC target MCMISCFIR";
         scomaddr    0x07012300;
         reset       (&, 0x07012301);
         mask        (|, 0x07012305);
         capture     group default;
     };
 
-    register MCBISTFIR_MASK
+    register MCMISCFIR_MASK
     {
-        name        "P9 MC target MCBISTFIR MASK";
+        name        "P9 MC target MCMISCFIR MASK";
         scomaddr    0x07012303;
         capture     group default;
     };
 
-    register MCBISTFIR_ACT0
+    register MCMISCFIR_ACT0
     {
-        name        "P9 MC target MCBISTFIR ACT0";
+        name        "P9 MC target MCMISCFIR ACT0";
         scomaddr    0x07012306;
         capture     group default;
-        capture     req nonzero("MCBISTFIR");
+        capture     req nonzero("MCMISCFIR");
     };
 
-    register MCBISTFIR_ACT1
+    register MCMISCFIR_ACT1
     {
-        name        "P9 MC target MCBISTFIR ACT1";
+        name        "P9 MC target MCMISCFIR ACT1";
         scomaddr    0x07012307;
         capture     group default;
-        capture     req nonzero("MCBISTFIR");
+        capture     req nonzero("MCMISCFIR");
     };
 
 # Include registers not defined by the xml
@@ -253,9 +253,9 @@ group gMC_CHIPLET_FIR attntype CHECK_STOP, RECOVERABLE
     (rMC_CHIPLET_FIR, bit(11)) ? analyzeConnectedMCC3;
 
     /** MC_CHIPLET_FIR[12]
-     *  Attention from MCBISTFIR
+     *  Attention from MCMISCFIR
      */
-    (rMC_CHIPLET_FIR, bit(12)) ? analyzeMCBISTFIR;
+    (rMC_CHIPLET_FIR, bit(12)) ? analyzeMCMISCFIR;
 
     /** MC_CHIPLET_FIR[13]
      *  Attention from IOOMIFIR 0
@@ -358,9 +358,9 @@ group gMC_CHIPLET_UCS_FIR attntype UNIT_CS
     (rMC_CHIPLET_UCS_FIR, bit(8)) ? analyzeConnectedMCC3;
 
     /** MC_CHIPLET_UCS_FIR[9]
-     *  Attention from MCBISTFIR
+     *  Attention from MCMISCFIR
      */
-    (rMC_CHIPLET_UCS_FIR, bit(9)) ? analyzeMCBISTFIR;
+    (rMC_CHIPLET_UCS_FIR, bit(9)) ? analyzeMCMISCFIR;
 
     /** MC_CHIPLET_UCS_FIR[10]
      *  Attention from IOOMIFIR 0
@@ -448,9 +448,9 @@ group gMC_CHIPLET_HA_FIR attntype HOST_ATTN
     (rMC_CHIPLET_HA_FIR, bit(8)) ? analyzeConnectedMCC3;
 
     /** MC_CHIPLET_HA_FIR[9]
-     *  Attention from MCBISTFIR
+     *  Attention from MCMISCFIR
      */
-    (rMC_CHIPLET_HA_FIR, bit(9)) ? analyzeMCBISTFIR;
+    (rMC_CHIPLET_HA_FIR, bit(9)) ? analyzeMCMISCFIR;
 
 };
 
@@ -563,94 +563,94 @@ group gMC_LFIR
 };
 
 ################################################################################
-# P9 MC target MCBISTFIR
+# P9 MC target MCMISCFIR
 ################################################################################
 
-rule rMCBISTFIR
+rule rMCMISCFIR
 {
   CHECK_STOP:
-    MCBISTFIR & ~MCBISTFIR_MASK & ~MCBISTFIR_ACT0 & ~MCBISTFIR_ACT1;
+    MCMISCFIR & ~MCMISCFIR_MASK & ~MCMISCFIR_ACT0 & ~MCMISCFIR_ACT1;
   RECOVERABLE:
-    MCBISTFIR & ~MCBISTFIR_MASK & ~MCBISTFIR_ACT0 &  MCBISTFIR_ACT1;
+    MCMISCFIR & ~MCMISCFIR_MASK & ~MCMISCFIR_ACT0 &  MCMISCFIR_ACT1;
   HOST_ATTN:
-    MCBISTFIR & ~MCBISTFIR_MASK &  MCBISTFIR_ACT0 & ~MCBISTFIR_ACT1;
+    MCMISCFIR & ~MCMISCFIR_MASK &  MCMISCFIR_ACT0 & ~MCMISCFIR_ACT1;
   UNIT_CS:
-    MCBISTFIR & ~MCBISTFIR_MASK &  MCBISTFIR_ACT0 &  MCBISTFIR_ACT1;
+    MCMISCFIR & ~MCMISCFIR_MASK &  MCMISCFIR_ACT0 &  MCMISCFIR_ACT1;
 };
 
-group gMCBISTFIR
+group gMCMISCFIR
     filter singlebit,
            cs_root_cause
 {
-    /** MCBISTFIR[0]
+    /** MCMISCFIR[0]
      *  WAT debug bus attn
      */
-    (rMCBISTFIR, bit(0)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(0)) ? defaultMaskedError;
 
-    /** MCBISTFIR[1]
+    /** MCMISCFIR[1]
      *  WAT debug register parity error
      */
-    (rMCBISTFIR, bit(1)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(1)) ? defaultMaskedError;
 
-    /** MCBISTFIR[2]
+    /** MCMISCFIR[2]
      *  SCOM recoverable register parity error
      */
-    (rMCBISTFIR, bit(2)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(2)) ? defaultMaskedError;
 
-    /** MCBISTFIR[3]
+    /** MCMISCFIR[3]
      *  Spare
      */
-    (rMCBISTFIR, bit(3)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(3)) ? defaultMaskedError;
 
-    /** MCBISTFIR[4]
+    /** MCMISCFIR[4]
      *  Chan 0A application interrupt
      */
-    (rMCBISTFIR, bit(4)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(4)) ? defaultMaskedError;
 
-    /** MCBISTFIR[5]
+    /** MCMISCFIR[5]
      *  Chan 0B application interrupt
      */
-    (rMCBISTFIR, bit(5)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(5)) ? defaultMaskedError;
 
-    /** MCBISTFIR[6]
+    /** MCMISCFIR[6]
      *  Chan 1A application interrupt
      */
-    (rMCBISTFIR, bit(6)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(6)) ? defaultMaskedError;
 
-    /** MCBISTFIR[7]
+    /** MCMISCFIR[7]
      *  Chan 1B application interrupt
      */
-    (rMCBISTFIR, bit(7)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(7)) ? defaultMaskedError;
 
-    /** MCBISTFIR[8]
+    /** MCMISCFIR[8]
      *  Chan 2A application interrupt
      */
-    (rMCBISTFIR, bit(8)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(8)) ? defaultMaskedError;
 
-    /** MCBISTFIR[9]
+    /** MCMISCFIR[9]
      *  Chan 2B application interrupt
      */
-    (rMCBISTFIR, bit(9)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(9)) ? defaultMaskedError;
 
-    /** MCBISTFIR[10]
+    /** MCMISCFIR[10]
      *  Chan 3A application interrupt
      */
-    (rMCBISTFIR, bit(10)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(10)) ? defaultMaskedError;
 
-    /** MCBISTFIR[11]
+    /** MCMISCFIR[11]
      *  Chan 3B application interrupt
      */
-    (rMCBISTFIR, bit(11)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(11)) ? defaultMaskedError;
 
-    /** MCBISTFIR[12]
+    /** MCMISCFIR[12]
      *  Internal SCOM error
      */
-    (rMCBISTFIR, bit(12)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(12)) ? defaultMaskedError;
 
-    /** MCBISTFIR[13]
+    /** MCMISCFIR[13]
      *  Internal SCOM error clone
      */
-    (rMCBISTFIR, bit(13)) ? defaultMaskedError;
+    (rMCMISCFIR, bit(13)) ? defaultMaskedError;
 
 };
 
diff --git a/src/usr/diag/prdf/common/plat/axone/axone_mc_actions.rule b/src/usr/diag/prdf/common/plat/axone/axone_mc_actions.rule
index aab2297ef..7c639bf5e 100644
--- a/src/usr/diag/prdf/common/plat/axone/axone_mc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/axone/axone_mc_actions.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2017,2018
+# Contributors Listed Below - COPYRIGHT 2017,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -28,7 +28,7 @@
 ###############################################################################
 
 actionclass analyzeMC_LFIR   { analyze(gMC_LFIR);   };
-actionclass analyzeMCBISTFIR { analyze(gMCBISTFIR); };
+actionclass analyzeMCMISCFIR { analyze(gMCMISCFIR); };
 
 ###############################################################################
 # Analyze connected
diff --git a/src/usr/diag/prdf/common/plat/axone/axone_phb.rule b/src/usr/diag/prdf/common/plat/axone/axone_phb.rule
index 844739ee2..1c5bb566d 100644
--- a/src/usr/diag/prdf/common/plat/axone/axone_phb.rule
+++ b/src/usr/diag/prdf/common/plat/axone/axone_phb.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2018
+# Contributors Listed Below - COPYRIGHT 2018,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -212,7 +212,7 @@ group gPHBNFIR
     /** PHBNFIR[0]
      *  BAR Parity Error
      */
-    (rPHBNFIR, bit(0)) ? self_th_1;
+    (rPHBNFIR, bit(0)) ? parent_proc_th_1;
 
     /** PHBNFIR[1]
      *  Parity Errors on Registers besides BAR
@@ -252,12 +252,12 @@ group gPHBNFIR
     /** PHBNFIR[8]
      *  Register Array Parity Error
      */
-    (rPHBNFIR, bit(8)) ? self_th_1;
+    (rPHBNFIR, bit(8)) ? parent_proc_th_1;
 
     /** PHBNFIR[9]
      *  Power Bus Interface Parity Error
      */
-    (rPHBNFIR, bit(9)) ? self_th_1;
+    (rPHBNFIR, bit(9)) ? parent_proc_th_1;
 
     /** PHBNFIR[10]
      *  Power Bus Data Hang
@@ -297,7 +297,7 @@ group gPHBNFIR
     /** PHBNFIR[17]
      *  Hardware Error
      */
-    (rPHBNFIR, bit(17)) ? self_th_1;
+    (rPHBNFIR, bit(17)) ? parent_proc_th_1;
 
     /** PHBNFIR[18]
      *  Unsolicited Power Bus Data
diff --git a/src/usr/diag/prdf/common/plat/axone/axone_proc.rule b/src/usr/diag/prdf/common/plat/axone/axone_proc.rule
index c37c103be..b936106e2 100644
--- a/src/usr/diag/prdf/common/plat/axone/axone_proc.rule
+++ b/src/usr/diag/prdf/common/plat/axone/axone_proc.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2018
+# Contributors Listed Below - COPYRIGHT 2018,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -950,42 +950,6 @@ chip axone_proc
     };
 
     ############################################################################
-    # P9 chip ENHCAFIR
-    ############################################################################
-
-    register ENHCAFIR
-    {
-        name        "P9 chip ENHCAFIR";
-        scomaddr    0x05012940;
-        reset       (&, 0x05012941);
-        mask        (|, 0x05012945);
-        capture     group default;
-    };
-
-    register ENHCAFIR_MASK
-    {
-        name        "P9 chip ENHCAFIR MASK";
-        scomaddr    0x05012943;
-        capture     group default;
-    };
-
-    register ENHCAFIR_ACT0
-    {
-        name        "P9 chip ENHCAFIR ACT0";
-        scomaddr    0x05012946;
-        capture     group default;
-        capture     req nonzero("ENHCAFIR");
-    };
-
-    register ENHCAFIR_ACT1
-    {
-        name        "P9 chip ENHCAFIR ACT1";
-        scomaddr    0x05012947;
-        capture     group default;
-        capture     req nonzero("ENHCAFIR");
-    };
-
-    ############################################################################
     # P9 chip PBAMFIR
     ############################################################################
 
@@ -2758,7 +2722,7 @@ group gNXCQFIR
     /** NXCQFIR[19]
      *  Uncorrectable error on ERAT arrays
      */
-    (rNXCQFIR, bit(19)) ? nx_th_32perDay;
+    (rNXCQFIR, bit(19)) ? nx_th_1;
 
     /** NXCQFIR[20]
      *  SUE on ERAT arrays
@@ -4077,14 +4041,14 @@ group gN3_CHIPLET_FIR
     (rN3_CHIPLET_FIR, bit(14)) ? analyzePBPPEFIR;
 
     /** N3_CHIPLET_FIR[15]
-     *  Attention from PBIOEFIR
+     *  Attention from PBIOOFIR
      */
-    (rN3_CHIPLET_FIR, bit(15)) ? analyzePBIOEFIR;
+    (rN3_CHIPLET_FIR, bit(15)) ? analyzePBIOOFIR;
 
     /** N3_CHIPLET_FIR[16]
-     *  Attention from PBIOOFIR
+     *  Attention from NPU0FIR 1
      */
-    (rN3_CHIPLET_FIR, bit(16)) ? analyzePBIOOFIR;
+    (rN3_CHIPLET_FIR, bit(16)) ? analyzeConnectedNPU1;
 
     /** N3_CHIPLET_FIR[17]
      *  Attention from INTCQFIR
@@ -4106,15 +4070,10 @@ group gN3_CHIPLET_FIR
      */
     (rN3_CHIPLET_FIR, bit(20)) ? analyzePBAMFIR;
 
-    /** N3_CHIPLET_FIR[21]
-     *  Attention from NPU0FIR 1
-     */
-    (rN3_CHIPLET_FIR, bit(21)) ? analyzeConnectedNPU1;
-
     /** N3_CHIPLET_FIR[22]
-     *  Attention from ENHCAFIR
+     *  Attention from PBIOEFIR
      */
-    (rN3_CHIPLET_FIR, bit(22)) ? analyzeENHCAFIR;
+    (rN3_CHIPLET_FIR, bit(22)) ? analyzePBIOEFIR;
 
     /** N3_CHIPLET_FIR[23]
      *  Attention from NPU2FIR 0
@@ -5145,144 +5104,6 @@ group gPSIHBFIR
 };
 
 ################################################################################
-# P9 chip ENHCAFIR
-################################################################################
-
-rule rENHCAFIR
-{
-  CHECK_STOP:
-    ENHCAFIR & ~ENHCAFIR_MASK & ~ENHCAFIR_ACT0 & ~ENHCAFIR_ACT1;
-  RECOVERABLE:
-    ENHCAFIR & ~ENHCAFIR_MASK & ~ENHCAFIR_ACT0 &  ENHCAFIR_ACT1;
-};
-
-group gENHCAFIR
-    filter singlebit,
-           cs_root_cause
-{
-    /** ENHCAFIR[0]
-     *  PB0 data UE
-     */
-    (rENHCAFIR, bit(0)) ? defaultMaskedError;
-
-    /** ENHCAFIR[1]
-     *  PB0 data SUE
-     */
-    (rENHCAFIR, bit(1)) ? defaultMaskedError;
-
-    /** ENHCAFIR[2]
-     *  PB0 data ue
-     */
-    (rENHCAFIR, bit(2)) ? defaultMaskedError;
-
-    /** ENHCAFIR[3]
-     *  spare
-     */
-    (rENHCAFIR, bit(3)) ? defaultMaskedError;
-
-    /** ENHCAFIR[4]
-     *  Castout Drop Counter Full
-     */
-    (rENHCAFIR, bit(4)) ? defaultMaskedError;
-
-    /** ENHCAFIR[5]
-     *  Data Hang Detect
-     */
-    (rENHCAFIR, bit(5)) ? defaultMaskedError;
-
-    /** ENHCAFIR[6]
-     *  Unexpected data or cresp
-     */
-    (rENHCAFIR, bit(6)) ? defaultMaskedError;
-
-    /** ENHCAFIR[7]
-     *  Internal Error
-     */
-    (rENHCAFIR, bit(7)) ? defaultMaskedError;
-
-    /** ENHCAFIR[8]
-     *  ADU checkstop error from power bus data
-     */
-    (rENHCAFIR, bit(8)) ? defaultMaskedError;
-
-    /** ENHCAFIR[9]
-     *  ADU checkstop error from alter display
-     */
-    (rENHCAFIR, bit(9)) ? defaultMaskedError;
-
-    /** ENHCAFIR[10]
-     *  ADU checkstop error from xsco m
-     */
-    (rENHCAFIR, bit(10)) ? defaultMaskedError;
-
-    /** ENHCAFIR[11]
-     *  ADU checkstop from power bus cmd
-     */
-    (rENHCAFIR, bit(11)) ? defaultMaskedError;
-
-    /** ENHCAFIR[12]
-     *  ADU checkstop error from power bus send
-     */
-    (rENHCAFIR, bit(12)) ? defaultMaskedError;
-
-    /** ENHCAFIR[13]
-     *  ADU checkstop from power bus receive
-     */
-    (rENHCAFIR, bit(13)) ? defaultMaskedError;
-
-    /** ENHCAFIR[14]
-     *  ADU recoverable error from pb data
-     */
-    (rENHCAFIR, bit(14)) ? defaultMaskedError;
-
-    /** ENHCAFIR[15]
-     *  ADU recoverable error from alter display
-     */
-    (rENHCAFIR, bit(15)) ? defaultMaskedError;
-
-    /** ENHCAFIR[16]
-     *  ADU recoverable error from xscom
-     */
-    (rENHCAFIR, bit(16)) ? defaultMaskedError;
-
-    /** ENHCAFIR[17]
-     *  ADU recoverable from power bus cmd
-     */
-    (rENHCAFIR, bit(17)) ? defaultMaskedError;
-
-    /** ENHCAFIR[18]
-     *  ADU recoverable error from pb send
-     */
-    (rENHCAFIR, bit(18)) ? defaultMaskedError;
-
-    /** ENHCAFIR[19]
-     *  ADU recoverable error from pb receive
-     */
-    (rENHCAFIR, bit(19)) ? defaultMaskedError;
-
-    /** ENHCAFIR[20]
-     *  NHTM scom error
-     */
-    (rENHCAFIR, bit(20)) ? defaultMaskedError;
-
-    /** ENHCAFIR[21]
-     *  spare
-     */
-    (rENHCAFIR, bit(21)) ? defaultMaskedError;
-
-    /** ENHCAFIR[22]
-     *  scom error
-     */
-    (rENHCAFIR, bit(22)) ? defaultMaskedError;
-
-    /** ENHCAFIR[23]
-     *  scom error
-     */
-    (rENHCAFIR, bit(23)) ? defaultMaskedError;
-
-};
-
-################################################################################
 # P9 chip PBAMFIR
 ################################################################################
 
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_phb.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_phb.rule
index 9c8dcce38..88c917458 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_phb.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_phb.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2018
+# Contributors Listed Below - COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -212,7 +212,7 @@ group gPHBNFIR
     /** PHBNFIR[0]
      *  BAR Parity Error
      */
-    (rPHBNFIR, bit(0)) ? self_th_1;
+    (rPHBNFIR, bit(0)) ? parent_proc_th_1;
 
     /** PHBNFIR[1]
      *  Parity Errors on Registers besides BAR
@@ -252,12 +252,12 @@ group gPHBNFIR
     /** PHBNFIR[8]
      *  Register Array Parity Error
      */
-    (rPHBNFIR, bit(8)) ? self_th_1;
+    (rPHBNFIR, bit(8)) ? parent_proc_th_1;
 
     /** PHBNFIR[9]
      *  Power Bus Interface Parity Error
      */
-    (rPHBNFIR, bit(9)) ? self_th_1;
+    (rPHBNFIR, bit(9)) ? parent_proc_th_1;
 
     /** PHBNFIR[10]
      *  Power Bus Data Hang
@@ -297,7 +297,7 @@ group gPHBNFIR
     /** PHBNFIR[17]
      *  Hardware Error
      */
-    (rPHBNFIR, bit(17)) ? self_th_1;
+    (rPHBNFIR, bit(17)) ? parent_proc_th_1;
 
     /** PHBNFIR[18]
      *  Unsolicited Power Bus Data
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule
index 187cd2a44..ae8e6bb80 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2018
+# Contributors Listed Below - COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -2893,7 +2893,7 @@ group gNXCQFIR
     /** NXCQFIR[19]
      *  Uncorrectable error on ERAT arrays
      */
-    (rNXCQFIR, bit(19)) ? nx_th_32perDay;
+    (rNXCQFIR, bit(19)) ? nx_th_1;
 
     /** NXCQFIR[20]
      *  SUE on ERAT arrays
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule
index 26d62e95f..91298d653 100644
--- a/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_proc_actions.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2018
+# Contributors Listed Below - COPYRIGHT 2018,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -23,6 +23,12 @@
 #
 # IBM_PROLOG_END_TAG
 
+################################################################################
+# Analyze
+################################################################################
+
+actionclass analyzeENHCAFIR { analyze(gENHCAFIR); };
+
 ###############################################################################
 # Analyze connected
 ###############################################################################
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
index 6ac3bc5a1..6712a5977 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2018
+# Contributors Listed Below - COPYRIGHT 2016,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -2872,7 +2872,7 @@ group gNXCQFIR
     /** NXCQFIR[19]
      *  Uncorrectable error on ERAT arrays
      */
-    (rNXCQFIR, bit(19)) ? nx_th_32perDay;
+    (rNXCQFIR, bit(19)) ? nx_th_1;
 
     /** NXCQFIR[20]
      *  SUE on ERAT arrays
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule
index 826308710..1960da53b 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc_actions.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2018
+# Contributors Listed Below - COPYRIGHT 2018,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -23,9 +23,15 @@
 #
 # IBM_PROLOG_END_TAG
 
-###############################################################################
+################################################################################
+# Analyze
+################################################################################
+
+actionclass analyzeENHCAFIR { analyze(gENHCAFIR); };
+
+################################################################################
 # Analyze connected
-###############################################################################
+################################################################################
 
 actionclass analyzeConnectedMCBIST0 { analyze(connected(TYPE_MCBIST,  0)); };
 actionclass analyzeConnectedMCBIST1 { analyze(connected(TYPE_MCBIST,  1)); };
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule
index aacf978bd..e5700c34b 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2017,2018
+# Contributors Listed Below - COPYRIGHT 2017,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -670,7 +670,6 @@ actionclass analyzePBIOOFIR    { analyze(gPBIOOFIR   ); };
 actionclass analyzePBAFIR      { analyze(gPBAFIR     ); };
 actionclass analyzePSIHBFIR    { analyze(gPSIHBFIR   ); };
 actionclass analyzePBAMFIR     { analyze(gPBAMFIR    ); };
-actionclass analyzeENHCAFIR    { analyze(gENHCAFIR   ); };
 actionclass analyzeXB_LFIR     { analyze(gXB_LFIR    ); };
 actionclass analyzeXBPPEFIR    { analyze(gXBPPEFIR   ); };