Add new WOF attributes to HB

Change-Id: I2044bcab1781e5f9e350fa81b50a118f5d35f819
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42407
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 229 insertions, 0 deletions

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 8ee6cb0f4..0a3d2f726 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -5445,6 +5445,51 @@ Supported values: 0x000 to spi_frame_size.  The actual number of bits captured i
 </attribute>
 
 <attribute>
+    <id>RESCLK_ENABLED</id>
+    <description>
+    Indicator that all relevant attributes and required data for
+    Resonant Clocking to be enabled is present and valid
+    FALSE=0, TRUE=1
+    Producer: p9_build_pstate_datablock
+    Consumers: p9_hcode_image_build ->
+                      PGPE Header
+                      CME Header
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_RESCLK_ENABLED</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>VDM_ENABLED</id>
+    <description>
+    Voltage Droop Monitors (VDM) to be enabled is present and valid
+    FALSE=0, TRUE=1
+    Producer: p9_build_pstate_datablock
+    Consumers: p9_hcode_image_build ->
+                      SGPE Header
+                      CME Header
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_VDM_ENABLED</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>IVRMS_ENABLED</id>
     <description>
      <!-- @todo RTC 173736 -->
@@ -5465,6 +5510,52 @@ Supported values: 0x000 to spi_frame_size.  The actual number of bits captured i
 </attribute>
 
 <attribute>
+    <id>IVRM_ENABLED</id>
+    <description>
+    Indicator that all relevant attributes and required data for
+    Internal Voltage Regulator Macros (IVRMs) to be enabled is present and valid
+    FALSE=0, TRUE=1
+    Producer: p9_build_pstate_datablock
+    Consumers: p9_hcode_image_build ->
+                      PGPE Header
+                      CME Header
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_IVRM_ENABLED</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>WOF_ENABLED</id>
+    <description>
+    Indicator that all relevent attributes and required data for
+    WOF to be enabled is present and valid
+    FALSE=0, TRUE=1
+    Producer: p9_build_pstate_datablock
+    Consumers: p9_hcode_image_build ->
+                      PGPE Header
+                      CME Header
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_WOF_ENABLED</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>PM_SPIPSS_INTER_FRAME_DELAY</id>
     <description>
       PROC_CHIP Attribute
@@ -20307,6 +20398,32 @@ Measured in GB</description>
 </attribute>
 
 <attribute>
+    <id>SYSTEM_IVRM_DISABLE</id>
+    <description>
+        Disables IVRM enablement in the system
+
+        Producer: Override
+
+        Consumers: p9_build_pstate_datablock ->
+                   Pstate Parameter Block (PSPB) for PGPE/OCC
+                   CME Quad Pstate Region (CQPR) for CM Quad Manager
+
+        Platform default:  OFF
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <hwpfToHbAttrMap>
+        <id>ATTR_SYSTEM_IVRM_DISABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
     <id>SYSTEM_WOF_ENABLED</id>
     <description>
       System control to allow Work Load Optimized Frequency (WOF)
@@ -20596,6 +20713,52 @@ Measured in GB</description>
 </attribute>
 
 <attribute>
+    <id>SYSTEM_PSTATES_MODE</id>
+    <description>
+      Controls the mode of Pstate Protocol for testing.
+        ON: Boots the PGPE in "OCC Pstate Mode" but does NOT start the Pstate
+        protocol
+
+        OFF:  Does NOT boot the PGPE
+        AUTO: Boots the PGPE and automatically starts the Pstate protocol.
+        PMCR operations to move Pstates are honored
+
+      Producer:  Override
+
+      Consumers:
+        p9_pstate_parameter_block and p9_pm_pstate_gpe_init
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <hwpfToHbAttrMap>
+        <id>ATTR_SYSTEM_PSTATES_MODE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<enumerationType>
+    <id>SYSTEM_PSTATES_MODE</id>
+    <description>Enumeration for Work Load Optimized Frequency</description>
+    <enumerator>
+        <name>ON</name>
+        <value>0x00</value>
+    </enumerator>
+    <enumerator>
+        <name>OFF</name>
+        <value>0x01</value>
+    </enumerator>
+    <enumerator>
+        <name>AUTO</name>
+        <value>0x02</value>
+    </enumerator>
+</enumerationType>
+
+<attribute>
     <id>SYSTEM_RESCLK_STEP_DELAY</id>
     <description>
       Minimum delay (in nanoseconds) between resonant clock transition steps
@@ -30735,6 +30898,40 @@ Measured in GB</description>
 </enumerationType>
 
 <attribute>
