diff options
Diffstat (limited to 'src/usr/diag/prdf/common')
4 files changed, 13 insertions, 81 deletions
diff --git a/src/usr/diag/prdf/common/framework/service/xspprdService.h b/src/usr/diag/prdf/common/framework/service/xspprdService.h index cf2926ba9..b5d2e3e94 100755 --- a/src/usr/diag/prdf/common/framework/service/xspprdService.h +++ b/src/usr/diag/prdf/common/framework/service/xspprdService.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -93,20 +93,12 @@ class ServiceGeneratorClass * @brief Creates an SRC, PFA data, and error log from the SDC provided. * @param i_attnType Analysis attention type. * @param io_sdc Target SDC. - * @param o_initiateHwudump whether or not to initiate hwudump - * @param o_dumpTrgt The DUMP target - * @param o_dumpErrl The DUMP error handle - * @param o_dumpErrlActions DUMP error action flags * @return A non-NULL error log indicates a system termination is required. * Otherwise, PRD will commit the error log generated. * @pre The Time of Error must be set in the given SDC. */ virtual errlHndl_t GenerateSrcPfa( ATTENTION_TYPE i_attnType, - ServiceDataCollector & io_sdc, - bool & o_initiateHwudump, - TARGETING::TargetHandle_t & o_dumpTrgt, - errlHndl_t & o_dumpErrl, - uint32_t & o_dumpErrlActions ) = 0; + ServiceDataCollector & io_sdc ) = 0; /** * @brief Creates the initial error log for PRDF::main() analysis path. diff --git a/src/usr/diag/prdf/common/plat/prdfRasServices_common.C b/src/usr/diag/prdf/common/plat/prdfRasServices_common.C index 325250ad8..174fd7794 100755 --- a/src/usr/diag/prdf/common/plat/prdfRasServices_common.C +++ b/src/usr/diag/prdf/common/plat/prdfRasServices_common.C @@ -101,19 +101,10 @@ void ErrDataService::Initialize() //------------------------------------------------------------------------------ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, - ServiceDataCollector & io_sdc, - bool & o_initiateHwudump, - TargetHandle_t & o_dumpTrgt, - errlHndl_t & o_dumpErrl, - uint32_t & o_dumpErrlActions) + ServiceDataCollector & io_sdc ) { #define PRDF_FUNC "[ErrDataService::GenerateSrcPfa] " - o_initiateHwudump = false; - o_dumpTrgt = NULL; - o_dumpErrl = NULL; - o_dumpErrlActions = 0; - // First, check if an error log should be committed. Note that there should // always be an error log if there was a system or unit checkstop. if ( io_sdc.queryDontCommitErrl() && @@ -438,9 +429,9 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, //-------------------------------------------------------------------------- PfaData pfaData; - + TargetHandle_t dumpTrgt; initPfaData( io_sdc, i_attnType, deferDeconfig, errlAct, errlSev, - gardPolicy, pfaData, o_dumpTrgt ); + gardPolicy, pfaData, dumpTrgt ); //-------------------------------------------------------------------------- // Add each mru/callout to the error log. @@ -546,7 +537,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, // Check for Terminating the system for non mnfg conditions. //************************************************************** - ForceTerminate = checkForceTerm( io_sdc, o_dumpTrgt, pfaData ); + ForceTerminate = checkForceTerm( io_sdc, dumpTrgt, pfaData ); //************************************************************* // Check for Manufacturing Mode terminate here and then do @@ -664,22 +655,8 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, if ( MACHINE_CHECK != pfaData.priAttnType && !ForceTerminate && !pfaData.TERMINATE ) { - if ( true == o_initiateHwudump ) - { - // the dump log will be deleted later in PRDF::main - // after the hwudump is initiated there. - o_dumpErrl = iv_errl; - iv_errl = NULL; - o_dumpErrlActions = errlAct; - PRDF_TRAC( PRDF_FUNC "for target: 0x%08x, i_errl: 0x%08x, " - "i_errlActions: 0x%08x", getHuid(o_dumpTrgt), - ERRL_GETRC_SAFE(o_dumpErrl), o_dumpErrlActions ); - } - else - { - // Commit the error log. - commitErrLog( iv_errl, pfaData ); - } + // Commit the error log. + commitErrLog( iv_errl, pfaData ); } #ifndef __HOSTBOOT_MODULE @@ -979,15 +956,10 @@ void RasServices::setErrDataService( ErrDataService & i_eds ) //------------------------------------------------------------------------------ errlHndl_t RasServices::GenerateSrcPfa( ATTENTION_TYPE i_attnType, - ServiceDataCollector & io_sdc, - bool & o_initiateHwudump, - TargetHandle_t & o_dumpTrgt, - errlHndl_t & o_dumpErrl, - uint32_t & o_dumpErrlActions ) + ServiceDataCollector & io_sdc ) { - return iv_eds->GenerateSrcPfa( i_attnType, io_sdc, o_initiateHwudump, - o_dumpTrgt, o_dumpErrl, o_dumpErrlActions ); + return iv_eds->GenerateSrcPfa( i_attnType, io_sdc ); } //------------------------------------------------------------------------------ diff --git a/src/usr/diag/prdf/common/plat/prdfRasServices_common.H b/src/usr/diag/prdf/common/plat/prdfRasServices_common.H index 4bb44908e..189c3974e 100644 --- a/src/usr/diag/prdf/common/plat/prdfRasServices_common.H +++ b/src/usr/diag/prdf/common/plat/prdfRasServices_common.H @@ -70,20 +70,12 @@ class ErrDataService * @brief Creates an SRC, PFA data, and error log from the SDC provided. * @param i_attnType Analysis attention type. * @param io_sdc Target SDC. - * @param o_initiateHwudump whether or not to initiate hwudump - * @param o_dumpTrgt The DUMP target - * @param o_dumpErrl The DUMP error handle - * @param o_dumpErrlActions DUMP error action flags * @return A non-NULL error log indicates a system termination is required. * Otherwise, PRD will commit the error log generated. * @pre The Time of Error must be set in the given SDC. */ virtual errlHndl_t GenerateSrcPfa( ATTENTION_TYPE i_attnType, - ServiceDataCollector & io_sdc, - bool & o_initiateHwudump, - TARGETING::TargetHandle_t & o_dumpTrgt, - errlHndl_t & o_dumpErrl, - uint32_t & o_dumpErrlActions ); + ServiceDataCollector & io_sdc ); /** @brief Add the Service Data Collector Capture Data to the User Data of the Error Log. @@ -221,20 +213,12 @@ class RasServices : public ServiceGeneratorClass * @brief Creates an SRC, PFA data, and error log from the SDC provided. * @param i_attnType Analysis attention type. * @param io_sdc Target SDC. - * @param o_initiateHwudump whether or not to initiate hwudump - * @param o_dumpTrgt The DUMP target - * @param o_dumpErrl The DUMP error handle - * @param o_dumpErrlActions DUMP error action flags * @return A non-NULL error log indicates a system termination is required. * Otherwise, PRD will commit the error log generated. * @pre The Time of Error must be set in the given SDC. */ virtual errlHndl_t GenerateSrcPfa( ATTENTION_TYPE i_attnType, - ServiceDataCollector & io_sdc, - bool & o_initiateHwudump, - TARGETING::TargetHandle_t & o_dumpTrgt, - errlHndl_t & o_dumpErrl, - uint32_t & o_dumpErrlActions ); + ServiceDataCollector & io_sdc ); /** * @brief Creates the initial error log for PRDF::main() analysis path. diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C index e3224105e..32c0c1329 100755 --- a/src/usr/diag/prdf/common/prdfMain_common.C +++ b/src/usr/diag/prdf/common/prdfMain_common.C @@ -213,10 +213,6 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType, // These have to be outside of system scope lock errlHndl_t retErrl = NULL; - bool initiateHwudump = false; - TARGETING::TargetHandle_t dumpTrgt = NULL; - errlHndl_t dumpErrl = NULL; - uint32_t dumpErrlActions = 0; { // system scope lock starts ------------------------------------------ @@ -372,11 +368,7 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType, } g_prd_errlHndl = serviceGenerator.GenerateSrcPfa( i_attentionType, - serviceData, - initiateHwudump, - dumpTrgt, - dumpErrl, - dumpErrlActions); + serviceData ); // Sleep for 20msec to let attention lines settle if we are at threshold. if ( (g_prd_errlHndl == NULL) && serviceData.IsAtThreshold() ) @@ -388,14 +380,6 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType, } // system scope lock ends ------------------------------------------ - - if ( true == initiateHwudump ) - { -/* TODO RTC 144705 - PlatServices::initiateUnitDump( dumpTrgt, dumpErrl, dumpErrlActions ); -*/ - } - PRDF_EXIT( "PRDF::main()" ); return retErrl; |
