From 3da7cf34b72d97494dc5a2ed414a4e2d6db5f261 Mon Sep 17 00:00:00 2001
From: Dan Crowell <dcrowell@us.ibm.com>
Date: Mon, 1 Feb 2016 10:06:53 -0600
Subject: Define ATTR_FAPI_POS

Create ATTR_FAPI_POS to serve as the canonical numerical identifier
for all targets.

Change-Id: I4312df52ceaaa4083b7780f742e28acac4c03e95
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23834
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Brent Wieman <bwieman@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24537
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 .../fapi2/xml/attribute_info/common_attributes.xml | 32 ++++++++++++++++++++--
 .../fapi2/xml/attribute_info/unit_attributes.xml   |  4 +--
 2 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'src/import')

diff --git a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
index 0bacf989b..03557e704 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
@@ -7,7 +7,7 @@
 <!--                                                                        -->
 <!-- EKB Project                                                            -->
 <!--                                                                        -->
-<!-- COPYRIGHT 2015                                                         -->
+<!-- COPYRIGHT 2015,2016                                                    -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -47,11 +47,39 @@
     <id>ATTR_POS</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP, TARGET_TYPE_DIMM</targetType>
     <description>
-      Position of chip/dimm within drawer
+      Physical position of chip/dimm within drawer
       This data is from the MRW.
     </description>
     <valueType>uint32</valueType>
     <platInit/>
   </attribute>
   <!-- ******************************************************************************** -->
+  <attribute>
+    <id>ATTR_FAPI_POS</id>
+    <targetType>
+      TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP, TARGET_TYPE_DIMM,
+      TARGET_TYPE_CORE, TARGET_TYPE_EX, TARGET_TYPE_EQ,
+      TARGET_TYPE_MCS, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI, TARGET_TYPE_DMI,
+      TARGET_TYPE_XBUS, TARGET_TYPE_OBUS,
+      TARGET_TYPE_NV,
+      TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
+      TARGET_TYPE_PEC, TARGET_TYPE_PHB, TARGET_TYPE_CAPP,
+      TARGET_TYPE_MBA
+    </targetType>
+    <description>
+      Logical position of target within a system. This is derived from the SMP location
+      of each processor and each target's relationship to a proc.
+      - PROC = based on SMP groupid+chipid
+      - MEMBUF = PROC:FAPI_POS * [max membuf per proc]
+      - 1st level child unit = [parent chip]:FAPI_POS * [max children of this type per chip]
+      - 2nd+ level child unit = [immediate parent unit]:FAPI_POS * [max units below parent]
+      Note: This should not be used algorithmically by HWPs directly.
+      Note: Value ignores physical drawer boundaries, the value is unique across the entire
+            system.
+      This data is derived from the MRW.
+    </description>
+    <valueType>uint32</valueType>
+    <platInit/>
+  </attribute>
+  <!-- ******************************************************************************** -->
 </attributes>
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
index 1bb5d02fe..a8ce7cb70 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
@@ -7,7 +7,7 @@
 <!--                                                                        -->
 <!-- EKB Project                                                            -->
 <!--                                                                        -->
-<!-- COPYRIGHT 2015                                                         -->
+<!-- COPYRIGHT 2015,2016                                                    -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -27,11 +27,11 @@
       TARGET_TYPE_NV,
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
       TARGET_TYPE_PEC, TARGET_TYPE_PHB, TARGET_TYPE_CAPP,
-      TARGET_TYPE_MEMBUF_CHIP,
       TARGET_TYPE_MBA
     </targetType>
     <description>
       A unit's position within the chip with respect to similar units.
+      Note that this value is relative to the parent chip, not a parent unit.
       This data is from the MRW.
     </description>
     <valueType>uint8</valueType>
-- 
cgit v1.2.1