Populate hb attributes across drawers

RTC: 50866
Change-Id: Ia5cd58d7ccf90a14f391ed87943fd09cddbb040e
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4820
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 69 insertions, 1 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index b9a3e4e38..fb243d60d 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -1516,6 +1516,28 @@ sub generate_sys
         <default>0b11</default>
     </attribute>
 ";
+    # HDAT drawer number (physical node) to
+    # HostBoot Instance number (logical node) map
+    # Index is the hdat drawer number, value is the HB instance number
+    # Only the max drawer system needs to be represented.
+    if ($sysname eq "brazos")
+    {
+        print "
+    <!-- correlate HDAT drawer number to Hostboot Instance number -->
+    <attribute><id>FABRIC_TO_PHYSICAL_NODE_MAP</id>
+        <default>0,1,2,3,255,255,255,255</default>
+    </attribute>
+";
+    }
+    else # single drawer
+    {
+        print "
+    <!-- correlate HDAT drawer number to Hostboot Instance number -->
+    <attribute><id>FABRIC_TO_PHYSICAL_NODE_MAP</id>
+        <default>0,255,255,255,255,255,255,255</default>
+    </attribute>
+";
+    }
 
     # call to do any fsp per-sys attributes
     do_plugin('fsp_sys', $sys, $sysname, 0);
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 52c6097c9..8a1ca787b 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -2070,6 +2070,35 @@
     </hwpfToHbAttrMap>
 </attribute>
 
+<attribute>
+    <id>FABRIC_TO_PHYSICAL_NODE_MAP</id>
+    <description>
+        Correlate HDAT node number (physical) to the logical node
+        (based on the PIR) that contains the host boot image.
+    </description>
+    <!-- 8 byte array.  The index is the physical node number. The value
+    at that index is the hb instance number, based on the processor PIR, that
+    contains or would contain the host boot image if the drawer exists or were
+    to exist. Host boot uses this value and HB_HRMOR_NODAL_BASE to calculate
+    the HRMOR of the hostboot image for each drawer.
+    If the drawer does NOT physically exist then enter a logical node that
+    does NOT physically exist.
+
+    It's conceivable that there could be more than one logical node contained
+    in a physical drawer, if that is ever the case then the FSP would need to
+    modify this attribute to indicate which logical node contains the hostboot
+    image for each drawer. -->
+    <simpleType>
+        <uint8_t>
+            <!-- Default is for single node system -->
+            <default>0,255,255,255,255,255,255,255</default>
+        </uint8_t>
+    <array>8</array>
+    </simpleType>
+    <persistency>volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
 
 <!--    TARGETING attributes to support mss_setup_bars and proc_setup_bars  -->
 
diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml
index 7c482fe61..2f81d543a 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml
@@ -216,7 +216,6 @@
     <writeable/>
     <hbOnly/>
 </attribute>
-
 <attribute>
     <id>IBSCOM_ENABLE_OVERRIDE</id>
     <description>Used to force IBSCOM enabled for lab testing</description>
@@ -229,4 +228,20 @@
     <readable/>
     <hbOnly/>
 </attribute>
+<attribute>
+    <id>HB_EXISTING_IMAGE</id>
+    <description>Indicates which logical nodes have a hostboot image.</description>
+    <!-- Bit position [0-7] (left to right) represents logical node. 
+    '1' means the logical node has an active hostboot image.
+    -->
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hbOnly/>
+</attribute>
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index bd0b32b00..46a4c4131 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -124,6 +124,7 @@
     <attribute><id>L3_W_EPS</id></attribute>
     <attribute><id>NOMINAL_FREQ_MHZ</id></attribute>
     <attribute><id>MNFG_FLAGS</id></attribute>
+    <attribute><id>FABRIC_TO_PHYSICAL_NODE_MAP</id></attribute>
     <!-- Start pm_plat_attributes.xml -->
     <attribute><id>FREQ_CORE_MAX</id></attribute>
     <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id></attribute>
diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml
index f5c83b76e..05d032116 100644
--- a/src/usr/targeting/common/xmltohb/target_types_hb.xml
+++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml
@@ -34,6 +34,7 @@
     <attribute><id>IS_MPIPL_HB</id></attribute>
     <attribute><id>IBSCOM_ENABLE_OVERRIDE</id></attribute>
     <attribute><id>HB_MUTEX_TEST_LOCK</id></attribute>
+    <attribute><id>HB_EXISTING_IMAGE</id></attribute>
 </targetTypeExtension>
 
 <targetTypeExtension>