diff options
| author | William A. Kennington III <wak@google.com> | 2018-05-08 16:21:49 -0700 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-05-19 18:16:32 -0400 |
| commit | 3c2fdb8f668c9b192c59656f88b37312e1a335be (patch) | |
| tree | e43bed64b1b87371d943665102a0571f0c96a4d0 | |
| parent | 9b9f654f0f6d3c73cbd58c5ee371b7ca5601284c (diff) | |
| download | talos-hostboot-3c2fdb8f668c9b192c59656f88b37312e1a335be.tar.gz talos-hostboot-3c2fdb8f668c9b192c59656f88b37312e1a335be.zip | |
istep21: Keep the watchdog running into the host payload
Skiboot has supported and enabled the IPMI watchdog for some time now.
We can now assume that it is safe keep the watchdog running when
transitioning to the skiboot payload as it will handle it during
startup.
Resolves #137
Signed-off-by: William A. Kennington III <wak@google.com>
Change-Id: I2308c2b69da1f971a2356caa3cbd318342c2e89f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58548
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/usr/isteps/istep21/call_host_start_payload.C | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/src/usr/isteps/istep21/call_host_start_payload.C b/src/usr/isteps/istep21/call_host_start_payload.C index 2ffe8ebce..97653ab71 100644 --- a/src/usr/isteps/istep21/call_host_start_payload.C +++ b/src/usr/isteps/istep21/call_host_start_payload.C @@ -227,35 +227,10 @@ void* call_host_start_payload (void *io_pArgs) task_affinity_unpin(); #ifdef CONFIG_BMC_IPMI - - // TODO ISSUE 118082 - // ENABLE CODE BELOW ONCE OPAL COMPLETES ipmi WATCHDOG -#if 0 - //run the ipmi watchdog for a longer period to transition - // to opel - errlHndl_t err_ipmi = IPMIWATCHDOG::setWatchDogTimer( - IPMIWATCHDOG::DEFAULT_HB_OPAL_TRANSITION_COUNTDOWN); - - if(err_ipmi) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "init: ERROR: Set IPMI watchdog Failed"); - err_ipmi->collectTrace("ISTEPS_TRACE",256); - errlCommit(err_ipmi, ISTEP_COMP_ID ); - - } -#endif - - // TODO ISSUE 118082 - // REMOVE CODE BELOW ONCE OPAL COMPLETES IPMI WATCHDOG - // THE CODE BELOW STOPS THE IPMI TIMER FROM RUNNING - // TO PREVENT IT GETTING TRIGGERED DURING HB_OPAL TRANSITION - - // Call setWatchdogTimer without the default DON'T STOP - // flag to stop the watchdog timer + // Run the watchdog with a longer expiration during the transition + // into OPAL. errlHndl_t err_ipmi = IPMIWATCHDOG::setWatchDogTimer( - IPMIWATCHDOG::DEFAULT_HB_OPAL_TRANSITION_COUNTDOWN, - IPMIWATCHDOG::BIOS_FRB2); + IPMIWATCHDOG::DEFAULT_HB_OPAL_TRANSITION_COUNTDOWN); if(err_ipmi) { @@ -264,7 +239,6 @@ void* call_host_start_payload (void *io_pArgs) err_ipmi->collectTrace("ISTEPS_TRACE",256); errlCommit(err_ipmi, ISTEP_COMP_ID ); } - #endif // broadcast shutdown to other HB instances. |
