Use ATTR_PG attribute

-- Remove use of ATTR_PG_<CHIPLET>
-- Delete pg attributes XML

Change-Id: I96986292fb6e360fc785f99e66b3e866dccd4fef
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21871
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Soma Bhanutej <soma.bhanu@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>

2 files changed, 14 insertions, 111 deletions

diff --git a/hwpf/include/plat/plat_target_pg_attributes.H b/hwpf/include/plat/plat_target_pg_attributes.H
deleted file mode 100644
index ce51448b..00000000
--- a/hwpf/include/plat/plat_target_pg_attributes.H
+++ /dev/null
@@ -1,107 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: $                                                             */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-/**
- * @file plat_target_pg_attribute.H
- * @brief Definitions for fapi2 PPE targets' partial good attribute mapping
- */
-
-#ifndef __FAPI2_PPE_TARGET_PG_ATTR__
-#define __FAPI2_PPE_TARGET_PG_ATTR__
-
-
-typedef struct chiplet_pg_entry_t
-{
-    // char[16]  pg_attribute;
-    uint32_t  pg_attribute;
-    uint8_t   target_type;
-    uint16_t  relative_target_num;
-} chiplet_pg_entry_t;
-
-const chiplet_pg_entry_t CHIPLET_PG_ARRAY[] =
-{
-     // Pervasive Chiplets
-     { fapi2::ATTR_PG_PRV , fapi2::TARGET_TYPE_PERV,      0x01 },
-     { fapi2::ATTR_PG_N0  , fapi2::TARGET_TYPE_PERV,      0x02 },
-     { fapi2::ATTR_PG_N1  , fapi2::TARGET_TYPE_PERV,      0x03 },
-     { fapi2::ATTR_PG_N2  , fapi2::TARGET_TYPE_PERV,      0x04 },
-     { fapi2::ATTR_PG_N3  , fapi2::TARGET_TYPE_PERV,      0x05 },
-     { fapi2::ATTR_PG_XB  , fapi2::TARGET_TYPE_PERV,      0x06 },
-     { fapi2::ATTR_PG_MC01, fapi2::TARGET_TYPE_PERV,      0x07 },
-     { fapi2::ATTR_PG_MC23, fapi2::TARGET_TYPE_PERV,      0x08 },
-     { fapi2::ATTR_PG_OB0 , fapi2::TARGET_TYPE_PERV,      0x09 },
-     { fapi2::ATTR_PG_OB1 , fapi2::TARGET_TYPE_PERV,      0x0A },
-     { fapi2::ATTR_PG_OB2 , fapi2::TARGET_TYPE_PERV,      0x0B },
-     { fapi2::ATTR_PG_OB3 , fapi2::TARGET_TYPE_PERV,      0x0C },
-     { fapi2::ATTR_PG_PCI0, fapi2::TARGET_TYPE_PERV,      0x0D },
-     { fapi2::ATTR_PG_PCI1, fapi2::TARGET_TYPE_PERV,      0x0E },
-     { fapi2::ATTR_PG_PCI2, fapi2::TARGET_TYPE_PERV,      0x0F },
-     // EQ Chiplets
-     { fapi2::ATTR_PG_EQ0 , fapi2::TARGET_TYPE_EQ,        0x00 },
-     { fapi2::ATTR_PG_EQ1 , fapi2::TARGET_TYPE_EQ,        0x01 },
-     { fapi2::ATTR_PG_EQ2 , fapi2::TARGET_TYPE_EQ,        0x02 },
-     { fapi2::ATTR_PG_EQ3 , fapi2::TARGET_TYPE_EQ,        0x03 },
-     { fapi2::ATTR_PG_EQ4 , fapi2::TARGET_TYPE_EQ,        0x04 },
-     { fapi2::ATTR_PG_EQ5 , fapi2::TARGET_TYPE_EQ,        0x05 },
-     // Core Chiplets
-     { fapi2::ATTR_PG_EC00, fapi2::TARGET_TYPE_CORE,      0x00 },
-     { fapi2::ATTR_PG_EC01, fapi2::TARGET_TYPE_CORE,      0x01 },
-     { fapi2::ATTR_PG_EC02, fapi2::TARGET_TYPE_CORE,      0x02 },
-     { fapi2::ATTR_PG_EC03, fapi2::TARGET_TYPE_CORE,      0x03 },
-     { fapi2::ATTR_PG_EC04, fapi2::TARGET_TYPE_CORE,      0x04 },
-     { fapi2::ATTR_PG_EC05, fapi2::TARGET_TYPE_CORE,      0x05 },
-     { fapi2::ATTR_PG_EC06, fapi2::TARGET_TYPE_CORE,      0x06 },
-     { fapi2::ATTR_PG_EC07, fapi2::TARGET_TYPE_CORE,      0x07 },
-     { fapi2::ATTR_PG_EC08, fapi2::TARGET_TYPE_CORE,      0x08 },
-     { fapi2::ATTR_PG_EC09, fapi2::TARGET_TYPE_CORE,      0x09 },
-     { fapi2::ATTR_PG_EC10, fapi2::TARGET_TYPE_CORE,      0x0A },
-     { fapi2::ATTR_PG_EC11, fapi2::TARGET_TYPE_CORE,      0x0B },
-     { fapi2::ATTR_PG_EC12, fapi2::TARGET_TYPE_CORE,      0x0C },
-     { fapi2::ATTR_PG_EC13, fapi2::TARGET_TYPE_CORE,      0x0D },
-     { fapi2::ATTR_PG_EC14, fapi2::TARGET_TYPE_CORE,      0x0E },
-     { fapi2::ATTR_PG_EC15, fapi2::TARGET_TYPE_CORE,      0x0F },
-     { fapi2::ATTR_PG_EC16, fapi2::TARGET_TYPE_CORE,      0x10 },
-     { fapi2::ATTR_PG_EC17, fapi2::TARGET_TYPE_CORE,      0x11 },
-     { fapi2::ATTR_PG_EC18, fapi2::TARGET_TYPE_CORE,      0x12 },
-     { fapi2::ATTR_PG_EC19, fapi2::TARGET_TYPE_CORE,      0x13 },
-     { fapi2::ATTR_PG_EC20, fapi2::TARGET_TYPE_CORE,      0x14 },
-     { fapi2::ATTR_PG_EC21, fapi2::TARGET_TYPE_CORE,      0x15 },
-     { fapi2::ATTR_PG_EC22, fapi2::TARGET_TYPE_CORE,      0x16 },
-     { fapi2::ATTR_PG_EC23, fapi2::TARGET_TYPE_CORE,      0x17 }
-};
-
-extern uint32_t CHIPLET_PG_ARRAY_ENTRIES;
-
-#pragma pack(8) //Start of packing to 8byte boundary
-typedef struct {
-  fapi2attr::SystemAttributes_t    G_system_attrs;
-  fapi2attr::ProcChipAttributes_t  G_proc_chip_attrs;
-  fapi2attr::PervAttributes_t      G_perv_attrs;
-  fapi2attr::CoreAttributes_t      G_core_attrs;
-  fapi2attr::EXAttributes_t        G_ex_attrs;
-  fapi2attr::EQAttributes_t        G_eq_attrs;
-} G_sbe_attrs_t;
-#pragma pack()//End of packing to 8byte boundary
-
-#endif  // __FAPI2_PPE_TARGET_PG_ATTR__
diff --git a/hwpf/include/plat/plat_target_utils.H b/hwpf/include/plat/plat_target_utils.H
index ec34813c..6c84eaf5 100644
--- a/hwpf/include/plat/plat_target_utils.H
+++ b/hwpf/include/plat/plat_target_utils.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: $                                                             */
+/* $Source: hwpf/include/plat/plat_target_utils.H $                       */
 /*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
+/* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -30,12 +30,22 @@
 #ifndef __FAPI2_PLAT_TARGET_UTIL__
 #define __FAPI2_PLAT_TARGET_UTIL__
 
+#pragma pack(8) //Start of packing to 8byte boundary
+    typedef struct {
+      fapi2attr::SystemAttributes_t    G_system_attrs;
+      fapi2attr::ProcChipAttributes_t  G_proc_chip_attrs;
+      fapi2attr::PervAttributes_t      G_perv_attrs;
+      fapi2attr::CoreAttributes_t      G_core_attrs;
+      fapi2attr::EXAttributes_t        G_ex_attrs;
+      fapi2attr::EQAttributes_t        G_eq_attrs;
+    } G_sbe_attrs_t;
+#pragma pack()//End of packing to 8byte boundary
+
 //
 // Platform Utility functions..
 //
 namespace fapi2
 {
-
     /// @brief Function to initialize the G_targets vector based on partial good
     ///      attributes
     ReturnCode plat_TargetsInit();