PRD: Memory subsystem updates for Axone

Change-Id: I4241cc9d47ca354a13e32ad908a5479badffb357
RTC: 200583
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75995
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77247

3 files changed, 116 insertions, 31 deletions

diff --git a/src/usr/diag/prdf/common/plat/axone/axone_mcc.rule b/src/usr/diag/prdf/common/plat/axone/axone_mcc.rule
index bf632abbb..6d18c46e3 100644
--- a/src/usr/diag/prdf/common/plat/axone/axone_mcc.rule
+++ b/src/usr/diag/prdf/common/plat/axone/axone_mcc.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2018
+# Contributors Listed Below - COPYRIGHT 2018,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -180,22 +180,22 @@ rule rDSTLFIR
 
 group gDSTLFIR
     filter singlebit,
-           cs_root_cause
+           cs_root_cause(0,4,12,13,16,17,22,23)
 {
     /** DSTLFIR[0]
      *  AFU initiated Checkstop on Subchannel A
      */
-    (rDSTLFIR, bit(0)) ? defaultMaskedError;
+    (rDSTLFIR, bit(0)) ? analyzeConnectedExplorer_0_UERE;
 
     /** DSTLFIR[1]
      *  AFU initiated Recoverable Attn on Subchannel A
      */
-    (rDSTLFIR, bit(1)) ? defaultMaskedError;
+    (rDSTLFIR, bit(1)) ? analyzeConnectedExplorer_0;
 
     /** DSTLFIR[2]
      *  AFU initiated Special Attn on Subchannel A
      */
-    (rDSTLFIR, bit(2)) ? defaultMaskedError;
+    (rDSTLFIR, bit(2)) ? analyzeConnectedExplorer_0;
 
     /** DSTLFIR[3]
      *  AFU initiated Application Interrupt Attn on Subchannel A
@@ -205,17 +205,17 @@ group gDSTLFIR
     /** DSTLFIR[4]
      *  AFU initiated Checkstop on Subchannel B
      */
-    (rDSTLFIR, bit(4)) ? defaultMaskedError;
+    (rDSTLFIR, bit(4)) ? analyzeConnectedExplorer_1_UERE;
 
     /** DSTLFIR[5]
      *  AFU initiated Recoverable Attn on Subchannel B
      */
-    (rDSTLFIR, bit(5)) ? defaultMaskedError;
+    (rDSTLFIR, bit(5)) ? analyzeConnectedExplorer_1;
 
     /** DSTLFIR[6]
      *  AFU initiated Special Attn on Subchannel B
      */
-    (rDSTLFIR, bit(6)) ? defaultMaskedError;
+    (rDSTLFIR, bit(6)) ? analyzeConnectedExplorer_1;
 
     /** DSTLFIR[7]
      *  AFU initiated Application Interrupt Attn on Subchannel B
@@ -225,52 +225,52 @@ group gDSTLFIR
     /** DSTLFIR[8]
      *  Async crossing parity error
      */
-    (rDSTLFIR, bit(8)) ? defaultMaskedError;
+    (rDSTLFIR, bit(8)) ? self_th_1;
 
     /** DSTLFIR[9]
      *  Async crossing sequence error
      */
-    (rDSTLFIR, bit(9)) ? defaultMaskedError;
+    (rDSTLFIR, bit(9)) ? self_th_1;
 
     /** DSTLFIR[10]
      *  Config reg recoverable parity error
      */
-    (rDSTLFIR, bit(10)) ? defaultMaskedError;
+    (rDSTLFIR, bit(10)) ? self_th_1;
 
     /** DSTLFIR[11]
      *  Config reg fatal parity error
      */
-    (rDSTLFIR, bit(11)) ? defaultMaskedError;
+    (rDSTLFIR, bit(11)) ? self_th_1;
 
     /** DSTLFIR[12]
      *  Subchannel A counter error
      */
-    (rDSTLFIR, bit(12)) ? defaultMaskedError;
+    (rDSTLFIR, bit(12)) ? omi_0_and_explorer_0_th_1_UERE;
 
     /** DSTLFIR[13]
      *  Subchannel B counter error
      */
-    (rDSTLFIR, bit(13)) ? defaultMaskedError;
+    (rDSTLFIR, bit(13)) ? omi_1_and_explorer_1_th_1_UERE;
 
     /** DSTLFIR[14]
      *  Subchannel A timeout error
      */
-    (rDSTLFIR, bit(14)) ? defaultMaskedError;
+    (rDSTLFIR, bit(14)) ? omi_0_and_explorer_0_th_32_perDay;
 
     /** DSTLFIR[15]
      *  Subchannel B timeout error
      */
-    (rDSTLFIR, bit(15)) ? defaultMaskedError;
+    (rDSTLFIR, bit(15)) ? omi_1_and_explorer_1_th_32_perDay;
 
     /** DSTLFIR[16]
      *  Subchannel A buffer overuse error
      */
-    (rDSTLFIR, bit(16)) ? defaultMaskedError;
+    (rDSTLFIR, bit(16)) ? explorer_0_th_1_UERE;
 
     /** DSTLFIR[17]
      *  Subchannel B buffer overuse error
      */
-    (rDSTLFIR, bit(17)) ? defaultMaskedError;
+    (rDSTLFIR, bit(17)) ? explorer_1_th_1_UERE;
 
     /** DSTLFIR[18]
      *  Subchannel A DL link down
@@ -293,14 +293,29 @@ group gDSTLFIR
     (rDSTLFIR, bit(21)) ? defaultMaskedError;
 
     /** DSTLFIR[22]
-     *  Internal SCOM error
+     *  DSTLFIR channel timeout on subch A
      */
-    (rDSTLFIR, bit(22)) ? defaultMaskedError;
+    (rDSTLFIR, bit(22)) ? omi_0_and_explorer_0_th_1_UERE;
 
     /** DSTLFIR[23]
-     *  Internal SCOM error clone
+     *  DSTLFIR channel timeout on subch B
+     */
+    (rDSTLFIR, bit(23)) ? omi_1_and_explorer_1_th_1_UERE;
+
+    /** DSTLFIR[24:25]
+     *  spare
+     */
+    (rDSTLFIR, bit(24|25)) ? defaultMaskedError;
+
+    /** DSTLFIR[26]
+     *  Internal SCOM Error
+     */
+    (rDSTLFIR, bit(26)) ? defaultMaskedError;
+
+    /** DSTLFIR[27]
+     *  Internal SCOM Error Clone
      */
-    (rDSTLFIR, bit(23)) ? defaultMaskedError;
+    (rDSTLFIR, bit(27)) ? defaultMaskedError;
 
 };
 
