summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/usr/isteps/istep06/call_host_voltage_config.C4
-rw-r--r--src/usr/scom/scom.C6
2 files changed, 4 insertions, 6 deletions
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;
}
OpenPOWER on IntegriCloud