summaryrefslogtreecommitdiffstats
path: root/src/usr/targeting/namedtarget.C
diff options
context:
space:
mode:
authorDean Sanner <dsanner@us.ibm.com>2018-01-23 12:19:34 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-01-25 17:26:32 -0500
commit4606e773441d4aca1e5cd0bde719d169c9050922 (patch)
tree68ed603f02364376f4b2bbd866e6350164b77803 /src/usr/targeting/namedtarget.C
parent2935800fa74d6c18c77b322b45930d250ab47be7 (diff)
downloadtalos-hostboot-4606e773441d4aca1e5cd0bde719d169c9050922.tar.gz
talos-hostboot-4606e773441d4aca1e5cd0bde719d169c9050922.zip
Factor in fabric group on multinode systems
Change-Id: I55143c18cf5ff518156df7586a520fc995dc5872 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52453 Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/namedtarget.C')
-rw-r--r--src/usr/targeting/namedtarget.C17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/usr/targeting/namedtarget.C b/src/usr/targeting/namedtarget.C
index 2297a617c..ad4fb57e3 100644
--- a/src/usr/targeting/namedtarget.C
+++ b/src/usr/targeting/namedtarget.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2016 */
+/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -58,8 +58,8 @@ namespace TARGETING
const TARGETING::Target * getMasterCore( )
{
task_affinity_pin();
- task_affinity_migrate_to_master();
- uint64_t l_masterCoreID = PIR_t::coreFromPir(task_getcpuid());
+ task_affinity_migrate_to_master(); //This gets us master core, thread 0
+ PIR_t l_masterPIR = PIR_t(task_getcpuid());
task_affinity_unpin();
const TARGETING::Target * l_masterCore = NULL;
@@ -78,8 +78,9 @@ const TARGETING::Target * getMasterCore( )
true );
TRACFCOMP( g_trac_targeting,
- "getMasterCore: found %d cores on master proc, l_mastreCoreID:0x%X",
- l_cores.size(),l_masterCoreID );
+ "getMasterCore: found %d cores on master proc,"
+ "l_masterCore PIR:0x%X",
+ l_cores.size(),l_masterPIR.word );
for (TARGETING::TargetHandleList::const_iterator
coreIter = l_cores.begin();
@@ -91,13 +92,13 @@ const TARGETING::Target * getMasterCore( )
CHIP_UNIT_ATTR l_coreId =
l_core->getAttr<TARGETING::ATTR_CHIP_UNIT>();
- uint64_t pir = PIR_t::createCoreId(l_logicalGroupId, l_chipId, l_coreId);
+ PIR_t l_corePIR = PIR_t(l_logicalGroupId, l_chipId, l_coreId);
- if (pir == l_masterCoreID){
+ if (l_corePIR == l_masterPIR){
TRACFCOMP( g_trac_targeting,
"found master core: 0x%x, PIR=0x%x :",
l_coreId,
- pir );
+ l_corePIR.word );
EntityPath l_path;
l_path = l_core->getAttr<ATTR_PHYS_PATH>();
l_path.dump();
OpenPOWER on IntegriCloud