From 44524ea06f0db5d637bf04c5e233089bd4d6023d Mon Sep 17 00:00:00 2001 From: Mike Baiocchi Date: Mon, 27 Jan 2014 16:52:09 -0600 Subject: 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 Reviewed-by: A. Patrick Williams III --- src/usr/sbe/sbe_update.C | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/usr/sbe/sbe_update.C') 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 #include #include +#include #include #include #include @@ -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; } -- cgit v1.2.1