Update constants and comments for P9 PIR format

Implemented a set of macros and constants that can be used
everywhere to translate a PIR into its component parts
and pull out individual pieces of data from a complete
PIR.
Also added and updated the references to the old
ATTR_FABRIC_NODE_ID with ATTR_FABRIC_GROUP_ID.

Change-Id: If9735f53940e5849a648729e4bf8ca0cfbb09f6e
RTC: 88055
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/706
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 15 insertions, 54 deletions

diff --git a/src/include/usr/hwas/common/deconfigGard.H b/src/include/usr/hwas/common/deconfigGard.H
index 374b6b44f..7c11d8643 100644
--- a/src/include/usr/hwas/common/deconfigGard.H
+++ b/src/include/usr/hwas/common/deconfigGard.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -431,7 +431,7 @@ private:
         // target for this chip
         TARGETING::Target * iv_pThisProc;
         TARGETING::ATTR_HUID_type procHUID;
-        TARGETING::ATTR_FABRIC_NODE_ID_type procFabricNode;
+        TARGETING::ATTR_FABRIC_GROUP_ID_type procFabricGroup;
         TARGETING::ATTR_FABRIC_CHIP_ID_type procFabricChip;
         bool iv_masterCapable;
         bool iv_deconfigured;
diff --git a/src/include/usr/intr/interrupt.H b/src/include/usr/intr/interrupt.H
index b5e41a2d9..1b24c2eed 100644
--- a/src/include/usr/intr/interrupt.H
+++ b/src/include/usr/intr/interrupt.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -36,44 +36,6 @@ namespace TARGETING
 namespace INTR
 {
     /**
-     * cpu PIR register
-     */
-    struct PIR_t
-    {
-        union
-        {
-            uint32_t word;
-            struct
-            {
-                //P8:
-                uint32_t        reserved:19;    //!< zeros
-                uint32_t        nodeId:3;       //!< node (0-3)
-                uint32_t        chipId:3;       //!< chip pos on node (0-5)
-                uint32_t        coreId:4;       //!< Core number (1-6,9-14)?
-                uint32_t        threadId:3;     //!< Thread number (0-7)
-            } PACKED;
-        };
-        PIR_t(uint32_t i_word = 0) : word(i_word) {}
-
-        PIR_t(uint32_t i_nodeId, uint32_t i_chipId,
-              uint32_t i_coreId, uint32_t i_thread = 0) :
-            reserved(0),
-            nodeId(i_nodeId), chipId(i_chipId),
-            coreId(i_coreId), threadId(i_thread) {}
-
-        PIR_t operator= (uint32_t i_word)
-        {
-            word = i_word;
-            return word;
-        }
-
-        bool operator< (const PIR_t& r) const
-        {
-            return word < r.word;
-        }
-    };
-
-    /**
      * External Interrupt Types (XISR)
      * This value is passed in message data[0] on interrupt or shutdown.
      * @note The XISR is 24 bits:
diff --git a/src/include/usr/runtime/rt_targeting.H b/src/include/usr/runtime/rt_targeting.H
index 7559b6170..e26ea5fe4 100644
--- a/src/include/usr/runtime/rt_targeting.H
+++ b/src/include/usr/runtime/rt_targeting.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -38,20 +38,19 @@ namespace RT_TARG
 
     enum
     {
-        CHIPID_NODE_SHIFT = 3,  //!< CHIPID NODE is 'NNNCCC'b
-        MEMBUF_ID_SHIFT = 4,    //!< CHIPID for MEMBUF is 'NNNCCCMMMM'b
-        UNIT_ID_SHIFT   = 4,    //!< CHIPID for CORE is 'NNNCCCPPPP'b
-        UNIT_ID_MASK    = 0x000003ff, //!< Valid id bits w/o ID_FLAG
-        PROC_ID_TYPE    = 0x00000000, //!< PROC chip id type
-        MEMBUF_ID_TYPE  = 0x80000000, //!< MEMBUF chip id type
-        CORE_ID_TYPE    = 0x40000000, //!< CORE/EX chip id type
-        CHIPID_ID_MASK  = 0xFF000000, //!< TYPE field
+        MEMBUF_ID_SHIFT = 4,    //!< CHIPID for MEMBUF is '<procid>MMMM'b
+        MEMBUF_ID_MASK  = 0x0000000F, //!< valid position bits for MEMBUF
+
+        PROC_TYPE        = 0x00000000, //!< PROC chip id type
+        MEMBUF_TYPE      = 0x80000000, //!< MEMBUF chip id type
+        CORE_TYPE        = 0x40000000, //!< CORE chip id type
+        CHIPID_TYPE_MASK = 0xFF000000, //!< TYPE field
     };
 
 
     /**
      * @brief Convert a TARGETING::Target to an unit ID that can be used
-     * in calls to Sapphire
+     * in calls to the runtime host
      * @param[in] The HB TARGETING::Target
      * @param[out] Sapphire target id
      * @return an error handle on error
diff --git a/src/include/usr/targeting/common/targetservice.H b/src/include/usr/targeting/common/targetservice.H
index 828fe86f3..455502dcf 100644
--- a/src/include/usr/targeting/common/targetservice.H
+++ b/src/include/usr/targeting/common/targetservice.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -79,8 +79,8 @@ namespace TARGETING
     /* Invalid Section Id - to initialize struct variable */
     static const uint8_t INVALID_SECTIONID  = 0xFF;
 
-    // Special "not found" fabric node ID is the data type with all bits set
-    static const ATTR_FABRIC_NODE_ID_type FABRIC_NODE_ID_NOT_FOUND =
+    // Special "not found" fabric group ID is the data type with all bits set
+    static const ATTR_FABRIC_GROUP_ID_type FABRIC_GROUP_ID_NOT_FOUND =
         INVALID_NODE;
 
     /**