From 2b40e2e100c7a0725762c40865d36ac7639e12cc Mon Sep 17 00:00:00 2001
From: Santosh Puranik <santosh.puranik@in.ibm.com>
Date: Fri, 16 Sep 2016 08:47:53 -0500
Subject: Unpack attributes for Pervasive targets

-- Reserve space for all 64 possible chiplets

Change-Id: I21b431205c84c8502b98364eb4c2befc31cdf3d9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29839
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: SRINIVAS V. POLISETTY <srinivan@in.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29840
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
---
 src/tools/scripts/ppeCreateAttrGetSetMacros.pl | 19 +------------------
 src/tools/scripts/ppeParseProcSbeFixed.pl      |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

(limited to 'src/tools/scripts')

diff --git a/src/tools/scripts/ppeCreateAttrGetSetMacros.pl b/src/tools/scripts/ppeCreateAttrGetSetMacros.pl
index a0004f39..a77054c9 100755
--- a/src/tools/scripts/ppeCreateAttrGetSetMacros.pl
+++ b/src/tools/scripts/ppeCreateAttrGetSetMacros.pl
@@ -366,24 +366,7 @@ if (@newAttributeDefines != 0) {
         print OUTFILE "
         __attribute__((always_inline)) inline uint32_t getPervAttrIndex(const fapi2::Target<TARGET_TYPE_PERV> &i_target)
         {
-            uint32_t l_index = static_cast<plat_target_handle_t>(i_target.get()).getTargetInstance();
-            if(PPE_TARGET_TYPE_EQ & static_cast<plat_target_handle_t>(i_target.get()).getTargetType())
-            {
-                l_index += (EQ_TARGET_OFFSET);
-            }
-            else if(PPE_TARGET_TYPE_CORE & static_cast<plat_target_handle_t>(i_target.get()).getTargetType())
-            {
-                l_index += (CORE_TARGET_OFFSET);
-            }
-            else if(PPE_TARGET_TYPE_MCBIST & static_cast<plat_target_handle_t>(i_target.get()).getTargetType())
-            {
-                l_index += (MCBIST_TARGET_OFFSET);
-            }
-            else
-            {
-                l_index += (NEST_GROUP1_TARGET_OFFSET);
-            }
-            return (l_index - NEST_GROUP1_TARGET_OFFSET);
+            return i_target.getChipletNumber();
         }
         ";
 
diff --git a/src/tools/scripts/ppeParseProcSbeFixed.pl b/src/tools/scripts/ppeParseProcSbeFixed.pl
index f58a0ef5..80c68afb 100755
--- a/src/tools/scripts/ppeParseProcSbeFixed.pl
+++ b/src/tools/scripts/ppeParseProcSbeFixed.pl
@@ -298,7 +298,7 @@ foreach my $attr (@attrPervIds)
 {
 
     my $value = uc $attr->{valueType};
-    print PEFILE "PROC_SBE_FIXED_TARGET_$value($attr->{id}, PERV_TARGET_COUNT);\n"
+    print PEFILE "PROC_SBE_FIXED_TARGET_$value($attr->{id}, MAX_PERV_CHIPLETS);\n"
 
 
 }
-- 
cgit v1.2.1