diff --git a/src/usr/diag/prdf/common/plat/axone/axone_mcc_actions.rule b/src/usr/diag/prdf/common/plat/axone/axone_mcc_actions.rule
index 38edbaaea..4744535d2 100644
--- a/src/usr/diag/prdf/common/plat/axone/axone_mcc_actions.rule
+++ b/src/usr/diag/prdf/common/plat/axone/axone_mcc_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,50 @@
 #
 # IBM_PROLOG_END_TAG
 
+actionclass omi_0_and_explorer_0_th_1_UERE
+{
+    SueSource;
+    callout(connected(TYPE_OMI,       0), MRU_MEDA);
+    callout(connected(TYPE_OCMB_CHIP, 0), MRU_MEDA);
+    threshold1;
+};
+
+actionclass omi_0_and_explorer_0_th_32_perDay
+{
+    callout(connected(TYPE_OMI,       0), MRU_MEDA);
+    callout(connected(TYPE_OCMB_CHIP, 0), MRU_MEDA);
+    threshold32pday;
+};
+
+actionclass explorer_0_th_1_UERE
+{
+    SueSource;
+    callout(connected(TYPE_OCMB_CHIP, 0), MRU_MED);
+    threshold1;
+};
+
+actionclass omi_1_and_explorer_1_th_1_UERE
+{
+    SueSource;
+    callout(connected(TYPE_OMI,       1), MRU_MEDA);
+    callout(connected(TYPE_OCMB_CHIP, 1), MRU_MEDA);
+    threshold1;
+};
+
+actionclass omi_1_and_explorer_1_th_32_perDay
+{
+    callout(connected(TYPE_OMI,       1), MRU_MEDA);
+    callout(connected(TYPE_OCMB_CHIP, 1), MRU_MEDA);
+    threshold32pday;
+};
+
+actionclass explorer_1_th_1_UERE
+{
+    SueSource;
+    callout(connected(TYPE_OCMB_CHIP, 1), MRU_MED);
+    threshold1;
+};
+
 ################################################################################
 # Analyze groups
 ################################################################################
