Skip to content

Commit

Permalink
istepdispatcher: Reset the watchog to enable it
Browse files Browse the repository at this point in the history
Performing a watchdog set command alone is not enough to re-enable the
watchdog. In any instance where we want the watchdog to be running we
need to issue a reset immediately after the set action to guarantee it
was started.

Resolves #137

Signed-off-by: William A. Kennington III <wak@google.com>
Change-Id: I16b617cf26c9e6af8151ac415689a8c6956c6e11
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58547
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
wak-google authored and dcrowell77 committed May 19, 2018
1 parent 2f1a0ed commit 9b9f654
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/usr/initservice/istepdispatcher/istepdispatcher.C
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,17 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl)
errlCommit(err_ipmi, INITSVC_COMP_ID );

}

// Start the watchdog
err_ipmi = IPMIWATCHDOG::resetWatchDogTimer();
if(err_ipmi)
{
TRACFCOMP(g_trac_initsvc,
"init: ERROR: Starting IPMI watchdog Failed");
err_ipmi->collectTrace("INITSVC", 1024);
errlCommit(err_ipmi, INITSVC_COMP_ID );

}
#endif

// Non-IStep mode (run all isteps automatically)
Expand Down Expand Up @@ -2946,6 +2957,17 @@ void IStepDispatcher::istepPauseSet(uint8_t i_step, uint8_t i_substep)
errlCommit(err_ipmi, INITSVC_COMP_ID );

}

// Start the watchdog timer
err_ipmi = IPMIWATCHDOG::resetWatchDogTimer();
if(err_ipmi)
{
TRACFCOMP(g_trac_initsvc,
"init: ERROR: Start IPMI watchdog Failed");
err_ipmi->collectTrace("INITSVC", 1024);
errlCommit(err_ipmi, INITSVC_COMP_ID );

}
#endif

}
Expand Down

0 comments on commit 9b9f654

Please sign in to comment.