Support bus MNFG_EYE attributes

Add firmware support for these attributes
- ATTR_MNFG_XBUS_MIN_EYE_WIDTH
- ATTR_MNFG_ABUS_MIN_EYE_WIDTH
- ATTR_MNFG_ABUS_MIN_EYE_HEIGHT
- ATTR_MNFG_DMI_MIN_EYE_WIDTH
- ATTR_MNFG_DMI_MIN_EYE_HEIGHT

Change-Id: Ifb9da114728a2951d626f5b95bf498a9f2ef4772
RTC: 97768
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9309
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

10 files changed, 292 insertions, 5 deletions

diff --git a/src/usr/hwpf/hwp/proc_abus_dmi_xbus_scominit_attributes.xml b/src/usr/hwpf/hwp/proc_abus_dmi_xbus_scominit_attributes.xml
new file mode 100644
index 000000000..8150297f2
--- /dev/null
+++ b/src/usr/hwpf/hwp/proc_abus_dmi_xbus_scominit_attributes.xml
@@ -0,0 +1,81 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/hwpf/hwp/proc_abus_dmi_xbus_scominit_attributes.xml$  -->
+<!--                                                                        -->
+<!-- IBM CONFIDENTIAL                                                       -->
+<!--                                                                        -->
+<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<!-- $Id: proc_abus_dmi_xbus_scominit_attributes.xml,v 1.1 2014/02/17 21:50:50 garyp Exp $ -->
+<!-- proc_abus_dmi_xbus_scominit_attributes.xml -->
+<attributes>
+  <attribute>
+    <id>ATTR_MNFG_DMI_MIN_EYE_WIDTH</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>6 bit rx_min_eye_width value for DMI bus interfaces during system manufacturing; used for both centaur and p8
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <valueType>uint8</valueType>
+    <platInit/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_MNFG_DMI_MIN_EYE_HEIGHT</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>8 bit rx_min_eye_height value for DMI bus interfaces during system manufacturing; used for both centaur and p8
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <valueType>uint8</valueType>
+    <platInit/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_MNFG_ABUS_MIN_EYE_WIDTH</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>6 bit rx_min_eye_width value for A bus interfaces during system manufacturing
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <valueType>uint8</valueType>
+    <platInit/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_MNFG_ABUS_MIN_EYE_HEIGHT</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>8 bit rx_min_eye_height value for A bus interfaces during system manufacturing
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <valueType>uint8</valueType>
+    <platInit/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_MNFG_XBUS_MIN_EYE_WIDTH</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>6 bit rx_min_eye_width value for X bus interfaces during system manufacturing
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <valueType>uint8</valueType>
+    <platInit/>
+  </attribute>
+  <!-- ********************************************************************* -->
+</attributes>
diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile
index 52c735abd..b0e30cdb3 100644
--- a/src/usr/hwpf/makefile
+++ b/src/usr/hwpf/makefile
@@ -169,6 +169,7 @@ HWP_ATTR_XML_FILES = hwp/memory_attributes.xml \
                      hwp/erepair_thresholds.xml \
                      hwp/dram_training/mem_pll_setup/memb_pll_ring_attributes.xml \
                      hwp/proc_chip_ec_feature.xml \
+                     hwp/proc_abus_dmi_xbus_scominit_attributes.xml \
                      hwp/runtime_attributes/memory_occ_attributes.xml
 
 #------------------------------------------------------------------------------
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 23e1f02ab..ae780c2a6 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -195,6 +195,11 @@ push @systemAttr,
     "MRW_MBA_CACHELINE_INTERLEAVE_MODE_CONTROL", $reqPol->{'mba_cacheline_interleave_mode_control'},
     "MRW_ENHANCED_GROUPING_NO_MIRRORING", $reqPol->{'mcs_enhanced_grouping_no_mirroring'},
     "MRW_STRICT_MBA_PLUG_RULE_CHECKING", $reqPol->{'strict_mba_plug_rule_checking'},
+    "MNFG_DMI_MIN_EYE_WIDTH", $reqPol->{'mnfg-dmi-min-eye-width'},
+    "MNFG_DMI_MIN_EYE_HEIGHT", $reqPol->{'mnfg-dmi-min-eye-height'},
+    "MNFG_ABUS_MIN_EYE_WIDTH", $reqPol->{'mnfg-abus-min-eye-width'},
+    "MNFG_ABUS_MIN_EYE_HEIGHT", $reqPol->{'mnfg-abus-min-eye-height'},
+    "MNFG_XBUS_MIN_EYE_WIDTH", $reqPol->{'mnfg-xbus-min-eye-width'},
 ];
 
 #------------------------------------------------------------------------------
@@ -3132,12 +3137,19 @@ sub addSysAttrs
         my $sysAttrArraySize=$#{$systemAttr[$i]};
         while ($j<$sysAttrArraySize)
         {
+            # systemAttr is an array of pairs
+            #  even index is the attribute id
+            #  odd index has its default value
+            my $l_default = $systemAttr[$i][$j+1];
+            if (substr($l_default,0,2) eq "0b") #convert bin to hex
+            {
+                $l_default = sprintf('0x%X', oct($l_default));
+            }
             print "    <attribute>\n";
             print "        <id>$systemAttr[$i][$j]</id>\n";
-            $j++;
-            print "        <default>$systemAttr[$i][$j]</default>\n";
+            print "        <default>$l_default</default>\n";
             print "    </attribute>\n";
-            $j++;
+            $j+=2; # next attribute id and default pair
         }
     }
 }
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index ff3dee349..25551f230 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -13285,7 +13285,6 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
     </hwpfToHbAttrMap>
 </attribute>
 
