From 885c60521f8626b855988e7687bc6e437c2355f7 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Mon, 30 Jan 2017 16:43:30 -0600 Subject: [PATCH] Increase timeout for slave SBE in Simics Increasing the timeout for the slave SBE to be ready by 10x for Simics. Change-Id: I9d10372d060f6fa83063330e22110bad88a8272a CQ: SW378197 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35615 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Reviewed-by: Martin Gloff Reviewed-by: Sachin Gupta Reviewed-by: Daniel M. Crowell --- .../call_proc_check_slave_sbe_seeprom_complete.C | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/usr/isteps/istep08/call_proc_check_slave_sbe_seeprom_complete.C b/src/usr/isteps/istep08/call_proc_check_slave_sbe_seeprom_complete.C index 3898747fd6f..ad29589adda 100644 --- a/src/usr/isteps/istep08/call_proc_check_slave_sbe_seeprom_complete.C +++ b/src/usr/isteps/istep08/call_proc_check_slave_sbe_seeprom_complete.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -45,6 +45,7 @@ #include #include #include +#include // targeting support #include @@ -118,9 +119,15 @@ void* call_proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) // Each slave sbe gets 60s to respond with the fact that it's // booted and at runtime (stable state) - const uint64_t SBE_TIMEOUT_NSEC = 60*NS_PER_SEC; //60sec + uint64_t SBE_TIMEOUT_NSEC = 60*NS_PER_SEC; //60sec + // Bump this up really high for Simics, things are slow there + if( Util::isSimicsRunning() ) + { + SBE_TIMEOUT_NSEC *= 10; + } const uint64_t SBE_NUM_LOOPS = 100; const uint64_t SBE_WAIT_SLEEP = (SBE_TIMEOUT_NSEC/SBE_NUM_LOOPS); + sbeMsgReg_t l_sbeReg; TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,