From 2a806047e9b0ac157da777b619bdd9a79313cea2 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Mon, 6 Jan 2020 12:49:55 -0600 Subject: Remove workaround added to increment MCS timeout for gemini's We are no longer using or supporting gemini cards so we can remove this workaround. Change-Id: I76303832cff93f8a8b5adec1d204ccb5ca827bc2 RTC: 248023 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89267 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Matt Derksen Reviewed-by: Yun Pan Reviewed-by: Daniel M Crowell --- .../isteps/istep10/call_proc_chiplet_scominit.C | 52 +--------------------- 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/src/usr/isteps/istep10/call_proc_chiplet_scominit.C b/src/usr/isteps/istep10/call_proc_chiplet_scominit.C index 91c98f2c7..c0b9f2619 100644 --- a/src/usr/isteps/istep10/call_proc_chiplet_scominit.C +++ b/src/usr/isteps/istep10/call_proc_chiplet_scominit.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2019 */ +/* Contributors Listed Below - COPYRIGHT 2015,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -110,56 +110,6 @@ void* call_proc_chiplet_scominit( void *io_pArgs ) } } - #ifdef CONFIG_AXONE_BRING_UP - TARGETING::TargetHandleList l_cpuTargetList; - getAllChips(l_cpuTargetList, TYPE_PROC); - // Apply workaround to remove MC hang timeouts because they - // are forcing false negatives to all proc functional chips - for (const auto & l_procChip: l_cpuTargetList) - { - - TARGETING::TargetHandleList l_miTargetList; - TARGETING::getChildAffinityTargets( l_miTargetList, l_procChip, CLASS_UNIT, TYPE_MI ); - - const uint64_t MCS_TIMEOUT_CONTROL_REG = 0x501081B; - - for(const auto & l_mi : l_miTargetList) - { - uint64_t l_mcsTimeoutControlValue; - size_t l_regSize = sizeof(l_mcsTimeoutControlValue); - l_err = deviceRead(l_mi, &l_mcsTimeoutControlValue, l_regSize, - DEVICE_SCOM_ADDRESS(MCS_TIMEOUT_CONTROL_REG)); - - // Clear bit 33 and re-write the scom register with new value. - // When this bit is cleared it allows extra time for gemini card - // before a channel hang is declared - l_mcsTimeoutControlValue &= ~(1UL << 30); - - l_err = deviceWrite(l_mi, &l_mcsTimeoutControlValue, l_regSize, - DEVICE_SCOM_ADDRESS(MCS_TIMEOUT_CONTROL_REG)); - - if(l_err) - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR : call_proc_chiplet_scominit: " - "deviceWrite on DEVICE_SCOM_ADDRESS MCS_TIMEOUT_CONTROL_REG returned PLID=0x%x", - l_err->plid() ); - // error will be handled below - break; - } - } - - if(l_err) - { - // Create IStep error log and cross reference error that occurred - l_stepError.addErrorDetails(l_err); - // Commit error - errlCommit( l_err, HWPF_COMP_ID ); - break; - } - } - #endif - }while(0); TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_proc_chiplet_scominit exit" ); -- cgit v1.2.1