diff options
author | Richard J. Knight <rjknight@us.ibm.com> | 2016-08-06 13:37:39 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-07 09:09:38 -0500 |
commit | 6e0b34872da165a1c30609d3e9d6cfbd70418507 (patch) | |
tree | 1da665e0024724133d96d665505d6dcc66026bc3 /src/usr/sbe | |
parent | f986133a26546254d64e65e30b00ae7f0d561ec9 (diff) | |
download | talos-hostboot-6e0b34872da165a1c30609d3e9d6cfbd70418507.tar.gz talos-hostboot-6e0b34872da165a1c30609d3e9d6cfbd70418507.zip |
OP820:OPRASGS:Garrison:Hostboot IPL fails to halt during shutdown reconfig
-Added the ability to notify the istep dispacher discontinue
executing isteps
-Added call to stopIpl() api in sbe update path
-Added internal graceful reboot request for SBE update and
reconfigure re-ipl usage
Change-Id: I5682992802b0f373df91378a38187d032bb3a0b4
CQ:SW361886
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27959
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@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>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28574
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Diffstat (limited to 'src/usr/sbe')
-rw-r--r-- | src/usr/sbe/sbe_resolve_sides.C | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/usr/sbe/sbe_resolve_sides.C b/src/usr/sbe/sbe_resolve_sides.C index 44945bd61..e39fda9f4 100644 --- a/src/usr/sbe/sbe_resolve_sides.C +++ b/src/usr/sbe/sbe_resolve_sides.C @@ -41,6 +41,7 @@ #include <sys/misc.h> #include <hwas/common/deconfigGard.H> #include <initservice/initserviceif.H> +#include <initservice/istepdispatcherif.H> #include <console/consoleif.H> #include <config.h> #include <ipmi/ipmiif.H> @@ -291,8 +292,7 @@ errlHndl_t resolveProcessorSbeSeeproms() #ifdef CONFIG_CONSOLE CONSOLE::displayf(SBE_COMP_NAME, "System Rebooting To " - "Perform SBE Update\n"); - + "Perform SBE Update"); CONSOLE::flush(); #endif @@ -1163,25 +1163,12 @@ errlHndl_t sbePreRebootIpmiCalls( void ) TRACFCOMP( g_trac_sbe,"sbePreRebootIpmiCalls: " "requesting chassis power cycle"); - // Request BMC to do power cycle that sends shutdown - // and reset the host - err = IPMI::chassisControl(IPMI::CHASSIS_POWER_CYCLE); - if(err) - { - TRACFCOMP( g_trac_sbe, - ERR_MRK"sbePreRebootIpmiCalls: " - "FAIL executing chassisiControl" - "Error Log rc=0x%.4X eid=0x%.8X " - "plid=0x%.8X ", - err->reasonCode(), - err->eid(), - err->plid()); - - err->collectTrace(SBE_COMP_NAME); - } + // tell the istepdispacher to stop + INITSERVICE::stopIpl(); + // initate a graceful power cycle + INITSERVICE::requestReboot(); - }while(0); TRACFCOMP( g_trac_sbe, EXIT_MRK"sbePreRebootIpmiCalls"); |