Retrieve attributes from VSPD MT Centaur VPD fields

Create a HWP accessor to retrieve Termination Data attributes from cvpd
record VSPD keyword MT.

Change-Id: I1277ceb22345bfef9d743bfef5c3ff81f36b34c4
RTC: 50574
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4661
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 100 insertions, 90 deletions

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 22b6a7c0e..afb353a3c 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -6268,6 +6268,10 @@ firmware notes: Used as override attribute for pstate procedure
     </hwpfToHbAttrMap>
 </attribute>
 
+<!-- TODO RTC 69935. These termination data  attributes need to come from
+     CDIMM VPD.  For now, they are setup by the mss_eff_config_termination HWP.
+     Remove these when valid vpd is on the CDIMMs  -->
+
 <attribute>
     <id>EFF_ODT_RD</id>
     <description>Rank Read ODT. Initialized and used by HWPs.</description>
@@ -6395,42 +6399,6 @@ firmware notes: Used as override attribute for pstate procedure
 </attribute>
 
 <attribute>
-    <id>EFF_DRAM_WR_VREF_SCHMOO</id>
-    <description>Enables for which VREF to use on the WR Schmoo. Initialized and used by HWPs.</description>
-    <simpleType>
-        <uint32_t>
-            <default>0</default>
-        </uint32_t>
-        <array>2</array>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EFF_DRAM_WR_VREF_SCHMOO</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>EFF_DRAM_WRDDR4_VREF_SCHMOO</id>
-    <description>Enables for which VREF to use on the WR Schmoo for DDR4. Initialized and used by HWPs.</description>
-    <simpleType>
-        <uint32_t>
-            <default>0</default>
-        </uint32_t>
-        <array>2</array>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EFF_DRAM_WRDDR4_VREF_SCHMOO</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
     <id>EFF_CEN_DRV_IMP_DQ_DQS</id>
     <description>Centaur DQ and DQS Drive Impedance. Initialized and used by HWPs.</description>
     <simpleType>
@@ -6521,26 +6489,26 @@ firmware notes: Used as override attribute for pstate procedure
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_DRV_IMP_DQ_DQS_SCHMOO</id>
-    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_RCV_IMP_DQ_DQS</id>
+    <description>Centaur DQ and DQS Receiver Impedance. Initialized and used by HWPs.</description>
     <simpleType>
-        <uint32_t>
+        <uint8_t>
             <default>0</default>
-        </uint32_t>
+        </uint8_t>
         <array>2</array>
     </simpleType>
     <persistency>volatile-zeroed</persistency>
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_DRV_IMP_DQ_DQS_SCHMOO</id>
+        <id>ATTR_EFF_CEN_RCV_IMP_DQ_DQS</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_DRV_IMP_CLK_SCHMOO</id>
-    <description>Enables for which impedance values can be used and tested in a timing test. 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>
@@ -6551,14 +6519,14 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_DRV_IMP_CLK_SCHMOO</id>
+        <id>ATTR_EFF_CEN_SLEW_RATE_DQ_DQS</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_DRV_IMP_SPCKE_SCHMOO</id>
-    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_SLEW_RATE_ADDR</id>
+    <description>Centaur Address Slew Rate. Initialized and used by HWPs.</description>
     <simpleType>
         <uint8_t>
             <default>0</default>
@@ -6569,14 +6537,14 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_DRV_IMP_SPCKE_SCHMOO</id>
+        <id>ATTR_EFF_CEN_SLEW_RATE_ADDR</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_DRV_IMP_CNTL_SCHMOO</id>
-    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_SLEW_RATE_CLK</id>
+    <description>Centaur Clock Slew Rate. Initialized and used by HWPs.</description>
     <simpleType>
         <uint8_t>
             <default>0</default>
@@ -6587,14 +6555,14 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_DRV_IMP_CNTL_SCHMOO</id>
+        <id>ATTR_EFF_CEN_SLEW_RATE_CLK</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_RCV_IMP_DQ_DQS</id>
-    <description>Centaur DQ and DQS Receiver Impedance. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_SLEW_RATE_SPCKE</id>
+    <description>Centaur Spare Clock Slew Rate. Initialized and used by HWPs.</description>
     <simpleType>
         <uint8_t>
             <default>0</default>
