Remove deprecated ATTR_MSS_VOLT and ATTR_VMEM_ID

Change-Id: I3c22c0da4889ca8804e619f3b2442be0b4c6eace
RTC:159848
CMVC-Prereq:1006706
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30893
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 1 insertions, 41 deletions

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index af74d2cd7..415fee7a3 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -6241,24 +6241,6 @@ firmware notes: Used as override attribute for pstate procedure
     <readable/>
 </attribute>
 
-<!-- TODO RTC:158505 - VMEM replaced with VDDR for consistency in P9 -->
-<attribute>
-    <id>VMEM_ID</id>
-    <description>Voltage Memory Rail Manager ID.  Currently HB only needs
-        to configured the Vmem voltage rail manager during the IPL.  The ID
-        is an arbitary value and needed as correlation token between HB and
-        HWSV.  It will be generated by the genHwsvMrwXml.pl.
-    </description>
-    <simpleType>
-        <uint16_t>
-            <default>0</default>
-        </uint16_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-</attribute>
-<!-- End of deprecated VMEM_ID -->
-
 <attribute>
     <id>VDDR_ID</id>
     <description>Voltage Memory Rail Manager ID.  Currently HB only needs
@@ -6800,26 +6782,6 @@ firmware notes: Used as override attribute for pstate procedure
     <hasStringConversion/>
 </attribute>
 
-<!-- TODO RTC:158505 - deprecated until hwsv updated -->
-<attribute>
-    <id>MSS_VOLT</id><!-- deprecated for MSS_VOLT_VDDR_MILLIVOLTS -->
-    <description>
-      DRAM Voltage, each voltage rail would need to have a value.
-      Computed in mss_volt C code - in millivolts
-      creator: mss_volt
-      consumer: mss_eff_cnfg, others
-      firmware notes: none
-    </description>
-    <simpleType>
-        <uint64_t>
-        </uint64_t>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-</attribute>
-<!-- END OF DEPRECATED -->
-
 <attribute>
     <id>MSS_VOLT_VDDR_MILLIVOLTS</id>
     <description>
@@ -17884,7 +17846,7 @@ Measured in GB</description>
 
 <attribute>
     <id>EFF_DIMM_DDR4_RC11</id>
-    <description>Operating Voltage VDD and VrefCA Source Control Word; Read from ATTR_MSS_VOLT.
+    <description>Operating Voltage VDD and VrefCA Source Control Word; Read from ATTR_MSS_VOLT_VDDR_MILLIVOLTS.
                  Default value - 14. Values Range from 00 to 15 decimal.  No need to calculate; User can override with desired experimental value.
                  creator: mss_eff_cnfg
                  consumer: mss_dram_init
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 08da80145..574c0c905 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -1848,8 +1848,6 @@
     <attribute><id>MSS_NEST_CAPABLE_FREQUENCIES</id></attribute>
     <attribute><id>CDM_DOMAIN</id><default>MEM</default></attribute>
 
-    <attribute><id>MSS_VOLT</id></attribute><!-- deprecated -->
-
 <!-- Enable memory voltage attributes -->
 <!-- Static voltages -->
     <attribute><id>MSS_VOLT_VPP_MILLIVOLTS</id></attribute>