Skip to content

Commit

Permalink
Remove workaround added to increment MCS timeout for gemini's
Browse files Browse the repository at this point in the history
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 <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Yun Pan <yun.pan@ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
crgeddes authored and dcrowell77 committed Jan 17, 2020
1 parent 634b785 commit 2a80604
Showing 1 changed file with 1 addition and 51 deletions.
52 changes: 1 addition & 51 deletions src/usr/isteps/istep10/call_proc_chiplet_scominit.C
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2019 */
/* Contributors Listed Below - COPYRIGHT 2015,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -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" );
Expand Down

0 comments on commit 2a80604

Please sign in to comment.