PRD:HWMEM dump replaced with HWPROC

This commit only fixes the dump type that PRD uses. There is a
separate defect for DUMP (SW254383) to fix the data that should
be collect for this event.

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

6 files changed, 2 insertions, 21 deletions

diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
index 42941fa2c..a96b1f670 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
@@ -492,7 +492,6 @@ uint32_t prdrActionArgMap(const std::string & i_arg)
         g_ActionArgMap["DUMP_CONTENT_SW"]           = 0x80000000;
         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
diff --git a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
index 3f9225789..f69003ea5 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
@@ -267,13 +267,6 @@ actionclass dumpSW
     dump(DUMP_CONTENT_SW);
 };
 
-
-/** Dump hardware content for memory buffer */
-actionclass dumpHwMembuf
-{
-    dump( DUMP_CONTENT_HWSUPERNOVA );
-};
-
 ################################################################################
 #                              Callout sec lvl support with dump               #
 ################################################################################
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Mba.rule b/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
index 6110becb3..f8803aa30 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
@@ -40,7 +40,7 @@ chip Mba
     name        "Centaur MBA Chiplet";
     targettype  TYPE_MBA;
     sigoff      0x8000;
-    dump        DUMP_CONTENT_HWSUPERNOVA;
+    dump        DUMP_CONTENT_HW;
     scomlen     64;
 
 .include "prdfCenMbaExtraSig.H";
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
index 34e1a9b21..ba8a49c11 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
@@ -468,7 +468,6 @@ actionclass calloutConnCenTh1
 {
     callout(connected(TYPE_MEMBUF), MRU_MED);
     threshold1;
-    dumpHwMembuf;
 };
 
 /** Callout the DMI bus (MEDA) */
@@ -477,7 +476,6 @@ actionclass calloutDmiBus
     calloutSelfMedA;
     callout(connected(TYPE_MEMBUF), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 };
 
 /** Clear MBS SecondaryBits and calloutDmiBusTh1 */
@@ -513,4 +511,3 @@ actionclass analyzeSpareBitAndThr
 {
     try( funccall("checkSpareBit"), CalloutDmiBusAndThr2pd );
 };
-
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Membuf.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf.rule
index 5aeb8581c..b606a0410 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Membuf.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf.rule
@@ -42,7 +42,7 @@ chip Membuf
     name        "Centaur Chip";
     targettype  TYPE_MEMBUF;
     sigoff      0x8000;
-    dump        DUMP_CONTENT_HWSUPERNOVA;
+    dump        DUMP_CONTENT_HW;
     scomlen     64;
 
 # Include Extra signatures
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 4269bcae3..dd0cb00a6 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
@@ -2938,7 +2938,6 @@ actionclass calloutDmiBus0
     callout(connected(TYPE_MCS,    0), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 0), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 
 };
 
@@ -2948,7 +2947,6 @@ actionclass calloutDmiBus1
     callout(connected(TYPE_MCS,    1), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 1), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 2 */
@@ -2957,7 +2955,6 @@ actionclass calloutDmiBus2
     callout(connected(TYPE_MCS,    2), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 2), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 3 */
@@ -2966,7 +2963,6 @@ actionclass calloutDmiBus3
     callout(connected(TYPE_MCS,    3), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 3), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 4 */
@@ -2975,7 +2971,6 @@ actionclass calloutDmiBus4
     callout(connected(TYPE_MCS,    4), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 4), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 5 */
@@ -2984,7 +2979,6 @@ actionclass calloutDmiBus5
     callout(connected(TYPE_MCS,    5), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 5), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 6 */
@@ -2993,7 +2987,6 @@ actionclass calloutDmiBus6
     callout(connected(TYPE_MCS,    6), MRU_MEDA);
     callout(connected(TYPE_MEMBUF, 6), MRU_MEDA);
     calloutDmiBusSymFru;
-    dumpHwMembuf;
 };
 
 /** Callout the DMI bus 7 */
@@ -3002,7 +2995,6 @@ 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 */