-
 <enumerationType>
     <id>TOD_ROLE</id>
     <description>
@@ -13319,6 +13318,111 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
     <writeable/>
 </attribute>
 
+<attribute>
+    <id>MNFG_DMI_MIN_EYE_WIDTH</id>
+    <description>
+      System attribute.
+      6 bit rx_min_eye_width value for DMI bus interfaces during system
+      manufacturing; used for both centaur and p8
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MNFG_DMI_MIN_EYE_WIDTH</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>MNFG_DMI_MIN_EYE_HEIGHT</id>
+    <description>
+      System attribute.
+      8 bit rx_min_eye_height value for DMI bus interfaces during system
+      manufacturing; used for both centaur and p8
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MNFG_DMI_MIN_EYE_HEIGHT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>MNFG_ABUS_MIN_EYE_WIDTH</id>
+    <description>
+      System attribute
+      6 bit rx_min_eye_width value for A bus interfaces during system
+      manufacturing
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MNFG_ABUS_MIN_EYE_WIDTH</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>MNFG_ABUS_MIN_EYE_HEIGHT</id>
+    <description>
+      System attribute
+      8 bit rx_min_eye_height value for A bus interfaces during system
+      manufacturing
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MNFG_ABUS_MIN_EYE_HEIGHT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>MNFG_XBUS_MIN_EYE_WIDTH</id>
+    <description>
+      System attribute
+      6 bit rx_min_eye_width value for X bus interfaces during system
+      manufacturing
+      creator: platform
+      firmware notes: Attribute value is in the Machine Readable Workbook
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MNFG_XBUS_MIN_EYE_WIDTH</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
 </attributes>
 
 
diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk
index 09e634eb1..0c3e20b97 100644
--- a/src/usr/targeting/common/xmltohb/common.mk
+++ b/src/usr/targeting/common/xmltohb/common.mk
@@ -90,7 +90,8 @@ FAPI_ATTR_SOURCES =          \
     proc_winkle_scan_override_attributes.xml \
     erepair_thresholds.xml \
     dram_training/mem_pll_setup/memb_pll_ring_attributes.xml \
-    runtime_attributes/memory_occ_attributes.xml
+    runtime_attributes/memory_occ_attributes.xml \
+    proc_abus_dmi_xbus_scominit_attributes.xml
 
 XMLTOHB_GENERIC_XML     = generic.xml
 XMLTOHB_FAPI_XML        = fapiattrs.xml
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 653a6859b..115e4e13b 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -235,6 +235,26 @@
         <id>MEM_MIRROR_PLACEMENT_POLICY</id>
         <default>0</default><!-- NORMAL -->
     </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_XBUS_MIN_EYE_WIDTH</id>
+        <default>0x14</default>
+    </attribute>
     <!-- End System Attributes from MRW -->
     <attribute>
         <id>ISTEP_MODE</id>
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index ac7d78ab4..98944204f 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -231,6 +231,26 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
         <id>MEM_MIRROR_PLACEMENT_POLICY</id>
         <default>0</default><!-- NORMAL -->
     </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_XBUS_MIN_EYE_WIDTH</id>
+        <default>0x14</default>
+    </attribute>
     <!-- End System Attributes from MRW -->
     <attribute>
         <id>ISTEP_MODE</id>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index fb2db11cf..2704220c5 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -172,6 +172,14 @@
     <attribute><id>PROC_FABRIC_ASYNC_SAFE_MODE</id></attribute>
     <!-- End proc_fab_smp_fabric_attributes.xml -->
 
+    <!-- Start proc_abus_dmi_xbus_scominit.xml -->
+    <attribute><id>MNFG_DMI_MIN_EYE_WIDTH</id></attribute>
+    <attribute><id>MNFG_DMI_MIN_EYE_HEIGHT</id></attribute>
+    <attribute><id>MNFG_ABUS_MIN_EYE_WIDTH</id></attribute>
+    <attribute><id>MNFG_ABUS_MIN_EYE_HEIGHT</id></attribute>
+    <attribute><id>MNFG_XBUS_MIN_EYE_WIDTH</id></attribute>
+    <!-- End proc_abus_dmi_xbus_scominit.xml -->
+
     <attribute><id>ENABLED_THREADS</id></attribute>
     <attribute><id>MSS_ZSERIES</id></attribute>
 
diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
index 6c42721ce..7e15b6f98 100644
--- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
@@ -214,6 +214,26 @@
         <id>PROC_VRM_VOFFSET_VCS</id>
         <default>0</default>
     </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_XBUS_MIN_EYE_WIDTH</id>
+        <default>0x14</default>
+    </attribute>
     <!-- End System Attributes from MRW -->
     <attribute>
         <id>ISTEP_MODE</id>
diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
index 54cc37b83..d2d9b8916 100644
--- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
@@ -213,6 +213,26 @@
         <id>PROC_VRM_VOFFSET_VCS</id>
         <default>0</default>
     </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_DMI_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_WIDTH</id>
+        <default>0x0a</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_ABUS_MIN_EYE_HEIGHT</id>
+        <default>0x0f</default>
+    </attribute>
+    <attribute>
+        <id>MNFG_XBUS_MIN_EYE_WIDTH</id>
+        <default>0x14</default>
+    </attribute>
     <!-- End System Attributes from MRW -->
     <attribute>
         <id>BOOT_FREQ_MHZ</id>