PRD: Remove gardState from PFA data

Change-Id: I4bd615d7d22f17185c2200a78f5ccf466e7be24d
RTC: 89322
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7433
Tested-by: Jenkins Server
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7709
Reviewed-by: Bilicon Patil <bilpatil@in.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 7 insertions, 25 deletions

diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
index a954cd5af..6a0406138 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
@@ -226,8 +226,6 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
     sdc = i_sdc;
 
     GardAction::ErrorType prdGardErrType;
-    // TODO: RTC - 89322: Consolidate gardSate and prdGardErrType values.
-    HWSV::hwsvGardEnum gardState;  // defined in src/hwsv/server/hwsvTypes.H
     HWAS::GARD_ErrorType gardErrType = HWAS::GARD_NULL;
     HWAS::DeconfigEnum deconfigState = HWAS::NO_DECONFIG;
 
@@ -398,8 +396,6 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
     // Set Gard Error Type and state
     //**************************************************************
 
-    gardState = HWSV::HWSV_DECONFIG_GARD;
-
     // If gardErrType was determined during UE/SUE processing for Check Stop,
     // use that and not determine gardErrType from the sdc values.
     if (gardErrType != HWAS::GARD_Fatal)
@@ -408,7 +404,6 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
         switch (prdGardErrType)
         {
             case GardAction::NoGard:
-                gardState =  HWSV::HWSV_NO_GARD;
                 gardErrType = HWAS::GARD_NULL;
                 break;
             case GardAction::Predictive:
@@ -424,16 +419,13 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
                 }
                 else
                 {
-                    gardState =  HWSV::HWSV_NO_GARD;
                     gardErrType = HWAS::GARD_NULL;
                 }
                 break;
             case GardAction::DeconfigNoGard:
-                gardState =  HWSV::HWSV_NO_GARD;
                 gardErrType = HWAS::GARD_NULL;
                 break;
             default:
-                gardState =  HWSV::HWSV_NO_GARD;
                 gardErrType = HWAS::GARD_NULL;
                 PRDF_DTRAC( PRDF_FUNC"Unknown prdGardErrType" );
                 break;
@@ -445,7 +437,6 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
         // If NoGard was specified in this switched sdc, then keep the NoGard
         if ( sdc.QueryGard() == GardAction::NoGard )
         {
-            gardState = HWSV::HWSV_NO_GARD;
             gardErrType = HWAS::GARD_NULL;
             prdGardErrType = GardAction::NoGard;
         }
@@ -457,7 +448,6 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
 
     if (sdc.IsThermalEvent() && (MACHINE_CHECK != i_attnType) )
     {  //Force No Gard
-        gardState = HWSV::HWSV_NO_GARD;
         gardErrType = HWAS::GARD_NULL;
     }
 
@@ -551,8 +541,8 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
 
     // Deferred Deconfig should be used throughout all of Hostboot (both
     // checkForIplAttns() and MDIA).
-    if ( (HWSV::HWSV_NO_GARD != gardState ||
-          GardAction::DeconfigNoGard == prdGardErrType ) )
+    if ( (HWAS::GARD_NULL != gardErrType) ||
+         (GardAction::DeconfigNoGard == prdGardErrType) )
     {
         deferDeconfig = true;
         deconfigState = HWAS::DECONFIG;
@@ -688,7 +678,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
     TargetHandle_t dumpTrgt = NULL;
 
     initPfaData( sdc, i_attnType, deferDeconfig, actionFlag, severityParm,
-                 prdGardErrType, gardState, pfaData, dumpTrgt );
+                 prdGardErrType, pfaData, dumpTrgt );
 
     HUID dumpId       = pfaData.msDumpInfo.id;
     TYPE dumpTrgtType = getTargetType( dumpTrgt );
