diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2016-09-15 09:25:49 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-10-04 13:49:14 -0400 |
| commit | 6ac254a49dc82a8c3007adb0d47c9feea75672b0 (patch) | |
| tree | d49ca0e868eabfa427009c8f1326937976f985a5 /src | |
| parent | f57713b874f30ac824d54dad63230e24e336bd78 (diff) | |
| download | talos-hostboot-6ac254a49dc82a8c3007adb0d47c9feea75672b0.tar.gz talos-hostboot-6ac254a49dc82a8c3007adb0d47c9feea75672b0.zip | |
Correctly check for master core during slave wakeup
Change-Id: Idc2dec5027c6fc39c19f7ab7c9b92f8e4e6ff5f1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29785
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/isteps/istep16/call_host_activate_slave_cores.C | 7 |
1 files changed, 5 insertions, 2 deletions
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 1d521213e..25a53c323 100644 --- a/src/usr/isteps/istep16/call_host_activate_slave_cores.C +++ b/src/usr/isteps/istep16/call_host_activate_slave_cores.C @@ -65,7 +65,9 @@ void* call_host_activate_slave_cores (void *io_pArgs) // @@@@@ CUSTOM BLOCK: @@@@@ - uint64_t l_masterCoreID = PIR_t::coreFromPir(task_getcpuid()); + //track master group/chip/core (no threads) + uint64_t l_masterPIR_wo_thread = PIR_t(task_getcpuid()).word & + ~PIR_t::THREAD_MASK; TargetHandleList l_cores; getAllChiplets(l_cores, TYPE_CORE); @@ -102,7 +104,8 @@ void* call_host_activate_slave_cores (void *io_pArgs) TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "pir for this core is: %lx", pir); - if (pir != l_masterCoreID) + //If not the master core, skip + if ((pir & ~PIR_t::THREAD_MASK) != l_masterPIR_wo_thread) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_activate_slave_cores: Waking %x.", |
