PRD:Addressed FIXME in RAS Services

Change-Id: I602037e8496724be89ba3e43e277b6316b86f6e2
RTC:66038
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8176
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8337

5 files changed, 1 insertions, 145 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 798ce62d6..74dc80713 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
@@ -773,66 +773,6 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
                    ErrlVer1, ErrlSectPFA5_1 );
 
     //**************************************************************
-    // Check for Manufacturing AVP mode
-    // If needed: Add the AVP mode data to Error Log User Data
-    //**************************************************************
-
-   /* FIXME - The MDIA component is being removed from FSP code. This means this MDIA registry variable
-will also be removed. Need to confirm if this code is required anymore.
-    if ( PlatServices::avpMode() )
-    {
-        //Get the AVP Test Case Number from the AVP Test Case Data Registry. The Test Case Number is the first four bytes.
-        uint32_t avpTCNumber = 0;
-        size_t  sz_uint32    = sizeof(uint32_t);
-        errlHndl_t errorLog = UtilReg::read ("mdia/AvpTestCaseData", &avpTCNumber, sz_uint32);
-        // printf("AVP Test Case Number from registry: %.8x \n", avpTCNumber);
-        if (errorLog)
-        {
-            errorLog->commit(PRDF_COMP_ID,ERRL_ACTION_REPORT);
-            PRDF_ERR( "PRDTRACE: RasServices Failure in AVP Test Case Registry read" );
-            delete errorLog;
-            errorLog = NULL;
-        }
-        else
-        {
-            //Add Test Case Number to Error Log User Data
-            UtilMem l_membuf;
-            l_membuf << avpTCNumber;
-            o_errl->addUsrDtls(l_membuf.base(),l_membuf.size(),PRDF_COMP_ID,ErrlVer1,ErrlAVPData_1);
-        }
-    }
-*/
-
-#ifndef __HOSTBOOT_MODULE
-    // FIXME: do we need support for AVP in Hostboot?  probably not
-    if ( PlatServices::hdatAvpMode() )
-    {
-        //Get the AVP Test Case Data from the AVP Test Case Data Registry.
-        uint8_t avpTCData[64];
-        size_t  sz_avpTCData    = sizeof(avpTCData);
-        errlHndl_t errorLog = UtilReg::read ("hdat/AvpTestCaseData", avpTCData, sz_avpTCData);
-
-        if (errorLog)
-        {
-            PRDF_ERR( PRDF_FUNC"Failure in hdat AVP Test Case Registry read" );
-            PRDF_COMMIT_ERRL(errorLog, ERRL_ACTION_REPORT);
-        }
-        else
-        {
-            //Add Test Case Data to Error Log User Data
-            const size_t sz_usrDtlsTCData = 29;
-            uint8_t usrDtlsTCData[sz_usrDtlsTCData];
-            memcpy(usrDtlsTCData, avpTCData, 4);
-            memcpy(&usrDtlsTCData[4], &avpTCData[40], 4);
-            memcpy(&usrDtlsTCData[8], &avpTCData[37], 1);
-            memcpy(&usrDtlsTCData[9], &avpTCData[44], 20);
-            PRDF_ADD_FFDC( o_errl, (const char*)usrDtlsTCData, sz_usrDtlsTCData,
-                           ErrlVer1, ErrlAVPData_2 );
-        }
-    }
-#endif // if not __HOSTBOOT_MODULE
-
-    //**************************************************************
     // Add SDC Capture data to Error Log User Data
     //**************************************************************
     // Pulled some code out to incorporate into AddCapData
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
index 78b1690b5..24f475fc4 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
@@ -1379,9 +1379,6 @@ bool isMnfgFlagSet( uint32_t i_flag )
 bool mfgMode()
 { return isMnfgFlagSet( MNFG_FLAG_BIT_MNFG_THRESHOLDS      ); }
 
