HWPF: Improve description of POS attributes

Change-Id: I46ca24b070fa0bb6dfe22d43dde429912dea7452
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2043
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 88 insertions, 56 deletions

diff --git a/src/usr/hwpf/hwp/chip_attributes.xml b/src/usr/hwpf/hwp/chip_attributes.xml
index eb1ef23c3..f44fa54e2 100644
--- a/src/usr/hwpf/hwp/chip_attributes.xml
+++ b/src/usr/hwpf/hwp/chip_attributes.xml
@@ -1,25 +1,25 @@
-<!--  IBM_PROLOG_BEGIN_TAG
-     This is an automatically generated prolog.
-   
-     $Source: src/usr/hwpf/hwp/chip_attributes.xml $
-   
-     IBM CONFIDENTIAL
-   
-     COPYRIGHT International Business Machines Corp. 2011-2012
-   
-     p1
-   
-     Object Code Only (OCO) source materials
-     Licensed Internal Code Source Materials
-     IBM HostBoot Licensed Internal Code
-   
-     The source code for this program is not published or other-
-     wise divested of its trade secrets, irrespective of what has
-     been deposited with the U.S. Copyright Office.
-   
-     Origin: 30
-   
-     IBM_PROLOG_END_TAG -->
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/hwpf/hwp/chip_attributes.xml $                        -->
+<!--                                                                        -->
+<!-- IBM CONFIDENTIAL                                                       -->
+<!--                                                                        -->
+<!-- COPYRIGHT International Business Machines Corp. 2011,2012              -->
+<!--                                                                        -->
+<!-- p1                                                                     -->
+<!--                                                                        -->
+<!-- Object Code Only (OCO) source materials                                -->
+<!-- Licensed Internal Code Source Materials                                -->
+<!-- IBM HostBoot Licensed Internal Code                                    -->
+<!--                                                                        -->
+<!-- The source code for this program is not published or otherwise         -->
+<!-- divested of its trade secrets, irrespective of what has been           -->
+<!-- deposited with the U.S. Copyright Office.                              -->
+<!--                                                                        -->
+<!-- Origin: 30                                                             -->
+<!--                                                                        -->
+<!-- IBM_PROLOG_END_TAG                                                     -->
 <!--
     XML file specifying HWPF attributes.
     These are platInit attributes associated with chips.
@@ -28,16 +28,6 @@
 <attributes>
   <!-- ********************************************************************* -->
   <attribute>
-    <id>ATTR_POS</id>
-    <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_MEMBUF_CHIP,TARGET_TYPE_DIMM</targetType>
-    <description>
-        Position of chip/dimm relative to drawer
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-  </attribute>
-  <!-- ********************************************************************* -->
-  <attribute>
     <id>ATTR_CHIP_ID</id>
     <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_MEMBUF_CHIP</targetType>
     <description>
diff --git a/src/usr/hwpf/hwp/common_attributes.xml b/src/usr/hwpf/hwp/common_attributes.xml
index 120e7c0ba..b7954e201 100644
--- a/src/usr/hwpf/hwp/common_attributes.xml
+++ b/src/usr/hwpf/hwp/common_attributes.xml
@@ -44,4 +44,35 @@
     <enum>NON_FUNCTIONAL = 0, FUNCTIONAL = 1</enum>
     <platInit/>
   </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_POS</id>