@@ -6605,14 +6573,32 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_RCV_IMP_DQ_DQS</id>
+        <id>ATTR_EFF_CEN_SLEW_RATE_SPCKE</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_RCV_IMP_DQ_DQS_SCHMOO</id>
-    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_SLEW_RATE_CNTL</id>
+    <description>Centaur Control Slew Rate. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+        <array>2</array>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_CEN_SLEW_RATE_CNTL</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>EFF_CEN_RD_VREF</id>
+    <description>Centaur Read Vref. Initialized and used by HWPs.</description>
     <simpleType>
         <uint32_t>
             <default>0</default>
@@ -6623,32 +6609,34 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_RCV_IMP_DQ_DQS_SCHMOO</id>
+        <id>ATTR_EFF_CEN_RD_VREF</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
+<!-- TODO RTC 69935 down to here -->
+
 <attribute>
-    <id>EFF_CEN_SLEW_RATE_DQ_DQS</id>
-    <description>Centaur DQ and DQS Slew Rate. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_DRV_IMP_DQ_DQS_SCHMOO</id>
+    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
     <simpleType>
-        <uint8_t>
+        <uint32_t>
             <default>0</default>
-        </uint8_t>
+        </uint32_t>
         <array>2</array>
     </simpleType>
     <persistency>volatile-zeroed</persistency>
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_SLEW_RATE_DQ_DQS</id>
+        <id>ATTR_EFF_CEN_DRV_IMP_DQ_DQS_SCHMOO</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_SLEW_RATE_ADDR</id>
-    <description>Centaur Address Slew Rate. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_DRV_IMP_CLK_SCHMOO</id>
+    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
     <simpleType>
         <uint8_t>
             <default>0</default>
@@ -6659,14 +6647,14 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_SLEW_RATE_ADDR</id>
+        <id>ATTR_EFF_CEN_DRV_IMP_CLK_SCHMOO</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_SLEW_RATE_CLK</id>
-    <description>Centaur Clock Slew Rate. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_DRV_IMP_SPCKE_SCHMOO</id>
+    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
     <simpleType>
         <uint8_t>
             <default>0</default>
@@ -6677,14 +6665,14 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_SLEW_RATE_CLK</id>
+        <id>ATTR_EFF_CEN_DRV_IMP_SPCKE_SCHMOO</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_SLEW_RATE_SPCKE</id>
-    <description>Centaur Spare Clock Slew Rate. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_DRV_IMP_CNTL_SCHMOO</id>
+    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
     <simpleType>
         <uint8_t>
             <default>0</default>
@@ -6695,25 +6683,25 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_SLEW_RATE_SPCKE</id>
+        <id>ATTR_EFF_CEN_DRV_IMP_CNTL_SCHMOO</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_SLEW_RATE_CNTL</id>
-    <description>Centaur Control Slew Rate. Initialized and used by HWPs.</description>
+    <id>EFF_CEN_RCV_IMP_DQ_DQS_SCHMOO</id>
+    <description>Enables for which impedance values can be used and tested in a timing test. Initialized and used by HWPs.</description>
     <simpleType>
-        <uint8_t>
+        <uint32_t>
             <default>0</default>
-        </uint8_t>
+        </uint32_t>
         <array>2</array>
     </simpleType>
     <persistency>volatile-zeroed</persistency>
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_SLEW_RATE_CNTL</id>
+        <id>ATTR_EFF_CEN_RCV_IMP_DQ_DQS_SCHMOO</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
@@ -6809,8 +6797,8 @@ firmware notes: Used as override attribute for pstate procedure
 </attribute>
 
 <attribute>
-    <id>EFF_CEN_RD_VREF</id>
-    <description>Centaur Read Vref. Initialized and used by HWPs.</description>
+    <id>EFF_DRAM_WR_VREF_SCHMOO</id>
+    <description>Enables for which VREF to use on the WR Schmoo. Initialized and used by HWPs.</description>
     <simpleType>
         <uint32_t>
             <default>0</default>
@@ -6821,7 +6809,25 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_EFF_CEN_RD_VREF</id>
+        <id>ATTR_EFF_DRAM_WR_VREF_SCHMOO</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>EFF_DRAM_WRDDR4_VREF_SCHMOO</id>
+    <description>Enables for which VREF to use on the WR Schmoo for DDR4. Initialized and used by HWPs.</description>
+    <simpleType>
+        <uint32_t>
+            <default>0</default>
+        </uint32_t>
+        <array>2</array>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_EFF_DRAM_WRDDR4_VREF_SCHMOO</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index e60c47904..5ca27259b 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -751,41 +751,45 @@
     <attribute><id>EFF_QUATERNARY_RANK_GROUP1</id></attribute>
     <attribute><id>EFF_QUATERNARY_RANK_GROUP2</id></attribute>
     <attribute><id>EFF_QUATERNARY_RANK_GROUP3</id></attribute>
