PRD:Change of dump types for various fir bits.

Change-Id: I66caf0e40930eed59faf9b8a65653470a009d499
CQ:SW248218
Backport: release-fips810
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9258
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9614
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 20 insertions, 22 deletions

diff --git a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
index b57b0ef5d..01f1abc30 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
@@ -243,6 +243,12 @@ actionclass callout2ndLvlMedThr1UE
     SUEGenerationPoint;
 };
 
+/** Callout 2nd Level Medium, initiate SH dump */
+actionclass callout2ndLvlMedThr1dumpSh
+{
+    callout2ndLvlMedThr1;
+    dumpSH;
+};
 ################################################################################
 #                               Dump Types                                     #
 ################################################################################
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
index 85b2d955b..71454c759 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
@@ -2006,18 +2006,18 @@ actionclass SelfAndLevel2MedThr5PerHr
 };
 
 /** callouts Proc on first instance. Calls for second level support as well*/
-actionclass calloutProcLow2ndLvlMedThr1
+actionclass calloutProcLow2ndLvlMedThr1dumpSh
 {
     calloutParentProcLow;
-    callout2ndLvlMed;
-    threshold1;
+    callout2ndLvlMedThr1dumpSh;
 };
 
 /** callouts Proc on first instance. Calls for second level support as well.
  *  Set SUE flag */
 actionclass calloutProcLow2ndLvlMedThr1SUE
 {
-    calloutProcLow2ndLvlMedThr1;
+    calloutParentProcLow;
+    callout2ndLvlMedThr1;
     flag(SUE);
 };
 
@@ -2060,10 +2060,3 @@ actionclass calloutExLowSecLvlThr1MedDumpSh
     dumpSH;
 };
 
-/** callouts Proc on first instance. Calls for second level support as well
- *  Initiate an SH dump */
-actionclass calloutProcLow2ndLvlMedThr1dumpSh
-{
-    calloutProcLow2ndLvlMedThr1;
-    dumpSH;
-};
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
index 8ddc40a23..8ee0aec97 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
@@ -410,7 +410,6 @@ actionclass calloutProcLevel2MedThr1
     calloutSelfLow;
     callout2ndLvlMed;
     threshold1;
-    dumpSH;
 };
 
 /** callout Proc with low priority ,Sec level Med priority, Thr1
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 cd3b2f662..ce7d46354 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
@@ -703,12 +703,12 @@ group gNxCxaFir filter singlebit
     /** NXCXAFIR[29]
      *  LD_CLASS_CMD_ADDR_ERR
      */
-    (NxCxaFir, bit(29)) ? callout2ndLvlMedThr1;
+    (NxCxaFir, bit(29)) ? callout2ndLvlMedThr1dumpSh;
 
     /** NXCXAFIR[30]
      *  ST_CLASS_CMD_ADDR_ERR
      */
-    (NxCxaFir, bit(30)) ? callout2ndLvlMedThr1;
+    (NxCxaFir, bit(30)) ? callout2ndLvlMedThr1dumpSh;
 
     /** NXCXAFIR[31]
      *  PHB_LINK_DOWN
@@ -1360,7 +1360,7 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[8]
      *  INVALID_TTYPE
      */
-    (PsiHbFir, bit(8)) ? calloutProcLevel2MedThr1;
+    (PsiHbFir, bit(8)) ? calloutProcLevel2MedThr1dumpSh;
 
     /** PSIHBFIR[9]
      *  INVALID_CRESP
@@ -1375,7 +1375,7 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[11]
      *  PB_PARITY_ERROR
      */
-    (PsiHbFir, bit(11)) ? callout2ndLvlMedThr1;
+    (PsiHbFir, bit(11)) ? callout2ndLvlMedThr1dumpSh;
 
     /** PSIHBFIR[12]
      *  FSP_ACCESS_TRUSTED_SPACE
@@ -2369,32 +2369,32 @@ group gPciNestFir filter singlebit
     /** PCINESTFIR_0[18]
      *  UNSOLICITIEDPBDATA
      */
-    (PciNestFir_0, bit(18)) ? callout2ndLvlMedThr1;
+    (PciNestFir_0, bit(18)) ? callout2ndLvlMedThr1dumpSh;
 
     /** PCINESTFIR_1[18]
      *  UNSOLICITIEDPBDATA
      */
-    (PciNestFir_1, bit(18)) ? callout2ndLvlMedThr1;
+    (PciNestFir_1, bit(18)) ? callout2ndLvlMedThr1dumpSh;
 
     /** PCINESTFIR_2[18]
      *  UNSOLICITIEDPBDATA
      */
-    (PciNestFir_2, bit(18)) ? callout2ndLvlMedThr1;
+    (PciNestFir_2, bit(18)) ? callout2ndLvlMedThr1dumpSh;
 
     /** PCINESTFIR_0[19]
      *  UNEXPECTEDCRESP
      */
-    (PciNestFir_0, bit(19)) ? callout2ndLvlMedThr1;
+    (PciNestFir_0, bit(19)) ? callout2ndLvlMedThr1dumpSh;
 
     /** PCINESTFIR_1[19]
      *  UNEXPECTEDCRESP
      */
-    (PciNestFir_1, bit(19)) ? callout2ndLvlMedThr1;
+    (PciNestFir_1, bit(19)) ? callout2ndLvlMedThr1dumpSh;
 
     /** PCINESTFIR_2[19]
      *  UNEXPECTEDCRESP
      */
-    (PciNestFir_2, bit(19)) ? callout2ndLvlMedThr1;
+    (PciNestFir_2, bit(19)) ? callout2ndLvlMedThr1dumpSh;
 
     /** PCINESTFIR_0[20]
      *  INVALIDCRESP