Attribute changes needed to call p9_setup_evid

Change-Id: I790f1813923abb3c9e57c74172506e9ac1f60d8b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26436
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 60 insertions, 9 deletions

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 140a010ae..3157c8ec9 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -19460,9 +19460,8 @@ DEPRECATED!!!!
         <id>ATTR_VDD_AVSBUS_BUSNUM</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
-    <persistency>volatile-zeroed</persistency>
+    <persistency>non-volatile</persistency>
     <readable/>
-    <writeable/>
 </attribute>
 
 <attribute>
@@ -19484,9 +19483,8 @@ DEPRECATED!!!!
         <id>ATTR_VDN_AVSBUS_BUSNUM</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
-    <persistency>volatile-zeroed</persistency>
+    <persistency>non-volatile</persistency>
     <readable/>
-    <writeable/>
 </attribute>
 
 <attribute>
@@ -19509,9 +19507,8 @@ DEPRECATED!!!!
         <id>ATTR_VDD_AVSBUS_RAIL</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
-    <persistency>volatile-zeroed</persistency>
+    <persistency>non-volatile</persistency>
     <readable/>
-    <writeable/>
 </attribute>
 
 <attribute>
@@ -19534,9 +19531,55 @@ DEPRECATED!!!!
         <id>ATTR_VDN_AVSBUS_RAIL</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
-    <persistency>volatile-zeroed</persistency>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
+
+<attribute>
+    <id>VCS_AVSBUS_RAIL</id>
+    <description>
+      Defines the AVSBus rail selector number (0 - 15) for the VCS VRM on the bus
+      defined by ATTR_AVSBUS_VCS_BUSNUM.
+
+      Producer:  Machine Readable Workbook
+      Consumers:
+      p9_set_avsbus_voltage (tool);
+                  p9_build_pstate_datablock ->
+                        Pstate Parameter Block (PSPB) for PGPE
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <hwpfToHbAttrMap>
+        <id>ATTR_VCS_AVSBUS_RAIL</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
+
+<attribute>
+    <id>VCS_AVSBUS_BUSNUM</id>
+    <description>
+      Defines the AVSBus (0 or 1) which has the core VCS rail VRM
+
+      Producer:  Machine Readable Workbook
+      Consumers: p9_set_evid;
+                p9_set_voltage (tool);
+                p9_build_pstate_datablock ->
+                        Pstate Parameter Block (PSPB) for PGPE
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <hwpfToHbAttrMap>
+        <id>ATTR_VCS_AVSBUS_BUSNUM</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+    <persistency>non-volatile</persistency>
     <readable/>
-    <writeable/>
 </attribute>
 
 <attribute>
@@ -21650,7 +21693,7 @@ DEPRECATED!!!!
   <simpleType>
     <uint32_t>
 <!--TODO RTC:151649 Remove default value when data is pulled from MVPD #V -->
-      <default>4800</default>
+        <default>4800</default>
     </uint32_t>
   </simpleType>
   <persistency>volatile</persistency>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 9afb0cb31..5de697b35 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -724,6 +724,7 @@
     <attribute><id>PFET_VCS_VOFF_SEL</id></attribute>
     <attribute><id>SYSTEM_IPL_PHASE</id></attribute>
     <attribute><id>FREQ_CORE_CEILING_MHZ</id></attribute>
+    <attribute><id>ULTRA_TURBO_FREQ_MHZ</id></attribute>
     <attribute><id>PROC_FABRIC_A_BUS_WIDTH</id></attribute>
     <attribute><id>PROC_FABRIC_X_BUS_WIDTH</id></attribute>
     <attribute><id>PROC_FABRIC_CCSM_MODE</id></attribute>
@@ -934,7 +935,14 @@
     <attribute><id>NODE_POS</id></attribute>
     <attribute><id>BOOT_FREQ</id></attribute>
     <attribute><id>VCS_BOOT_VOLTAGE</id></attribute>
+    <attribute><id>VDN_BOOT_VOLTAGE</id></attribute>
     <attribute><id>VDD_BOOT_VOLTAGE</id></attribute>
+    <attribute><id>VDD_AVSBUS_RAIL</id></attribute>
+    <attribute><id>VDD_AVSBUS_BUSNUM</id></attribute>
+    <attribute><id>VDN_AVSBUS_RAIL</id></attribute>
+    <attribute><id>VDN_AVSBUS_BUSNUM</id></attribute>
+    <attribute><id>VCS_AVSBUS_RAIL</id></attribute>
+    <attribute><id>VCS_AVSBUS_BUSNUM</id></attribute>
     <attribute><id>CHIP_POS</id></attribute>
     <attribute><id>CLOCK_PLL_MUX</id></attribute>
     <attribute><id>CLOCK_PLL_MUX0</id></attribute>