+    <id>SYSTEM_VDM_DISABLE</id>
+    <description>
+      Disables the enablement of Voltage Droop Monitors (VDM) in the system.
+
+      Producer:  Override
+
+      Consumers:
+        p9_pstate_parameter_block to clear flag for CME QuadManager Hcode
+            reaction
+    </description>
+    <simpleType><uint8_t></uint8_t></simpleType>
+    <readable/>
+    <writeable/>
+    <persistency>volatile-zeroed</persistency>
+    <hwpfToHbAttrMap>
+      <id>ATTR_SYSTEM_VDM_DISABLE</id>
+      <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<enumerationType>
+    <id>SYSTEM_VDM_DISABLE</id>
+    <description>Enumeration for Voltage Drop Monitor disable</description>
+    <enumerator>
+        <name>OFF</name>
+        <value>0x00</value>
+    </enumerator>
+    <enumerator>
+        <name>ON</name>
+        <value>0x01</value>
+    </enumerator>
+</enumerationType>
+
+<attribute>
     <id>DPLL_DYNAMIC_FMAX_ENABLE</id>
     <description>
     Allow increased dynamic frequency in response to excess voltage margin
@@ -33509,6 +33706,30 @@ Measured in GB</description>
 </attribute>
 
 <attribute>
+    <id>SYSTEM_RESCLK_DISABLE</id>
+    <description>
+      Disables the enablement of resonant clocking in the system.
+
+      Producer:  Override
+
+      Consumers:
+        p9_pstate_parameter_block to clear the flag for CME QuadManager Hcode
+            reaction
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_SYSTEM_RESCLK_DISABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>BAD_DQ_BITMAP</id>
     <description>
       Bad DQ bitmap from a controller point of view.
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 0e9ac7d6d..426cf7bf5 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -246,7 +246,11 @@
     <attribute><id>PM_SPIVID_MAX_RETRIES</id></attribute>
     <attribute><id>PROC_DPLL_DIVIDER</id></attribute>
     <attribute><id>PSTATES_ENABLED</id></attribute>
+    <attribute><id>RESCLK_ENABLED</id></attribute>
+    <attribute><id>VDM_ENABLED</id></attribute>
     <attribute><id>IVRMS_ENABLED</id></attribute>
+    <attribute><id>IVRM_ENABLED</id></attribute>
+    <attribute><id>WOF_ENABLED</id></attribute>
     <!-- End pm_hwp_attributes.xml -->
     <attribute><id>SKIP_HW_VREF_CAL</id></attribute>
     <attribute><id>SKIP_RD_VREF_VREFSENSE_OVERRIDE</id></attribute>
@@ -675,6 +679,7 @@
     <attribute><id>MSS_MRW_MAX_NUMBER_DIMMS_POSSIBLE_PER_VMEM_REGULATOR</id></attribute>
     <attribute><id>MSS_MRW_PERIODIC_MEMCAL_MODE_OPTIONS</id></attribute>
     <attribute><id>SYSTEM_IVRMS_ENABLED</id></attribute>
+    <attribute><id>SYSTEM_IVRM_DISABLE</id></attribute>
     <attribute><id>PM_SYSTEM_IVRM_VPD_MIN_LEVEL</id></attribute>
     <attribute><id>MRW_STRICT_MBA_PLUG_RULE_CHECKING</id></attribute>
     <attribute><id>MNFG_DMI_MIN_EYE_WIDTH</id></attribute>
@@ -915,9 +920,11 @@
     <attribute><id>WOF_POWER_LIMIT</id></attribute>
     <attribute><id>SYS_VFRT_STATIC_DATA_ENABLE</id></attribute>
     <attribute><id>WOF_TABLE_LID_NUMBER</id></attribute>
+    <attribute><id>SYSTEM_PSTATES_MODE</id></attribute>
     <attribute><id>AVSBUS_FREQUENCY</id></attribute>
     <attribute><id>PROC_FABRIC_ASYNC_SAFE_MODE</id></attribute>
     <attribute><id>VDM_ENABLE</id></attribute>
+    <attribute><id>SYSTEM_VDM_DISABLE</id></attribute>
     <attribute><id>STOP8_DISABLE</id></attribute>
     <attribute><id>STOP4_DISABLE</id></attribute>
     <attribute><id>STOP5_DISABLE</id></attribute>
@@ -941,6 +948,7 @@
     <attribute><id>IVRM_STEP_DELAY_NS</id></attribute>
     <attribute><id>IVRM_STABILIZATION_DELAY_NS</id></attribute>
     <attribute><id>SYSTEM_RESCLK_ENABLE</id></attribute>
+    <attribute><id>SYSTEM_RESCLK_DISABLE</id></attribute>
     <attribute><id>MSS_MRW_REFRESH_RATE_REQUEST</id></attribute>
     <attribute><id>MSS_MRW_TEMP_REFRESH_MODE</id></attribute>
     <attribute><id>MSS_VCCD_OVERRIDE</id></attribute>