@@ -1029,7 +1019,7 @@ will also be removed. Need to confirm if this code is required anymore.
 void ErrDataService::initPfaData( ServiceDataCollector & i_sdc,
                                   uint32_t i_attnType, bool i_deferDeconfig,
                                   uint32_t i_errlAct, uint32_t i_errlSev,
-                                  uint32_t i_prdGardType, uint32_t i_gardState,
+                                  uint32_t i_prdGardType,
                                   PfaData & o_pfa, TargetHandle_t & o_dumpTrgt )
 {
     // Dump info
@@ -1075,7 +1065,6 @@ void ErrDataService::initPfaData( ServiceDataCollector & i_sdc,
     // Misc
     o_pfa.serviceActionCounter = iv_serviceActionCounter;
     o_pfa.prdGardErrType       = i_prdGardType;
-    o_pfa.hwasGardState        = i_gardState;
 
     // Attention types
     o_pfa.priAttnType = i_attnType;
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H
index 688ee064a..90279ece0 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H
@@ -192,7 +192,7 @@ class ErrDataService
     void initPfaData( ServiceDataCollector & i_sdc,
                       uint32_t i_attnType, bool i_deferDeconfig,
                       uint32_t i_errlAct, uint32_t i_errlSev,
-                      uint32_t i_prdGardType, uint32_t i_gardState,
+                      uint32_t i_prdGardType,
                       PfaData & o_pfa, TARGETING::TargetHandle_t & o_dumpTrgt );
 
     /**
diff --git a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
index 784d5025e..cff6134f2 100644
--- a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
+++ b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
@@ -457,7 +457,6 @@ bool parsePfaData( void * i_buffer, uint32_t i_buflen,
         tmpStr = GardAction::ToString( pfa.prdGardErrType );
         snprintf( tmp, 50, "%s (0x%X) ", tmpStr, pfa.prdGardErrType );
         i_parser.PrintString( "PRD GARD Error Type", tmp );
-        i_parser.PrintNumber( "HWAS GARD State", "0x%02X", pfa.hwasGardState );
 
         // MRU callouts
         if ( 0 < pfa.mruListCount )
diff --git a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
index 9fbe6054a..7ceb7947e 100644
--- a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
+++ b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
@@ -174,7 +174,7 @@ struct PfaData
     uint32_t priAttnType    : 8, // primary attention type
              secAttnType    : 8, // secondary attention type
              prdGardErrType : 8, // See enum GardResolution::ErrorType
-             hwasGardState  : 8; // See enum hwsvGardEnum (in hwsvTypes.H)
+             unUsed         : 8;
 
     uint32_t mruListCount;                  // Total number of MRUs.
     PfaMruListStruct mruList[MruListLIMIT]; // Full list of MRUs.
@@ -223,7 +223,7 @@ struct PfaData
         i_left << ( (i_right.priAttnType    << 24) |
                     (i_right.secAttnType    << 16) |
                     (i_right.prdGardErrType <<  8) |
-                    (i_right.hwasGardState       ) );
+                    (i_right.unUsed              ) );
 
         i_left << i_right.mruListCount;
         for ( uint32_t i = 0; i < i_right.mruListCount; i++ )
@@ -272,7 +272,6 @@ struct PfaData
         i_right.priAttnType    = (l_tmp[4] >> 24) & 0xFF;
         i_right.secAttnType    = (l_tmp[4] >> 16) & 0xFF;
         i_right.prdGardErrType = (l_tmp[4] >>  8) & 0xFF;
-        i_right.hwasGardState  = (l_tmp[4]      ) & 0xFF;
 
         i_left >> i_right.mruListCount;
         for ( uint32_t i = 0; i < i_right.mruListCount; i++ )
diff --git a/src/usr/diag/prdf/common/prdfEnums.H b/src/usr/diag/prdf/common/prdfEnums.H
index b739db66c..8251ee032 100755
--- a/src/usr/diag/prdf/common/prdfEnums.H
+++ b/src/usr/diag/prdf/common/prdfEnums.H
@@ -103,7 +103,6 @@ enum MFG_THRES_SYNC_MSG_TYPE
     {
         typedef uint32_t hwsvDiagUpdate;
         typedef uint32_t hwsvTermEnum;
-        typedef uint32_t hwsvGardEnum;
         typedef uint32_t hwsvDeconfigSchedule;
 
         enum
@@ -115,10 +114,6 @@ enum MFG_THRES_SYNC_MSG_TYPE
             HWSV_DIAG_NOT_NEEDED = 0,
             HWSV_DIAG_NEEDED,
 
-            // hwsvGardEnum
-            HWSV_NO_GARD = 0,
-            HWSV_DECONFIG_GARD,
-
             //hwsvDeconfigSchedule
             HWSV_DECONFIG_IMMEDIATE = 0,
             HWSV_DECONFIG_DEFER