diff options
| author | Mike Baiocchi <baiocchi@us.ibm.com> | 2014-07-14 21:40:52 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-07-15 13:03:36 -0500 |
| commit | b51cfed2de00e34236f2364bb89042900346fdc0 (patch) | |
| tree | 51132438216d152fefbb8767c8a5917a6482ab78 /src/usr/sbe/sbe_update.C | |
| parent | 8a1202db6144d206565cdcc1d0525f90487f5c98 (diff) | |
| download | blackbird-hostboot-b51cfed2de00e34236f2364bb89042900346fdc0.tar.gz blackbird-hostboot-b51cfed2de00e34236f2364bb89042900346fdc0.zip | |
SBE Update re-order of operations
When a SBE SEEPROM needs to be updated, the SBE SEEPROM now will be
updated first before any request is made to update the MVPD keyword
shared with HWSV.
Change-Id: I88de77e3ab006ad5edc66780d7b39db0f8d2c800
CQ: SW269286
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12223
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/sbe/sbe_update.C')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 885c53042..1d78e8287 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -2615,13 +2615,27 @@ namespace SBE do{ /**************************************************************/ - /* Update Actions: */ - /* 1) Update MVPD, if necessary */ - /* 2) Update SEEPROM, if necessary */ + /* Update SEEPROM, if necessary */ /**************************************************************/ + if (l_actions & UPDATE_SBE) + { +#ifdef CONFIG_SBE_UPDATE_SIMULTANEOUS + io_sbeState.seeprom_side_to_update = EEPROM::SBE_PRIMARY; +#endif + err = updateSeepromSide(io_sbeState); + if(err) + { + TRACFCOMP( g_trac_sbe, ERR_MRK"performUpdateActions() - " + "updateProcessorSbeSeeproms() failed. " + "HUID=0x%.8X.", + TARGETING::get_huid(io_sbeState.target)); + break; + } + l_actions |= SBE_UPDATE_COMPLETE; + } /**************************************************************/ - /* 1) Update MVPD, if necessary */ + /* Update MVPD, if necessary */ /**************************************************************/ if (l_actions & UPDATE_MVPD) { @@ -2642,28 +2656,7 @@ namespace SBE } /**************************************************************/ - /* 2) Update SEEPROM, if necessary */ - /**************************************************************/ - if (l_actions & UPDATE_SBE) - { -#ifdef CONFIG_SBE_UPDATE_SIMULTANEOUS - io_sbeState.seeprom_side_to_update = EEPROM::SBE_PRIMARY; -#endif - err = updateSeepromSide(io_sbeState); - if(err) - { - TRACFCOMP( g_trac_sbe, ERR_MRK"performUpdateActions() - " - "updateProcessorSbeSeeproms() failed. " - "HUID=0x%.8X.", - TARGETING::get_huid(io_sbeState.target)); - break; - } - l_actions |= SBE_UPDATE_COMPLETE; - } - - - /**************************************************************/ - /* 3) Create Info Error Log of successful operation */ + /* Create Info Error Log of successful operation */ /**************************************************************/ #ifndef CONFIG_SBE_UPDATE_SIMULTANEOUS TRACFCOMP( g_trac_sbe,INFO_MRK"performUpdateActions(): Successful " |
