From b9cafc9a11646de0a5ef173fac9ddfb7e1a89932 Mon Sep 17 00:00:00 2001 From: Prachi Gupta Date: Thu, 17 Mar 2016 08:24:04 -0500 Subject: Changing PIR bits to use the new pirformat to detect a functional core Change-Id: I9d04068353bc3f49dfc451d89f122571061cf8a5 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22178 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Dean Sanner Reviewed-by: Christian R. Geddes Reviewed-by: William G. Hoffa --- src/usr/targeting/namedtarget.C | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/usr/targeting/namedtarget.C b/src/usr/targeting/namedtarget.C index 6b247f4d8..2297a617c 100644 --- a/src/usr/targeting/namedtarget.C +++ b/src/usr/targeting/namedtarget.C @@ -43,6 +43,8 @@ #include #include +#include + #include // task_getcpuid() @@ -57,7 +59,7 @@ const TARGETING::Target * getMasterCore( ) { task_affinity_pin(); task_affinity_migrate_to_master(); - uint64_t l_masterCoreID = task_getcpuid() & ~7; + uint64_t l_masterCoreID = PIR_t::coreFromPir(task_getcpuid()); task_affinity_unpin(); const TARGETING::Target * l_masterCore = NULL; @@ -75,7 +77,7 @@ const TARGETING::Target * getMasterCore( ) TYPE_CORE, true ); - TRACDCOMP( g_trac_targeting, + TRACFCOMP( g_trac_targeting, "getMasterCore: found %d cores on master proc, l_mastreCoreID:0x%X", l_cores.size(),l_masterCoreID ); @@ -89,9 +91,7 @@ const TARGETING::Target * getMasterCore( ) CHIP_UNIT_ATTR l_coreId = l_core->getAttr(); - uint64_t pir = l_coreId << 3; - pir |= l_chipId << 7; - pir |= l_logicalGroupId << 10; + uint64_t pir = PIR_t::createCoreId(l_logicalGroupId, l_chipId, l_coreId); if (pir == l_masterCoreID){ TRACFCOMP( g_trac_targeting, -- cgit v1.2.3