Support PERV attributes also for EQ and CORE targets

-- CHIP_UNIT_POS==chiplet number for all pervasive chiplets
-- Split erstwhile PERV targets into two NEST groups + MCS targets

Change-Id: I034bc9f09e1afcd8c204f00a2b8ae5489d81a47a
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22344
Tested-by: Jenkins Server
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>

2 files changed, 21 insertions, 15 deletions

diff --git a/hwpf/include/plat/plat_target_parms.H b/hwpf/include/plat/plat_target_parms.H
index eee8e9fe..72a00d48 100644
--- a/hwpf/include/plat/plat_target_parms.H
+++ b/hwpf/include/plat/plat_target_parms.H
@@ -36,13 +36,23 @@
 CONST_UINT32_T(CHIP_TARGET_OFFSET,      0);
 CONST_UINT32_T(CHIP_TARGET_COUNT ,      1);
 
-// Pervasive Targets (note; these include the MCS targets as well)
-CONST_UINT32_T(PERV_TARGET_OFFSET, CHIP_TARGET_OFFSET + CHIP_TARGET_COUNT);
-CONST_UINT32_T(PERV_CHIPLET_OFFSET,     0x1);
-CONST_UINT32_T(PERV_TARGET_COUNT,       15);
+// Nest targets - Group 1
+CONST_UINT32_T(NEST_GROUP1_TARGET_OFFSET,  CHIP_TARGET_OFFSET + CHIP_TARGET_COUNT);
+CONST_UINT32_T(NEST_GROUP1_CHIPLET_OFFSET, 0x1);
+CONST_UINT32_T(NEST_GROUP1_TARGET_COUNT,   6);
+
+// MCS targets
+CONST_UINT32_T(MCS_TARGET_OFFSET, NEST_GROUP1_TARGET_OFFSET + NEST_GROUP1_TARGET_COUNT);
+CONST_UINT32_T(MCS_CHIPLET_OFFSET,      0x7);
+CONST_UINT32_T(MCS_TARGET_COUNT,        2);
+
+// Nest targets - Group 2
+CONST_UINT32_T(NEST_GROUP2_TARGET_OFFSET, MCS_TARGET_OFFSET + MCS_TARGET_COUNT);
+CONST_UINT32_T(NEST_GROUP2_TARGET_COUNT,   7);
+CONST_UINT32_T(NEST_GROUP2_CHIPLET_OFFSET, 0x9);
 
 // Cache Targets
-CONST_UINT32_T(EQ_TARGET_OFFSET, PERV_TARGET_OFFSET + PERV_TARGET_COUNT);
+CONST_UINT32_T(EQ_TARGET_OFFSET, NEST_GROUP2_TARGET_OFFSET + NEST_GROUP2_TARGET_COUNT);
 CONST_UINT32_T(EQ_CHIPLET_OFFSET,       0x10);
 CONST_UINT32_T(EQ_TARGET_COUNT,         6);
 
@@ -51,12 +61,7 @@ CONST_UINT32_T(CORE_TARGET_OFFSET, EQ_TARGET_OFFSET + EQ_TARGET_COUNT);
 CONST_UINT32_T(CORE_CHIPLET_OFFSET,     0x20);
 CONST_UINT32_T(CORE_TARGET_COUNT,       24);
 
-// MCS Targets (note: these are phyically Pervasive targets)
-CONST_UINT32_T(MCS_TARGET_OFFSET, CORE_TARGET_OFFSET + CORE_TARGET_COUNT);
-CONST_UINT32_T(MCS_CHIPLET_OFFSET,      0x7);
-CONST_UINT32_T(MCS_TARGET_COUNT,        2);
-
-CONST_UINT32_T(EX_TARGET_OFFSET, MCS_TARGET_OFFSET + MCS_TARGET_COUNT);
+CONST_UINT32_T(EX_TARGET_OFFSET, CORE_TARGET_OFFSET + CORE_TARGET_COUNT);
 CONST_UINT32_T(EX_CHIPLET_OFFSET,       0x10);
 CONST_UINT32_T(EX_TARGET_COUNT,         12);
 
@@ -67,12 +72,13 @@ CONST_UINT32_T(MCAST_TARGET_OFFSET, SYSTEM_TARGET_OFFSET + SYSTEM_TARGET_COUNT);
 CONST_UINT32_T(MCAST_CHIPLET_OFFSET,    4);
 CONST_UINT32_T(MCAST_TARGET_COUNT,      3);  // PPE only needs multicast groups 4-6
 
+// Total number of pervasive targets (Both NEST groups + EQs + COREs +MCSs)
+CONST_UINT32_T(PERV_TARGET_COUNT, NEST_GROUP1_TARGET_COUNT + NEST_GROUP2_TARGET_COUNT +
+        MCS_TARGET_COUNT + EQ_TARGET_COUNT + CORE_TARGET_COUNT);
+
 // Total Target Count
 CONST_UINT32_T(TARGET_COUNT,            CHIP_TARGET_COUNT +
                                         PERV_TARGET_COUNT +
-                                        EQ_TARGET_COUNT +
-                                        CORE_TARGET_COUNT +
-                                        MCS_TARGET_COUNT +
                                         EX_TARGET_COUNT +
                                         SYSTEM_TARGET_COUNT +
                                         MCAST_TARGET_COUNT);
diff --git a/hwpf/include/plat/target.H b/hwpf/include/plat/target.H
index 12b6b566..2f1ec73d 100644
--- a/hwpf/include/plat/target.H
+++ b/hwpf/include/plat/target.H
@@ -69,7 +69,7 @@ namespace fapi2
 
         if(K & TARGET_TYPE_PERV)
         {
-            this->iv_handle.fields.chiplet_num = Value;
+            this->iv_handle.fields.chiplet_num = Value + NEST_GROUP1_CHIPLET_OFFSET;
             this->iv_handle.fields.type = TARGET_TYPE_PERV;
             this->iv_handle.fields.type_target_num = Value;
         }