diff options
Diffstat (limited to 'src/usr/isteps/istep16')
4 files changed, 10 insertions, 7 deletions
diff --git a/src/usr/isteps/istep16/call_host_activate_master.C b/src/usr/isteps/istep16/call_host_activate_master.C index ecbf78325..63a882886 100644 --- a/src/usr/isteps/istep16/call_host_activate_master.C +++ b/src/usr/isteps/istep16/call_host_activate_master.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -204,7 +204,8 @@ void* call_host_activate_master (void *io_pArgs) TARGETING::get_huid(l_proc_target)); //In the future possibly move default "waitTime" value to SBEIO code - uint64_t waitTime = 1000000; // bump the wait time to 1 sec + uint64_t waitTime = 10500; // wait time 10.5 sec, anything larger than 10737 ms can cause + // overflow on SBE side of the tiemout calculations l_errl = SBEIO::startDeadmanLoop(waitTime); if ( l_errl ) diff --git a/src/usr/isteps/istep16/call_host_activate_slave_cores.C b/src/usr/isteps/istep16/call_host_activate_slave_cores.C index c5f941e8f..1abc215ed 100644 --- a/src/usr/isteps/istep16/call_host_activate_slave_cores.C +++ b/src/usr/isteps/istep16/call_host_activate_slave_cores.C @@ -293,7 +293,7 @@ void* call_host_activate_slave_cores (void *io_pArgs) // Callout and gard core that failed to wake up. l_errl->addHwCallout(*l_core, HWAS::SRCI_PRIORITY_HIGH, - HWAS::DECONFIG, + HWAS::DELAYED_DECONFIG, HWAS::GARD_Predictive); // Could be an interrupt issue diff --git a/src/usr/isteps/istep16/call_host_secure_rng.C b/src/usr/isteps/istep16/call_host_secure_rng.C index 9ca7e0f45..5df147559 100644 --- a/src/usr/isteps/istep16/call_host_secure_rng.C +++ b/src/usr/isteps/istep16/call_host_secure_rng.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -58,7 +58,6 @@ #include <devicefw/userif.H> #include <vpd/mvpdenums.H> -#include <config.h> #include <fapi2/plat_hwp_invoker.H> #include <p9_rng_init_phase2.H> diff --git a/src/usr/isteps/istep16/call_mss_scrub.C b/src/usr/isteps/istep16/call_mss_scrub.C index e7727a7ee..0d4db2acd 100644 --- a/src/usr/isteps/istep16/call_mss_scrub.C +++ b/src/usr/isteps/istep16/call_mss_scrub.C @@ -32,7 +32,8 @@ #include <diag/prdf/prdfMain.H> #include <plat_hwp_invoker.H> // for FAPI_INVOKE_HWP -#include <lib/fir/memdiags_fir.H> // for mss::unmask::after_background_scrub +#include <lib/shared/nimbus_defaults.H> // Needed before unmask.H +#include <lib/fir/unmask.H> // for mss::unmask::after_background_scrub using namespace ERRORLOG; using namespace TARGETING; @@ -54,6 +55,7 @@ void* call_mss_scrub (void *io_pArgs) do { + if ( Util::isSimicsRunning() ) { // There are performance issues and some functional deficiencies @@ -71,11 +73,12 @@ void* call_mss_scrub (void *io_pArgs) // Determine which target type runs the maintenance commands. TARGETING::MODEL masterProcModel = masterProc->getAttr<ATTR_MODEL>(); - TARGETING::TYPE maintTrgtType; + TARGETING::TYPE maintTrgtType = TYPE_MBA; switch ( masterProcModel ) { case MODEL_CUMULUS: maintTrgtType = TYPE_MBA; break; case MODEL_NIMBUS: maintTrgtType = TYPE_MCBIST; break; + case MODEL_AXONE: maintTrgtType = TYPE_OCMB_CHIP; break; default: TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, ISTEP_FUNC "Master PROC model %d not supported", |
