diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-02-13 11:15:32 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-27 12:14:35 -0500 |
| commit | 9b5f6cece30b2ce9b36768bb4b70fb128ba7bfa6 (patch) | |
| tree | 0fa7e9c64138849d80e2d6da95377aa0b4aae751 /src/usr/initservice | |
| parent | 07ffd49282c2f41ba113e5e644494b877c6e7903 (diff) | |
| download | talos-hostboot-9b5f6cece30b2ce9b36768bb4b70fb128ba7bfa6.tar.gz talos-hostboot-9b5f6cece30b2ce9b36768bb4b70fb128ba7bfa6.zip | |
Remove deprecated SBE side resolution
The HB Bootloader now owns the responsibility of selecting the
appropriate side of PNOR to use when loading the HBB image. There
is no longer a HBB pointer in the SBE image itself. This commit
removes the code that dealt with that support. There is also
some cleaning up of a few other related functions.
Change-Id: I35bfccb3590f81867d8222333cb4be66718828fa
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36358
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/initservice')
| -rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index 76c0762b1..7ecccaa2f 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2016 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -584,9 +584,6 @@ errlHndl_t IStepDispatcher::executeAllISteps() "not increment reboot count."); } - // discontinue isteps - iv_stopIpl = true; - // Request BMC to do power cycle that sends shutdown // and reset the host requestReboot(); @@ -1377,6 +1374,10 @@ void IStepDispatcher::handleShutdownMsg(msg_t * & io_pMsg) #ifdef CONFIG_BMC_IPMI void IStepDispatcher::requestReboot() { + // always stop dispatching isteps before calling for the reboot + setStopIpl(); + + // send a reboot message to the BMC IPMI::initiateReboot(); } #endif |