+    <targetType>
+        TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP, TARGET_TYPE_DIMM
+    </targetType>
+    <description>
+        Position of chip/dimm within drawer
+        This data is from the MRW
+        TARGET_TYPE_PROC_CHIP:
+            0, 1, 2, 3...
+        TARGET_TYPE_MEMBUF_CHIP:
+            (attached PROC_CHIP->ATTR_POS * 8) +
+                (attached MCS_CHIPLET->ATTR_CHIP_UNIT_POS)
+        TARGET_TYPE_DIMM:
+            (attached PROC_CHIP->ATTR_POS * 64) +
+                (attached MCS_CHIPLET->ATTR_CHIP_UNIT_POS * 8) +
+                    DIMM-NUMBER
+            where DIMM-NUMBER:
+                0: MBA0, port0, dimm0
+                1: MBA0, port0, dimm1
+                2: MBA0, port1, dimm0
+                3: MBA0, port1, dimm1
+                4: MBA1, port0, dimm0
+                5: MBA1, port0, dimm1
+                6: MBA1, port1, dimm0
+                7: MBA1, port1, dimm1
+    </description>
+    <valueType>uint32</valueType>
+    <platInit/>
+  </attribute>
 </attributes>
diff --git a/src/usr/hwpf/hwp/unit_attributes.xml b/src/usr/hwpf/hwp/unit_attributes.xml
index 42b8300ad..1c969384f 100644
--- a/src/usr/hwpf/hwp/unit_attributes.xml
+++ b/src/usr/hwpf/hwp/unit_attributes.xml
@@ -1,32 +1,43 @@
-<!--  IBM_PROLOG_BEGIN_TAG
-     This is an automatically generated prolog.
-   
-     $Source: src/usr/hwpf/hwp/unit_attributes.xml $
-   
-     IBM CONFIDENTIAL
-   
-     COPYRIGHT International Business Machines Corp. 2012
-   
-     p1
-   
-     Object Code Only (OCO) source materials
-     Licensed Internal Code Source Materials
-     IBM HostBoot Licensed Internal Code
-   
-     The source code for this program is not published or other-
-     wise divested of its trade secrets, irrespective of what has
-     been deposited with the U.S. Copyright Office.
-   
-     Origin: 30
-   
-     IBM_PROLOG_END -->
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/hwpf/hwp/unit_attributes.xml $                        -->
+<!--                                                                        -->
+<!-- IBM CONFIDENTIAL                                                       -->
+<!--                                                                        -->
+<!-- COPYRIGHT International Business Machines Corp. 2012                   -->
+<!--                                                                        -->
+<!-- p1                                                                     -->
+<!--                                                                        -->
+<!-- Object Code Only (OCO) source materials                                -->
+<!-- Licensed Internal Code Source Materials                                -->
+<!-- IBM HostBoot Licensed Internal Code                                    -->
+<!--                                                                        -->
+<!-- The source code for this program is not published or otherwise         -->
+<!-- divested of its trade secrets, irrespective of what has been           -->
+<!-- deposited with the U.S. Copyright Office.                              -->
+<!--                                                                        -->
+<!-- Origin: 30                                                             -->
+<!--                                                                        -->
+<!-- IBM_PROLOG_END_TAG                                                     -->
 <!-- XML file specifying Unit attributes used by HW Procedures. -->
 <attributes>
 
 <attribute>
     <id>ATTR_CHIP_UNIT_POS</id>
-    <targetType>TARGET_TYPE_EX_CHIPLET, TARGET_TYPE_MBA_CHIPLET, TARGET_TYPE_MCS_CHIPLET</targetType>
-    <description>A unit's offset number within the chip with respect to similar units. </description>
+    <targetType>
+        TARGET_TYPE_EX_CHIPLET, TARGET_TYPE_MBA_CHIPLET, TARGET_TYPE_MCS_CHIPLET
+    </targetType>
+    <description>
+        A unit's position within the chip with respect to similar units.
+        This data is from the MRW.
+        It not always 0, 1, 2, 3... For example:
+          MCS units in Murano are 4, 5, 6, 7
+          EX units in Murano are 4, 5, 6, 12, 13, 14
+          MCS units in Venice are 0, 1, 2, 3, 4, 5, 6, 7
+          EX units in Venice are 1, 2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14
+          MBA units in Centaur are 0, 1
+    </description>
     <valueType>uint8</valueType>
     <platInit/>
 </attribute>