Skip to content

Commit e15b65e

Browse files
crgeddesdcrowell77
authored andcommitted
Fix bugs in core checkstop escalation manipulation during HB
There was a bug where in fused mode we are not also setting the 2nd half of the fused core to have the appropriate scom values in the fir action registers. Also we were not re-applying the desired values back to the core fir action registers at the end of hostboot because of a simple bug. Change-Id: I32ae9c7839e27392cfdf0401d008a12941804beb CQ: SW432725 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60439 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> Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent d50263f commit e15b65e

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

src/usr/isteps/istep16/call_host_activate_master.C

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,25 @@ void* call_host_activate_master (void *io_pArgs)
371371
if( l_errl )
372372
{
373373
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
374-
"core_checkstop_helper_hwp ERROR: returning.");
374+
"core_checkstop_helper_hwp on master ERROR: returning.");
375375
break;
376376
}
377377

378+
// We want to make sure the fused pair is also setting the
379+
// core firs to handle checkstops at system level and not
380+
// at the local level
381+
if(l_fusedCore != NULL)
382+
{
383+
l_errl = HBPM::core_checkstop_helper_hwp(l_fusedCore, true);
384+
385+
if ( l_errl )
386+
{
387+
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
388+
"core_checkstop_helper_hwp on fused pair ERROR: returning.");
389+
break;
390+
}
391+
}
392+
378393
// Take new checkstop values and insert them into the homer image
379394
l_errl = HBPM::core_checkstop_helper_homer();
380395

src/usr/isteps/istep21/call_host_start_payload.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ void* call_host_start_payload (void *io_pArgs)
405405
if(! is_sapphire_load() )
406406
{
407407
TARGETING::TargetHandleList l_coreTargetList;
408-
getAllChips(l_coreTargetList, TYPE_CORE);
408+
getAllChiplets(l_coreTargetList, TYPE_CORE);
409409

410410
for( auto l_core_target : l_coreTargetList)
411411
{

0 commit comments

Comments
 (0)