PRD:Updated dump type for various FIR

Change-Id: I59b2c7d0d17a2085b7e3b3a8cba861fbe3649665
CQ:SW240546
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8151
Tested-by: Jenkins Server
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8333
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

7 files changed, 187 insertions, 90 deletions

diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
index 93a32b469..cea7fd648 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2004,2013              */
+/* COPYRIGHT International Business Machines Corp. 2004,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -503,6 +503,7 @@ uint32_t prdrActionArgMap(const std::string & i_arg)
         g_ActionArgMap["DUMP_CONTENT_HW"]           = 0x40000000;
         g_ActionArgMap["DUMP_CONTENT_SH"]           = 0x20000000;
         g_ActionArgMap["DUMP_CONTENT_HWSUPERNOVA"]  = 0x00001000;
+        g_ActionArgMap["DUMP_CONTENT_CORE"]         = 0x10000000;
 #else
         // Initialize Dump values. //@ecdf
         #include <hdctContent.H>
diff --git a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
index 6ca7a1aa3..b57b0ef5d 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
@@ -221,19 +221,6 @@ actionclass calloutSelfAndLevel2MedThr1
     threshold1;
 };
 
-actionclass calloutProcLevel2MedThr1
-{
-    calloutSelfLow;
-    callout2ndLvlMed;
-    threshold1;
-};
-
-actionclass calloutProcHighThr1SUE
-{
-    calloutSelfHigh;
-    SUEGenerationPoint;
-    threshold1;
-};
 
 /** Callout 2nd level support of afer 32 events per day */
 actionclass callout2ndLvlMedThr32perDay
@@ -272,6 +259,30 @@ actionclass dumpSW
     dump(DUMP_CONTENT_SW);
 };
 
+
+/** Dump hardware content for memory buffer */
+actionclass dumpHwMembuf
+{
+    dump( DUMP_CONTENT_HWSUPERNOVA );
+};
+
+################################################################################
+#                              Callout sec lvl support with dump               #
+################################################################################
+
+/** callout second lvl on first instance, initiaite SH dump */
+actionclass callout2ndLvlDumpSh
+{
+    callout2ndLvlMedThr1;
+    dumpSH;
+};
+
+/** Callout 2nd Level and dump SW */
+actionclass callout2ndLvlDumpSW
+{
+    callout2ndLvlMedThr1;
+    dumpSW;
+};
 ################################################################################
 #                               Default callouts                               #
 ################################################################################
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
index f0fed6f31..b5a7ce18f 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
@@ -582,48 +582,48 @@ rule CoreFir
     RECOVERABLE: COREFIRWOF & ~COREFIR_MASK & ~COREFIR_ACT0 &  COREFIR_ACT1;
 };
 