-bool hdatAvpMode()
-{ return isMnfgFlagSet( MNFG_FLAG_BIT_MNFG_HDAT_AVP_ENABLE ); }
-
 bool mnfgTerminate()
 { return isMnfgFlagSet( MNFG_FLAG_BIT_MNFG_SRC_TERM        ); }
 
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
index a924facf7..2bcbda38d 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
@@ -409,12 +409,6 @@ TARGETING::TargetHandle_t getClockId(TARGETING::TargetHandle_t
 bool mfgMode();
 
 /**
- * @brief   Returns the state of the MNFG_HDAT_AVP_ENABLE policy flag.
- * @return  TRUE if MNFG_HDAT_AVP_ENABLE is set, FALSE otherwise.
- */
-bool hdatAvpMode();
-
-/**
  * @brief   Returns status of MNFG_SRC_TERM manufacturing policy flag.
  * @param   None.
  * @return  TRUE if MNFG_SRC_TERM policy flag is set, FALSE
diff --git a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
index 30bbd4bf3..ef483c8d1 100644
--- a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
+++ b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
@@ -116,12 +116,6 @@ bool parseCaptureData( void * i_buffer, uint32_t i_buflen,
 bool parsePfaData( void * i_buffer, uint32_t i_buflen,
                    ErrlUsrParser & i_parser );
 
-bool parseAVPData( void * i_buffer, uint32_t i_buflen,
-                   ErrlUsrParser & i_parser );
-
-bool parseHdatAVPData( void * i_buffer, uint32_t i_buflen,
-                       ErrlUsrParser & i_parser );
-
 //##############################################################################
 //##
 //##                          Utility Functions
@@ -546,65 +540,6 @@ bool parsePfaData( void * i_buffer, uint32_t i_buflen,
 
 //------------------------------------------------------------------------------
 
-bool parseAVPData( void * i_buffer, uint32_t i_buflen,
-                   ErrlUsrParser & i_parser )
-{
-    bool rc = true;
-
-    if (i_buffer)
-    {
-        //To get endianness correct
-        uint32_t l_avpTCNumber;
-        UtilMem l_membuf1(i_buffer,i_buflen);
-        l_membuf1 >> l_avpTCNumber;
-
-        i_parser.PrintHeading("");
-        i_parser.PrintHeading("PRD AVP Test Case Data");
-
-        i_parser.PrintNumber("AVP Test Case Number", "0x%08x", l_avpTCNumber);
-    }
-
-    // Set return code to false, so that the hex data is dumped out, for now.
-    rc = false;
-
-    return rc;
-}
-
-//------------------------------------------------------------------------------
-
-bool parseHdatAVPData( void * i_buffer, uint32_t i_buflen,
-                       ErrlUsrParser & i_parser )
-{
-    bool rc = true;
-    char l_buffer[29];
-
-    if (i_buffer)
-    {
-        uint32_t l_avpTCInfo;
-        uint8_t  l_avpTCInfoByte;
-
-        i_parser.PrintHeading("");
-        i_parser.PrintHeading("PRD HDAT AVP Test Case Data");
-
-        memcpy(l_buffer, i_buffer, 29);
-        memcpy(&l_avpTCInfo, l_buffer, 4);
-        i_parser.PrintNumber("AVP Test Case Number", "0x%08x", l_avpTCInfo);
-        memcpy(&l_avpTCInfo, &l_buffer[4], 4);
-        i_parser.PrintNumber("AVP Test List Entry", "0x%08x", l_avpTCInfo);
-        memcpy(&l_avpTCInfoByte, &l_buffer[8], 1);
-        i_parser.PrintNumber("AVP Test Corner", "0x%02x", l_avpTCInfoByte);
-        l_buffer[28] = '\0';
-        i_parser.PrintString("AVP Description", &l_buffer[9]);
-    }
-
-    // Set return code to false, so that the hex data is dumped out, for now.
-    rc = false;
-
-    return rc;
-}
-
-//------------------------------------------------------------------------------
-
 bool parseMemMru( void * i_buffer, uint32_t i_buflen, ErrlUsrParser & i_parser )
 {
     bool o_rc = true;
@@ -657,14 +592,6 @@ bool logDataParse( ErrlUsrParser & i_parser, void * i_buffer,
             rc = parseCaptureData(i_buffer, i_buflen, i_parser, i_ver);
             break;
 
-        case ErrlAVPData_1:
-            rc = parseAVPData(i_buffer, i_buflen, i_parser);
-            break;
-
-        case ErrlAVPData_2:
-            rc = parseHdatAVPData(i_buffer, i_buflen, i_parser);
-            break;
-
         case ErrlMruData_1:
             rc = parseMemMru( i_buffer, i_buflen, i_parser );
             break;
diff --git a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
index 7ceb7947e..032698777 100644
--- a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
+++ b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2003,2013              */
+/* COPYRIGHT International Business Machines Corp. 2003,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -68,8 +68,6 @@ enum ErrlSubsect
     ErrlSectPFA5_2   = 52,
     ErrlCapData_1    = 1,
     ErrlCapData_2    = 2,
-    ErrlAVPData_1    = 41,
-    ErrlAVPData_2    = 42,
     ErrlMruData_1    = 61, // This will only be used in non-attenion code when
                            // we want to add MRU.
     ErrlString       = 10,