@@ -30,3 +74,29 @@
 actionclass analyzeDSTLFIR { analyze(gDSTLFIR); };
 actionclass analyzeUSTLFIR { analyze(gUSTLFIR); };
 
+################################################################################
+# Analyze connected
+################################################################################
+
+actionclass analyzeConnectedExplorer_0
+{
+    analyze(connected(TYPE_OCMB_CHIP, 0));
+};
+
+actionclass analyzeConnectedExplorer_1
+{
+    analyze(connected(TYPE_OCMB_CHIP, 1));
+};
+
+actionclass analyzeConnectedExplorer_0_UERE
+{
+    SueSource;
+    analyzeConnectedExplorer_0;
+};
+
+actionclass analyzeConnectedExplorer_1_UERE
+{
+    SueSource;
+    analyzeConnectedExplorer_1;
+};
+
diff --git a/src/usr/diag/prdf/common/plat/axone/axone_mi.rule b/src/usr/diag/prdf/common/plat/axone/axone_mi.rule
index 078163819..2e4d522e3 100644
--- a/src/usr/diag/prdf/common/plat/axone/axone_mi.rule
+++ b/src/usr/diag/prdf/common/plat/axone/axone_mi.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2018
+# Contributors Listed Below - COPYRIGHT 2018,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -148,27 +148,27 @@ group gMCFIR
     /** MCFIR[0]
      *  MC internal recoverable error
      */
-    (rMCFIR, bit(0)) ? defaultMaskedError;
+    (rMCFIR, bit(0)) ? self_th_1;
 
     /** MCFIR[1]
      *  MC internal non recoverable error
      */
-    (rMCFIR, bit(1)) ? defaultMaskedError;
+    (rMCFIR, bit(1)) ? self_th_1;
 
     /** MCFIR[2]
      *  Powerbus protocol error
      */
-    (rMCFIR, bit(2)) ? defaultMaskedError;
+    (rMCFIR, bit(2)) ? level2_th_1;
 
     /** MCFIR[3]
      *  Inband bar hit with incorrect ttype
      */
-    (rMCFIR, bit(3)) ? defaultMaskedError;
+    (rMCFIR, bit(3)) ? level2_M_self_L_th_1;
 
     /** MCFIR[4]
      *  Multiple bar
      */
-    (rMCFIR, bit(4)) ? defaultMaskedError;
+    (rMCFIR, bit(4)) ? self_th_1;
 
     /** MCFIR[5]
      *  PB write ECC syndrome NE0
@@ -183,7 +183,7 @@ group gMCFIR
     /** MCFIR[8]
      *  Command list timeout
      */
-    (rMCFIR, bit(8)) ? defaultMaskedError;
+    (rMCFIR, bit(8)) ? threshold_and_mask_self;
 
     /** MCFIR[9:10]
      *  reserved
@@ -218,7 +218,7 @@ group gMCFIR
     /** MCFIR[17]
      *  WAT debug config reg error
      */
-    (rMCFIR, bit(17)) ? defaultMaskedError;
+    (rMCFIR, bit(17)) ? threshold_and_mask_self;
 
     /** MCFIR[18:21]
      *  reserved