-#Based on RAS SpreadSheet p8dd1_mss_FFDC_51.xls
+#Based on RAS SpreadSheet p8dd1_mss_FFDC_72.xls
 group gCoreFir filter singlebit
 {
     /** COREFIR[0]
      *  IFU_SRAM_PARITY_ERR: SRAM recoverable error (ICACHE parity error, etc.)
      */
-    (CoreFir, bit(0)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(0)) ? calloutExThr5pHr;
 
     /** COREFIR[1]
      *  IF_SETDELETE_ERR: set deleted
      */
-    (CoreFir, bit(1)) ? SelfHighThr1;
+    (CoreFir, bit(1)) ? calloutExThr1;
 
     /** COREFIR[2]
      *  IF_RFILE_REC_ERR: RegFile recoverable error
      */
-    (CoreFir, bit(2)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(2)) ? calloutExThr5pHr;
 
     /** COREFIR[3]
      *  IF_RFILE_CHKSTOP_ERR: RegFile core check stop
      */
-    (CoreFir, bit(3)) ? SelfHighThr1;
+    (CoreFir, bit(3)) ? calloutExThr1;
 
     /** COREFIR[4]
      *  IF_LOG_REC_ERR: logic recoverable error
      */
-    (CoreFir, bit(4)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(4)) ? calloutExThr5pHr;
 
     /** COREFIR[5]
      *  IF_LOG_CHKSTOP_ERR: logic core check stop
      */
-    (CoreFir, bit(5)) ? SelfHighThr1;
+    (CoreFir, bit(5)) ? calloutExThr1;
 
     /** COREFIR[6]
      *  IF_NOT_MT_REC_ERR: recoverable if not in MT window
      */
-    (CoreFir, bit(6)) ? SelfMedThr32PerDay;
+    (CoreFir, bit(6)) ? calloutExThr32pDay;
 
     /** COREFIR[7]
      *  IF_CHKSTOP_ERR: system check stop
      */
-    (CoreFir, bit(7)) ? SelfHighThr1;
+    (CoreFir, bit(7)) ? calloutExThr1;
 
     /** COREFIR[8]
      *  RECOV_FIR_CHKSTOP_ERR: recovery core check stop
@@ -633,33 +633,33 @@ group gCoreFir filter singlebit
     /** COREFIR[9]
      *  SD_RFILE_REC_ERR: RegFile recoverable error
      */
-    (CoreFir, bit(9)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(9)) ? calloutExThr5pHr;
 
     /** COREFIR[10]
      *  SD_RFILE_CHKSTOP_ERR: RegFile core check stop (mapper error)
      */
-    (CoreFir, bit(10)) ? SelfHighThr1;
+    (CoreFir, bit(10)) ? calloutExThr1;
 
     /** COREFIR[11]
      *  SD_LOG_REC_ERR: logic recoverable error
      */
-    (CoreFir, bit(11)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(11)) ? calloutExThr5pHr;
 
     /** COREFIR[12]
      *  SD_LOG_CHKSTOP_ERR: logic core check stop
      */
-    (CoreFir, bit(12)) ? SelfHighThr1;
+    (CoreFir, bit(12)) ? calloutExThr1;
 
     /** COREFIR[13]
      *  SD_NOT_MT_REC_ERR: recoverable if not in MT window
      */
-    (CoreFir, bit(13)) ? SelfMedThr32PerDay;
+    (CoreFir, bit(13)) ? calloutExThr32pDay;
 
     /** COREFIR[14]
      *  SD_MCHK_AND_ME_EQ_0: MCHK received while ME=0 non recoverable
      */
     # FIXME: RTC 85697: Make sure this is SUE-CS bit
-    (CoreFir, bit(14)) ? calloutSelfHighSUE;
+    (CoreFir, bit(14)) ? calloutExThr1Sue;
 
     /** COREFIR[15]
      *  SD_PC_L2_UE_ERR: UE from L2
@@ -684,7 +684,7 @@ group gCoreFir filter singlebit
     /** COREFIR[19]
      *  FX_GPR_REC_ERR: GPR recoverable error
      */
-    (CoreFir, bit(19)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(19)) ? calloutExThr5pHr;
 
     /** COREFIR[20]
      *  UNUSED_3
@@ -694,37 +694,37 @@ group gCoreFir filter singlebit
     /** COREFIR[21]
      *  FX_LOG_CHKSTOP_ERR: logic core check stop
      */
-    (CoreFir, bit(21)) ? SelfHighThr1;
+    (CoreFir, bit(21)) ? calloutExThr1;
 
     /** COREFIR[22]
      *  FX_NOT_MT_REC_ERR: recoverable if not in MT window
      */
-    (CoreFir, bit(22)) ? SelfMedThr32PerDay;
+    (CoreFir, bit(22)) ? calloutExThr32pDay;
 
     /** COREFIR[23]
      *  VS_VRF_REC_ERR: VRF recoverable error
      */
-    (CoreFir, bit(23)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(23)) ? calloutExThr5pHr;
 
     /** COREFIR[24]
      *  VS_LOG_REC_ERR: logic recoverable error
      */
-    (CoreFir, bit(24)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(24)) ? calloutExThr5pHr;
 
     /** COREFIR[25]
      *  VS_LOG_CHKSTOP_ERR: logic core check stop
      */
-    (CoreFir, bit(25)) ? SelfHighThr1;
+    (CoreFir, bit(25)) ? calloutExThr1;
 
     /** COREFIR[26]
      *  RECOV_IN_MAINT_ERR: 26 = recov_in_maint
      */
-    (CoreFir, bit(26)) ? callout2ndLvlMed;
+    (CoreFir, bit(26)) ? callout2ndLvlDumpSh;
 
     /** COREFIR[27]
      *  DU_LOG_REC_ERR: logic recoverable error
      */
-    (CoreFir, bit(27)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(27)) ? calloutExThr5pHr;
 
     /** COREFIR[28]
      *  DU_LOG_CHKSTOP_ERR: logic core check stop
@@ -734,22 +734,22 @@ group gCoreFir filter singlebit
     /** COREFIR[29]
      *  LSU_SRAM_PARITY_ERR: SRAM recoverable error (DCACHE parity error, etc.)
      */
-    (CoreFir, bit(29)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(29)) ? calloutExThr5pHr;
 
     /** COREFIR[30]
      *  LS_SETDELETE_ERR: set deleted
      */
-    (CoreFir, bit(30)) ? SelfHighThr1;
+    (CoreFir, bit(30)) ? calloutExThr1;
 
     /** COREFIR[31]
      *  LS_RFILE_REC_ERR: RegFile recoverable error
      */
-    (CoreFir, bit(31)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(31)) ? calloutExThr5pHr;
 
     /** COREFIR[32]
      *  LS_RFILE_CHKSTOP_ERR: RegFile core check stop
      */
-    (CoreFir, bit(32)) ? SelfHighThr1;
+    (CoreFir, bit(32)) ? calloutExThr1;
 
     /** COREFIR[33]
      *  LS_TLB_MULTIHIT_ERR: special recovery error TLB multi hit error occurred
@@ -769,32 +769,32 @@ group gCoreFir filter singlebit
     /** COREFIR[36]
      *  FORWARD_PROGRESS_ERR: forward progress error
      */
-    (CoreFir, bit(36)) ? SelfHighThr1;
+    (CoreFir, bit(36)) ? calloutExThr1;
 
     /** COREFIR[37]
      *  LS_LOG_REC_ERR: logic recoverable error
      */
-    (CoreFir, bit(37)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(37)) ? calloutExThr5pHr;
 
     /** COREFIR[38]
      *  LS_LOG_CHKSTOP_ERR: logic core check stop
      */
-    (CoreFir, bit(38)) ? SelfHighThr1;
+    (CoreFir, bit(38)) ? calloutExThr1;
 
     /** COREFIR[39]
      *  LS_NOT_MT_REC_ERR: recoverable if not in MT window
      */
-    (CoreFir, bit(39)) ? SelfMedThr32PerDay;
+    (CoreFir, bit(39)) ? calloutExThr32pDay;
 
     /** COREFIR[40]
      *  LS_NOT_CI_REC_ERR: recoverable if not in CI window
      */
-    (CoreFir, bit(40)) ? SelfMedThr32PerDay;
+    (CoreFir, bit(40)) ? calloutExThr32pDay;
 
     /** COREFIR[41]
      *  LS_CHKSTOP_ERR: system check stop
      */
-    (CoreFir, bit(41)) ? SelfHighThr1;
+    (CoreFir, bit(41)) ? calloutExThr1;
 
     /** COREFIR[42]
      *  LS_GPR_RCV_CHKSTOP_ERR: UE from GPR/VRF recovery process
@@ -809,12 +809,12 @@ group gCoreFir filter singlebit
     /** COREFIR[44]
      *  FIR_LOG_RECOV_ERR: logic recoverable error
      */
-    (CoreFir, bit(44)) ? SelfHighThr5PerHour;
+    (CoreFir, bit(44)) ? calloutExThr5pHr;
 
     /** COREFIR[45]
      *  PC_LOG_CHKSTOP_ERR: PC logic core check stop
      */
-    (CoreFir, bit(45)) ? SelfHighThr1;
+    (CoreFir, bit(45)) ? calloutExThr1;
 
     /** COREFIR[46]
      *  RESERVED
@@ -829,7 +829,7 @@ group gCoreFir filter singlebit
     /** COREFIR[48]
      *  SPRD_FIR_HYP_RES_P_ERR: Hypervisor Resource error - core check stop
      */
-    (CoreFir, bit(48)) ? SelfHighThr1;
+    (CoreFir, bit(48)) ? calloutExThr1;
 
     /** COREFIR[49]
      *  TFC_FIR_P_ERR: TFAC parity error
@@ -849,7 +849,7 @@ group gCoreFir filter singlebit
     /** COREFIR[52]
      *  CORE_HUNG: Hang recovery failed (core check stop)
      */
-    (CoreFir, bit(52)) ? SelfHighThr1;
+    (CoreFir, bit(52)) ? calloutExThr1;
 
     /** COREFIR[53]
      *  CORE_HANG_DETECT: Internal hang detected (core hang)
@@ -859,7 +859,7 @@ group gCoreFir filter singlebit
     /** COREFIR[54]
      *  AMBI_HANG_DETECT: Hang detected unknown source
      */
-    (CoreFir, bit(54)) ? calloutSelfAndLevel2MedThr1;
+    (CoreFir, bit(54)) ? calloutExAndSecLvlThr1;
 
     /** COREFIR[55]
      *  NEST_HANG_DETECT: External Hang detected
@@ -1116,12 +1116,12 @@ group gL3Fir filter singlebit
     /** L3FIR[0]
      *  PowerBus Command Error - Overrun condition.
      */
-    (L3Fir, bit(0)) ? SelfLowLevel2MedThr1;
+    (L3Fir, bit(0)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** L3FIR[1]
      *  PowerBus Data Error - Overrun condition.
      */
-    (L3Fir, bit(1)) ? SelfLowLevel2MedThr1;
+    (L3Fir, bit(1)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** L3FIR[2]
      *  Spare
@@ -1201,7 +1201,7 @@ group gL3Fir filter singlebit
     /** L3FIR[16]
      *  L3 Store Address Error
      */
-    (L3Fir, bit(16)) ? SelfLowLevel2MedThr1;
+    (L3Fir, bit(16)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** L3FIR[17]
      *  L3 Load Address Error (from Prefetch Machine)
@@ -1236,7 +1236,7 @@ group gL3Fir filter singlebit
     /** L3FIR[23]
      *  L3 Machine Hang
      */
-    (L3Fir, bit(23)) ? SelfLowLevel2MedThr1;
+    (L3Fir, bit(23)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** L3FIR[24]
      *  L3 Hw Control Error
@@ -1246,7 +1246,7 @@ group gL3Fir filter singlebit
     /** L3FIR[25]
      *  L3 Snoop Sw error detected
      */
-    (L3Fir, bit(25)) ? SelfLowLevel2MedThr1;
+    (L3Fir, bit(25)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** L3FIR[26]
      *  L3 Line Delete CE done
@@ -1296,7 +1296,7 @@ group gL3Fir filter singlebit
     /** L3FIR[35]
      *  L3 HA Log Overflow
      */
-    (L3Fir, bit(35)) ? callout2ndLvlMedThr1;
+    (L3Fir, bit(35)) ? callout2ndLvlDumpSW;
 
     /** L3FIR[36]
      *  SCOM_ERR: scom error
@@ -1330,18 +1330,18 @@ group gNcuFir filter singlebit
     /** NCUFIR[1]
      *  TLBIE_SW_ERR: TLBIE received illegal AP/LP field from core.
      */
-    (NcuFir, bit(1)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(1)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[2]
-     *  ST_ADDR_ERR: Store address machine or TLBIE/sync machine received 
+     *  ST_ADDR_ERR: Store address machine or TLBIE/sync machine received
      *  addr_err cresp.
      */
-    (NcuFir, bit(2)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(2)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[3]
      *  LD_ADDR_ERR: Load address machine received addr_err cresp.
      */
-    (NcuFir, bit(3)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(3)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[4]
      *  ST_FOREIGN0_ACK_DEAD: Store received ack_dead on foreign link0.
@@ -1371,12 +1371,12 @@ group gNcuFir filter singlebit
     /** NCUFIR[9]
      *  STORE_TIMEOUT: Store timed out on PB.
      */
-    (NcuFir, bit(9)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(9)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[10]
      *  TLBIE_MASTER_TIMEOUT: TLBIE master timed out on PB.
      */
-    (NcuFir, bit(10)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(10)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[11]
      *  TLBIE_SNOOP_TIMEOUT: TLBIE snooper timed out waiting for core.
@@ -1386,22 +1386,22 @@ group gNcuFir filter singlebit
     /** NCUFIR[12]
      *  HTM_IMA_TIMEOUT: HTM/IMA address machine timed out on PB.
      */
-    (NcuFir, bit(12)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(12)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[13]
      *  IMA_CRESP_ADDR_ERR: IMA received addr_err cresp.
      */
-    (NcuFir, bit(13)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(13)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[14]
      *  IMA_FOREIGN0_ACK_DEAD: IMA received ack_dead on foreign link0.
      */
-    (NcuFir, bit(14)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(14)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[15]
      *  IMA_FOREIGN1_ACK_DEAD: IMA received ack_dead on foreign link1.
      */
-    (NcuFir, bit(15)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(15)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[16]
      *  HTM_GOT_ACK_DEAD: HTM received ack_dead on any foreign link.
@@ -1417,7 +1417,7 @@ group gNcuFir filter singlebit
     /** NCUFIR[18]
      *  TLBIE_CONTROL_ERR: TLBIE control error.
      */
-    (NcuFir, bit(18)) ? SelfLowLevel2MedThr1;
+    (NcuFir, bit(18)) ? calloutExLowSecLvlThr1MedDumpSh;
 
     /** NCUFIR[19|20|21|22|23]
      *  SPARE
@@ -1597,3 +1597,51 @@ actionclass calloutParentChipHighThr32
     calloutParentProcHigh;
     threshold32pday;
 };
+
+/** Dump Core */
+actionclass dumpCore
+{
+    dump( DUMP_CONTENT_CORE );
+};
+
+/** callout core, threshold 5 per day, and initiate core dump*/
+actionclass calloutExThr5pHr
+{
+    SelfHighThr5PerHour;
+    dumpCore;
+};
+
+/** callout core, threshold 1 and initiate core dump*/
+actionclass calloutExThr1
+{
+    SelfHighThr1;
+    dumpCore;
+};
+
+/** callout core, threshold 32per day and initiate core dump*/
+actionclass calloutExThr32pDay
+{
+    SelfMedThr32PerDay;
+    dumpCore;
+};
+
+/** callout core, threshold 1, and initiate core dump*/
+actionclass calloutExThr1Sue
+{
+    calloutSelfHighSUE;
+    dumpCore;
+};
+
+/** callout Ex,Sec Level on first instance ,initiate software
+ *  and Hardware dump */
+actionclass calloutExAndSecLvlThr1
+{
+    calloutSelfAndLevel2MedThr1;
+    dumpSH;
+};
+
+actionclass calloutExLowSecLvlThr1MedDumpSh
+{
+    SelfLowLevel2MedThr1;
+    dumpSH;
+};
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
index b20edd8ae..da1a7a6b6 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
@@ -158,7 +158,7 @@ chip Mcs
 
 ################################################################################
 # PB Chiplet MCIFIR
-# Reviewed p8dd1_mss_FFDC_59.xls on 10/07/13
+# Reviewed p8dd1_mss_FFDC_72.xls on 01/16/14
 ################################################################################
 
 rule MciFir
@@ -320,7 +320,7 @@ group gMciFir attntype CHECK_STOP, RECOVERABLE, SPECIAL, UNIT_CS
     /** MCIFIR[27]
      *  MCIFIRQ_MCS_COMMAND_LIST_TIMEOUT_DUE_TO_POWERBUS
      */
-    (MciFir, bit(27)) ? callout2ndLvlMedThr1;
+    (MciFir, bit(27)) ? callout2ndLvlDumpSh;
 
     /** MCIFIR[28]
      *  MCIFIRQ_MULTIPLE_RCMD_OR_CRESP_ACTIVE
@@ -458,6 +458,7 @@ actionclass calloutConnCenTh1
 {
     callout(connected(TYPE_MEMBUF), MRU_MED);
     threshold1;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus (MEDA) */
@@ -466,6 +467,7 @@ actionclass calloutDmiBus
     calloutSelfMedA;
     callout(connected(TYPE_MEMBUF), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Clear MBS SecondaryBits and calloutDmiBusTh1 */
@@ -475,7 +477,7 @@ actionclass clearSecMbsBitsCalloutDmiBusTh1
     calloutDmiBusTh1;
 };
 
-/** Callout the DMI bus (MEDA), threshold 1 */
+/** Callout the DMI bus (MEDA), threshold 1*/
 actionclass calloutDmiBusTh1
 {
     calloutDmiBus;
@@ -502,10 +504,3 @@ actionclass analyzeSpareBitAndThr
     try( funccall("checkSpareBit"), CalloutDmiBusAndThr2pd );
 };
 
-/** Callout 2nd Level and dump SW */
-actionclass callout2ndLvlDumpSW
-{
-    callout2ndLvlMedThr1;
-    dumpSW;
-};
-
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
index e13dcea30..595653522 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
@@ -406,3 +406,35 @@ actionclass analyzeEx13 { analyze(connected(TYPE_EX, 13)); };
 /** Analyze connected EX14 */
 actionclass analyzeEx14 { analyze(connected(TYPE_EX, 14)); };
 
+actionclass calloutProcLevel2MedThr1
+{
+    calloutSelfLow;
+    callout2ndLvlMed;
+    threshold1;
+    dumpSH;
+};
+
+/** callout Proc with low priority ,Sec level Med priority, Thr1
+ *  and dump type SH */
+actionclass calloutProcLevel2MedThr1dumpSh
+{
+    calloutProcLevel2MedThr1;
+    dumpSH;
+};
+
+/** callout Proc with low priority ,Sec level Med priority, Thr 32per day
+ *  and dump type SH */
+actionclass calloutProcLevel2MedThr32dumpSh
+{
+    calloutSelfLow;
+    callout2ndLvlMed;
+    threshold32pday;
+    dumpSH;
+};
+
+actionclass calloutProcHighThr1SUE
+{
+    calloutSelfHigh;
+    SUEGenerationPoint;
+    threshold1;
+};
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
index 970e4e86c..55506ed6b 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
@@ -1360,7 +1360,7 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[9]
      *  INVALID_CRESP
      */
-    (PsiHbFir, bit(9)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(9)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[10]
      *  PB_DATA_TIME_OUT
@@ -1380,7 +1380,7 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[13]
      *  UNEXPECTED_PB
      */
-    (PsiHbFir, bit(13)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(13)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[14]
      *  INTERRUPT_REG_CHANGE_WHILE_ACTIVE
@@ -1390,32 +1390,32 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[15]
      *  INTERRUPT0_ADDRESS_ERROR
      */
-    (PsiHbFir, bit(15)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(15)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[16]
      *  INTERRUPT1_ADDRESS_ERROR
      */
-    (PsiHbFir, bit(16)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(16)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[17]
      *  INTERRUPT2_ADDRESS_ERROR
      */
-    (PsiHbFir, bit(17)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(17)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[18]
      *  INTERRUPT3_ADDRESS_ERROR
      */
-    (PsiHbFir, bit(18)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(18)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[19]
      *  INTERRUPT4_ADDRESS_ERROR
      */
-    (PsiHbFir, bit(19)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(19)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[20]
      *  INTERRUPT5_ADDRESS_ERROR
      */
-    (PsiHbFir, bit(20)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(20)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[21]
      *  TCBR_TP_PSI_GLB_ERR_0
@@ -1431,7 +1431,7 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[23]
      *  UPSTREAM_FIR
      */
-    (PsiHbFir, bit(23)) ? callout2ndLvlMedThr32perDay;
+    (PsiHbFir, bit(23)) ? calloutProcLevel2MedThr32dumpSh;
 
     /** PSIHBFIR[24|25|26]
      *  SPARE_FIR
@@ -2730,7 +2730,7 @@ group gIomcFir_0 filter singlebit
 ################################################################################
 # PB Chiplet IOMCFIR_1
 ################################################################################
-# RAS spreadsheet: p8dd1_mss_FFDC_37_ reviewd.xls
+# RAS spreadsheet: p8dd1_mss_FFDC_72_ reviewd.xls on Jan 18,2014
 
 rule IomcFir_1
 {
@@ -2933,6 +2933,8 @@ actionclass calloutDmiBus0
     callout(connected(TYPE_MCS,    0), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 0), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
+
 };
 
 /** Callout the DMI bus 1 */
@@ -2941,6 +2943,7 @@ actionclass calloutDmiBus1
     callout(connected(TYPE_MCS,    1), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 1), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 2 */
@@ -2949,6 +2952,7 @@ actionclass calloutDmiBus2
     callout(connected(TYPE_MCS,    2), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 2), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 3 */
@@ -2957,6 +2961,7 @@ actionclass calloutDmiBus3
     callout(connected(TYPE_MCS,    3), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 3), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 4 */
@@ -2965,6 +2970,7 @@ actionclass calloutDmiBus4
     callout(connected(TYPE_MCS,    4), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 4), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 5 */
@@ -2973,6 +2979,7 @@ actionclass calloutDmiBus5
     callout(connected(TYPE_MCS,    5), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 5), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 6 */
@@ -2981,6 +2988,7 @@ actionclass calloutDmiBus6
     callout(connected(TYPE_MCS,    6), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 6), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 7 */
@@ -2989,6 +2997,7 @@ actionclass calloutDmiBus7
     callout(connected(TYPE_MCS,    7), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 7), MRU_MEDA);
     calloutDmiBusSymFru;
+    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 0, threshold 1 */
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
index 27f0cab6c..be7fed0ce 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
@@ -254,7 +254,7 @@ group gPbenFir filter singlebit
     /** PBENFIR[15]
      *  X_LINK_CR_OVERFLOW: x link command/response/data buffer overflow
      */
-    (PbenFir, bit(15)) ? calloutProcLevel2MedThr1;
+    (PbenFir, bit(15)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PBENFIR[16]
      *  X0_LINK_FMR_ERR: x0 link framer error
@@ -808,3 +808,4 @@ actionclass thresholdAndMask_xbus2 { calloutXbus2Interface; thresholdAndMask; };
 /** Callout XBUS 3 with "Threshold and Mask" policy. */
 actionclass thresholdAndMask_xbus3 { calloutXbus3Interface; thresholdAndMask; };
 
+