From d0620adfa0cc6f50e5a7488cd39584b9455ea55f Mon Sep 17 00:00:00 2001 From: crgeddes Date: Mon, 25 Jul 2016 07:43:17 -0500 Subject: Remove opMode check from scom code This check was previously moved to the fapi2 code RTC: 144507 Change-Id: Ied1edc0c7e1243c68ad28c1e6bfc305bca574dfa Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27427 Tested-by: Jenkins Server Reviewed-by: Thi N. Tran Reviewed-by: Andrew J. Geissler Reviewed-by: Daniel M. Crowell --- src/usr/isteps/istep06/call_host_voltage_config.C | 4 ++++ src/usr/scom/scom.C | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/usr') diff --git a/src/usr/isteps/istep06/call_host_voltage_config.C b/src/usr/isteps/istep06/call_host_voltage_config.C index 4b787fcd5..82f44884f 100644 --- a/src/usr/isteps/istep06/call_host_voltage_config.C +++ b/src/usr/isteps/istep06/call_host_voltage_config.C @@ -52,7 +52,10 @@ void* call_host_voltage_config( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_voltage_config entry" ); +// TODO RTC:157341 RE-enabled this after form 3 #v gets merged + ISTEP_ERROR::IStepError l_stepError; +#if 0 errlHndl_t l_err = nullptr; Target * l_sys = nullptr; TargetHandleList l_procList; @@ -287,6 +290,7 @@ void* call_host_voltage_config( void *io_pArgs ) errlCommit( l_err, ISTEP_COMP_ID ); } +#endif TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_voltage_config exit" ); diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C index 231440dc8..5aa88976b 100644 --- a/src/usr/scom/scom.C +++ b/src/usr/scom/scom.C @@ -263,12 +263,6 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType, #endif // __HOSTBOOT_RUNTIME } while(0); - if(i_opMode & fapi2::IGNORE_HW_ERROR) - { - TRACFCOMP(g_trac_scom, "IGNORE_HW_ERROR opmode detected for scom, any errors are being deleted"); - delete l_err; - } - return l_err; } -- cgit v1.2.1