-    <attribute><id>EFF_ODT_RD</id></attribute>
-    <attribute><id>EFF_ODT_WR</id></attribute>
     <attribute><id>EFF_CKE_MAP</id></attribute>
     <attribute><id>EFF_SPCKE_MAP</id></attribute>
     <attribute><id>EFF_DIMM_SPARE</id></attribute>
+<!-- TODO RTC 69935. These termination data attributes need to come from CDIMM
+     VPD. For now, they are setup by the mss_eff_config_termination HWP.
+     Remove these when valid vpd is on the CDIMMs  -->
     <attribute><id>EFF_DRAM_RON</id></attribute>
     <attribute><id>EFF_DRAM_RTT_NOM</id></attribute>
     <attribute><id>EFF_DRAM_RTT_WR</id></attribute>
+    <attribute><id>EFF_ODT_RD</id></attribute>
+    <attribute><id>EFF_ODT_WR</id></attribute>
     <attribute><id>EFF_DRAM_WR_VREF</id></attribute>
     <attribute><id>EFF_DRAM_WRDDR4_VREF</id></attribute>
-    <attribute><id>EFF_DRAM_WR_VREF_SCHMOO</id></attribute>
-    <attribute><id>EFF_DRAM_WRDDR4_VREF_SCHMOO</id></attribute>
+    <attribute><id>EFF_CEN_RCV_IMP_DQ_DQS</id></attribute>
     <attribute><id>EFF_CEN_DRV_IMP_DQ_DQS</id></attribute>
     <attribute><id>EFF_CEN_DRV_IMP_ADDR</id></attribute>
     <attribute><id>EFF_CEN_DRV_IMP_CNTL</id></attribute>
     <attribute><id>EFF_CEN_DRV_IMP_CLK</id></attribute>
     <attribute><id>EFF_CEN_DRV_IMP_SPCKE</id></attribute>
-    <attribute><id>EFF_CEN_DRV_IMP_DQ_DQS_SCHMOO</id></attribute>
-    <attribute><id>EFF_CEN_DRV_IMP_CLK_SCHMOO</id></attribute>
-    <attribute><id>EFF_CEN_DRV_IMP_SPCKE_SCHMOO</id></attribute>
-    <attribute><id>EFF_CEN_DRV_IMP_CNTL_SCHMOO</id></attribute>
-    <attribute><id>EFF_CEN_RCV_IMP_DQ_DQS</id></attribute>
-    <attribute><id>EFF_CEN_RCV_IMP_DQ_DQS_SCHMOO</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_DQ_DQS</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_ADDR</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_CLK</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_SPCKE</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_CNTL</id></attribute>
+    <attribute><id>EFF_CEN_RD_VREF</id></attribute>
+<!-- TODO RTC 69935. Down to here -->
+    <attribute><id>EFF_CEN_RD_VREF_SCHMOO</id></attribute>
+    <attribute><id>EFF_DRAM_WR_VREF_SCHMOO</id></attribute>
+    <attribute><id>EFF_DRAM_WRDDR4_VREF_SCHMOO</id></attribute>
+    <attribute><id>EFF_CEN_DRV_IMP_DQ_DQS_SCHMOO</id></attribute>
+    <attribute><id>EFF_CEN_DRV_IMP_CLK_SCHMOO</id></attribute>
+    <attribute><id>EFF_CEN_DRV_IMP_SPCKE_SCHMOO</id></attribute>
+    <attribute><id>EFF_CEN_DRV_IMP_CNTL_SCHMOO</id></attribute>
+    <attribute><id>EFF_CEN_RCV_IMP_DQ_DQS_SCHMOO</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_DQ_DQS_SCHMOO</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_CLK_SCHMOO</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_SPCKE_SCHMOO</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_ADDR_SCHMOO</id></attribute>
     <attribute><id>EFF_CEN_SLEW_RATE_CNTL_SCHMOO</id></attribute>
-    <attribute><id>EFF_CEN_RD_VREF</id></attribute>
-    <attribute><id>EFF_CEN_RD_VREF_SCHMOO</id></attribute>
     <attribute><id>EFF_DIMM_SIZE</id></attribute>
     <attribute><id>EFF_DRAM_BANKS</id></attribute>
     <attribute><id>EFF_DRAM_ROWS</id></attribute>