diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2017-01-23 13:18:50 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-01 09:12:53 -0500 |
| commit | 68c831b81bf95b53455a82d8e9983dba206cbd68 (patch) | |
| tree | dae97f298c85fd31731c19b37d5e7874c6a2a743 | |
| parent | 077cd8727751faf82dac22c17c2e8207ecf84597 (diff) | |
| download | talos-hostboot-68c831b81bf95b53455a82d8e9983dba206cbd68.tar.gz talos-hostboot-68c831b81bf95b53455a82d8e9983dba206cbd68.zip | |
Fix getSbeBootSeeprom in sbe_update.C
Change so that an error log and an unknown side value are returned
if the boot side cannot be determined by the function.
Change-Id: I7be3abfda9aeec46070270c5785f837680b25a70
RTC:166492
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35267
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 13c225c34..c79c036b4 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1727,7 +1727,7 @@ namespace SBE errlHndl_t err = NULL; uint64_t scomData = 0x0; - o_bootSide = SBE_SEEPROM0; + o_bootSide = SBE_SEEPROM_INVALID; do{ @@ -1769,10 +1769,15 @@ namespace SBE ERRL_GETPLID_SAFE(err)); break; } + if(scomData & SBE_BOOT_SELECT_MASK) { o_bootSide = SBE_SEEPROM1; } + else + { + o_bootSide = SBE_SEEPROM0; + } }while(0); |
