HWPF: Merge latest memory attributes XML file from HW team

Change-Id: I0e22eec71f7aab0e0e7b5ca9edd03358034078c4
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/700
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 114 insertions, 78 deletions

diff --git a/src/usr/targeting/xmltohb/attribute_types.xml b/src/usr/targeting/xmltohb/attribute_types.xml
index ecbd79691..101c9e04c 100644
--- a/src/usr/targeting/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/xmltohb/attribute_types.xml
@@ -1109,9 +1109,9 @@
     <id>EFF_DIMM_RANKS_CONFIGED</id>
     <description>DIMM ranks configured. Initialized and used by HWPs.</description>
     <simpleType>
-        <uint32_t>
+        <uint8_t>
             <default>0</default>
-        </uint32_t>
+        </uint8_t>
         <array>2,2</array>
     </simpleType>
     <persistency>volatile-zeroed</persistency>
@@ -1656,25 +1656,8 @@
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_SLEW_RATE_DQ</id>
-    <description>Centaur DQ Slew Rate. Initialized and used by HWPs.</description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/> 
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_SLEW_RATE_DQ</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>EFF_CEN_SLEW_RATE_DQS</id>
-    <description>Centaur DQS Slew Rate. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_SLEW_RATE_DQ_DQS</id>
+    <description>Centaur DQ and DQS Slew Rate. Initialized and used by HWPs.</description>
     <simpleType>
         <uint8_t>
             <default>0</default>
@@ -1684,7 +1667,7 @@
     <readable/> 
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_SLEW_RATE_DQS</id>
+        <id>ATTR_EFF_CEN_SLEW_RATE_DQ_DQS</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
@@ -1759,57 +1742,6 @@
 </attribute>
 
 <attribute>
-    <id>EFF_DRAM_BANKS</id>
-    <description>Number of DRAM banks. Initialized and used by HWPs.</description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EFF_DRAM_BANKS</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>EFF_DRAM_ROWS</id>
-    <description>Number of DRAM rows. Initialized and used by HWPs.</description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EFF_DRAM_ROWS</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>EFF_DRAM_COLS</id>
-    <description>Number of DRAM columns. Initialized and used by HWPs.</description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EFF_DRAM_COLS</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
     <id>EFF_DRAM_DENSITY</id>
     <description>DRAM Density. Initialized and used by HWPs.</description>
     <simpleType>
@@ -1912,6 +1844,23 @@
 </attribute>
 
 <attribute>
+    <id>EFF_DRAM_TRFI</id>
+    <description>Refresh Interval. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint32_t>
+            <default>0</default>
+        </uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_DRAM_TRFI</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>EFF_DRAM_TRFC</id>
     <description>DRAM Refresh Recovery Delay. Initialized and used by HWPs.</description>
     <simpleType>
@@ -2304,6 +2253,91 @@
 </attribute>
 
 <attribute>
+    <id>EFF_SCHMOO_MODE</id>
+    <description>Specifies the schmoo mode to use during draminit_train_adv. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_SCHMOO_MODE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>EFF_SCHMOO_TEST_VALID</id>
+    <description>Specifies the schmoo test to run during draminit_train_adv. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_SCHMOO_TEST_VALID</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>EFF_SCHMOO_PARAM_VALID</id>
+    <description>Specifies the schmoo parameters to use during draminit_train_adv. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_SCHMOO_PARAM_VALID</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>EFF_MEMCAL_INTERVAL</id>
+    <description>Specifies the memcal interval in clocks. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint32_t>
+            <default>0</default>
+        </uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_MEMCAL_INTERVAL</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>EFF_ZQCAL_INTERVAL</id>
+    <description>Specifies the zqcal interval in clocks. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint32_t>
+            <default>0</default>
+        </uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_ZQCAL_INTERVAL</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>MSS_THROTTLE_NUMERATOR</id>
     <description>DIMM throttle numerator. Initialized and used by HWPs.</description>
     <simpleType>     
diff --git a/src/usr/targeting/xmltohb/target_types.xml b/src/usr/targeting/xmltohb/target_types.xml
index 030d0d760..7ebadb6a8 100644
--- a/src/usr/targeting/xmltohb/target_types.xml
+++ b/src/usr/targeting/xmltohb/target_types.xml
@@ -503,21 +503,18 @@
     <attribute><id>EFF_CEN_DRV_IMP_CMD</id></attribute>
     <attribute><id>EFF_CEN_DRV_IMP_CNTL</id></attribute>
     <attribute><id>EFF_CEN_RCV_IMP_DQ_DQS</id></attribute>
-    <attribute><id>EFF_CEN_SLEW_RATE_DQ</id></attribute>
-    <attribute><id>EFF_CEN_SLEW_RATE_DQS</id></attribute>
+    <attribute><id>EFF_CEN_SLEW_RATE_DQ_DQS</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_CMD</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_CNTL</id></attribute>
     <attribute><id>EFF_CEN_RD_VREF</id></attribute>
     <attribute><id>EFF_DIMM_SIZE</id></attribute>
-    <attribute><id>EFF_DRAM_BANKS</id></attribute>
-    <attribute><id>EFF_DRAM_ROWS</id></attribute>
-    <attribute><id>EFF_DRAM_COLS</id></attribute>
     <attribute><id>EFF_DRAM_DENSITY</id></attribute>
     <attribute><id>EFF_DRAM_TRCD</id></attribute>
     <attribute><id>EFF_DRAM_TRRD</id></attribute>
     <attribute><id>EFF_DRAM_TRP</id></attribute>
     <attribute><id>EFF_DRAM_TRAS</id></attribute>
     <attribute><id>EFF_DRAM_TRC</id></attribute>
+    <attribute><id>EFF_DRAM_TRFI</id></attribute>
     <attribute><id>EFF_DRAM_TRFC</id></attribute>
     <attribute><id>EFF_DRAM_TWTR</id></attribute>
     <attribute><id>EFF_DRAM_TRTP</id></attribute>
@@ -541,6 +538,11 @@
     <attribute><id>EFF_MPR_LOC</id></attribute>
     <attribute><id>EFF_MPR_MODE</id></attribute>
     <attribute><id>EFF_DIMM_RCD_CNTL_WORD_0_15</id></attribute>
+    <attribute><id>EFF_SCHMOO_MODE</id></attribute>
+    <attribute><id>EFF_SCHMOO_TEST_VALID</id></attribute>
+    <attribute><id>EFF_SCHMOO_PARAM_VALID</id></attribute>
+    <attribute><id>EFF_MEMCAL_INTERVAL</id></attribute>
+    <attribute><id>EFF_ZQCAL_INTERVAL</id></attribute>
     <attribute><id>MSS_THROTTLE_NUMERATOR</id></attribute>
     <attribute><id>MSS_THROTTLE_DENOMINATOR</id></attribute>
     <attribute><id>MSS_THROTTLE_CHANNEL_NUMERATOR</id></attribute>