diff options
| author | Mike Baiocchi <baiocchi@us.ibm.com> | 2014-01-27 16:52:09 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-06 17:28:34 -0600 |
| commit | 44524ea06f0db5d637bf04c5e233089bd4d6023d (patch) | |
| tree | 10977cfbd16408c1e4bf59943bda072baf98e3be /src/usr/sbe/sbe_update.C | |
| parent | 75d7a66ac02cc0364e54e048d77f5d010b5552c1 (diff) | |
| download | blackbird-hostboot-44524ea06f0db5d637bf04c5e233089bd4d6023d.tar.gz blackbird-hostboot-44524ea06f0db5d637bf04c5e233089bd4d6023d.zip | |
SBE Update code verifies simics is running for sim check
SBE Update code must verify it is actually running on simics when
looking for the special simics value in the SBE image.
Change-Id: Idce720c777ee727d4e71762db533004e9c5da9e0
RTC: 94883
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8378
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@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 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 3cde06023..c290fb0e5 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -33,6 +33,7 @@ #include <targeting/common/targetservice.H> #include <util/align.H> #include <util/crc32.H> +#include <util/misc.H> #include <errno.h> #include <pnor/pnorif.H> #include <pnor/ecc.H> @@ -1803,9 +1804,10 @@ namespace SBE } // Check if in simics - // @todo RTC 94883 - Update this check with a magic instruction - if ( io_sbeState.seeprom_0_ver.struct_version == - SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + if ( ( io_sbeState.seeprom_0_ver.struct_version == + SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + && ( Util::isSimicsRunning() ) + ) { isSimics_check = true; } @@ -1851,9 +1853,10 @@ namespace SBE } // Check if in simics - // @todo RTC 94883 - Update this check with a magic instruction - if ( io_sbeState.seeprom_1_ver.struct_version == - SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + if ( ( io_sbeState.seeprom_1_ver.struct_version == + SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + && ( Util::isSimicsRunning() ) + ) { isSimics_check = true; } |
