diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2017-08-16 08:43:06 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-18 15:57:55 -0400 |
| commit | 17e449950bb0444a702345a934003e5c17b95e6b (patch) | |
| tree | bf5582acac775a156416c221977934affe2740d4 /src/usr/sbe | |
| parent | a9512e1702f68f4f3b13fe13663094eedd24c22a (diff) | |
| download | talos-hostboot-17e449950bb0444a702345a934003e5c17b95e6b.tar.gz talos-hostboot-17e449950bb0444a702345a934003e5c17b95e6b.zip | |
Keep masterVersionCompare() call out of OpenPOWER SBE Update re-IPL path
The call to sbeDoReboot() returns to SBE Update code for the BMC_IPMI
config and then calls masterVersionCompare(). The masterVersionCompare()
call should not be made if a shutdown has been requested, so should be
put in an else leg for the if statement that determines if sbeDoReboot()
is called.
Change-Id: Ib1b1d7a08b7886e9954edd05284a666e23b37796
RTC: 176755
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44676
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: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/sbe')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 933235877..57997ab3d 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -491,20 +491,22 @@ namespace SBE break; } } - - /************************************************************/ - /* Deconfigure any Processors that have a Version different */ - /* from the Master Processor's Version */ - /************************************************************/ - err = masterVersionCompare(sbeStates_vector); - - if ( err ) + else { - // Something failed on the check - TRACFCOMP( g_trac_sbe, - INFO_MRK"updateProcessorSbeSeeproms(): Call to " - "masterVersionCompare() failed rc=0x%.4X", - err->reasonCode()); + /************************************************************/ + /* Deconfigure any Processors that have a Version different */ + /* from the Master Processor's Version */ + /************************************************************/ + err = masterVersionCompare(sbeStates_vector); + + if ( err ) + { + // Something failed on the check + TRACFCOMP( g_trac_sbe, + INFO_MRK"updateProcessorSbeSeeproms(): Call to " + "masterVersionCompare() failed rc=0x%.4X", + err->reasonCode()); + } } }while(0); |
