PM plat attribute cleanup

Change-Id: I7a2006d0c08028211637cf9547a272b72b562510
RTC:161900
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32121
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 161 insertions, 344 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index d493962e4..208e47340 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -228,7 +228,9 @@ my $system_policy_file = open_mrw_file($mrwdir, "${sysname}-system-policy.xml");
 my $sysPolicy = parse_xml_file($system_policy_file,
         forcearray=>['proc_r_loadline_vdd','proc_r_distloss_vdd',
         'proc_vrm_voffset_vdd','proc_r_loadline_vcs',
-        'proc_r_distloss_vcs','proc_vrm_voffset_vcs']);
+        'proc_r_distloss_vcs','proc_vrm_voffset_vcs',
+        'proc_r_loadline_vdn','proc_r_distloss_vdn',
+        'proc_vrm_voffset_vdn']);
 
 my $reqPol = $sysPolicy->{"required-policy-settings"};
 
@@ -344,6 +346,10 @@ push @systemAttr,
     "CP_REFCLOCK_RCVR_TERM", $reqPol->{'processor-refclock-receiver-termination'},
     "IO_REFCLOCK_RCVR_TERM", $reqPol->{'pci-refclock-receiver-termination'},
     #TODO RTC: 163418 Set Power Management Attribute Defaults based on MRW values
+    "SYSTEM_WOF_ENABLED", $reqPol->{'system_wof_enabled'},
+    "VDM_ENABLE", $reqPol->{'vdm_enable'},
+    "IVRM_DEADZONE_MV", $reqPol->{'ivrm_deadzone_mv'},
+    "SYSTEM_RESCLK_STEP_DELAY", $reqPol->{'system_resclk_step_delay'},
 ];
 
 if ($reqPol->{'mss_mrw_refresh_rate_request'} eq 'SINGLE')
@@ -514,6 +520,12 @@ $procLoadline{PROC_R_DISTLOSS_VCS_UOHM}{sys}
     = $reqPol->{'proc_r_distloss_vcs' }[0];
 $procLoadline{PROC_VRM_VOFFSET_VCS_UV}{sys}
     = $reqPol->{'proc_vrm_voffset_vcs'}[0];
+$procLoadline{PROC_R_LOADLINE_VDN_UOHM}{sys}
+    = $reqPol->{'proc_r_loadline_vdn' }[0];
+$procLoadline{PROC_R_DISTLOSS_VDN_UOHM}{sys}
+    = $reqPol->{'proc_r_distloss_vdn' }[0];
+$procLoadline{PROC_VRM_VOFFSET_VDN_UV}{sys}
+    = $reqPol->{'proc_vrm_voffset_vdn'}[0];
 
 #Save avsbus data to add to proc target type later
 our %voltageRails = (
@@ -686,7 +698,7 @@ foreach my $i (@{$pmSettings->{'processor-settings'}})
         "PM_UNDERVOLTING_FREQ_MAXIMUM",
             $i->{pm_undervolting_frq_maximum}->{content},
         "PM_SPIVID_PORT_ENABLE", $i->{pm_spivid_port_enable},
-        "APSS_CHIP_SELECT", $i->{pm_apss_chip_select},
+        "PM_APSS_CHIP_SELECT", $i->{pm_apss_chip_select},
         $pbaxAttr, $pbaxId,
         "PBAX_CHIPID", $i->{pm_pbax_chipid},
         "PBAX_BRDCST_ID_VECTOR", $i->{pm_pbax_brdcst_id_vector},
@@ -4022,8 +4034,6 @@ sub generate_proc
         }
         print "    </attribute>\n";
         print "    <attribute>\n";
-        # Remove duplicate when fixed in HWP
-        print "        <id>APSS_CHIP_SELECT</id>\n";
         print "        <id>PM_APSS_CHIP_SELECT</id>\n";
         if( $proc % 2 == 0 ) # proc0 of DCM
         {
@@ -4158,6 +4168,37 @@ sub generate_proc
     print "        <default>$obus_ratio</default>\n";
     print "    </attribute>\n";
 
+    my $freq_regions      = $reqPol->{'system_resclk_freq_regions'};
+    my $freq_region_index = $reqPol->{'system_resclk_freq_region_index'};
+    my $l3_value          = $reqPol->{'system_resclk_l3_value'};
+    my $l3_voltage_thresh = $reqPol->{'system_resclk_l3_voltage_threshold_mv'};
+    my $resclk_value      = $reqPol->{'system_resclk_value'};
+
+    print "    <attribute>\n";
+    print "        <id>SYSTEM_RESCLK_FREQ_REGIONS</id>\n";
+    print "        <default>$freq_regions</default>\n";
+    print "    </attribute>\n";
+
+    print "    <attribute>\n";
+    print "        <id>SYSTEM_RESCLK_FREQ_REGION_INDEX</id>\n";
+    print "        <default>$freq_region_index</default>\n";
+    print "    </attribute>\n";
+
+    print "    <attribute>\n";
+    print "        <id>SYSTEM_RESCLK_L3_VALUE</id>\n";
+    print "        <default>$l3_value</default>\n";
+    print "    </attribute>\n";
+
+    print "    <attribute>\n";
+    print "        <id>SYSTEM_RESCLK_L3_VOLTAGE_THRESHOLD_MV</id>\n";
+    print "        <default>$l3_voltage_thresh</default>\n";
+    print "    </attribute>\n";
+
+    print "    <attribute>\n";
+    print "        <id>SYSTEM_RESCLK_VALUE</id>\n";
+    print "        <default>$resclk_value</default>\n";
+    print "    </attribute>\n";
+
     print "</targetInstance>\n";
 
 }
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 84248f704..29e25270b 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -5585,7 +5585,7 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
+<!-- TODO RTC:162070 Temporary default -->
             <default>0</default>
         </uint8_t>
     </simpleType>
@@ -18874,7 +18874,6 @@ Measured in GB</description>
     <readable/>
 </attribute>
 
-<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_POWERUP_DELAY_NS</id>
     <description>
@@ -18883,7 +18882,7 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
+            <!-- Will be set by HWP -->
             <default>0</default>
         </uint32_t>
     </simpleType>
@@ -19217,7 +19216,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
             <default>0</default>
         </uint8_t>
     </simpleType>
@@ -19304,33 +19302,13 @@ Measured in GB</description>
     <readable/>
 </attribute>
 
-<!-- removed duplicate when fixed in HWP -->
-<attribute>
-    <id>APSS_CHIP_SELECT</id>
-    <description>
-      Defines which of the PSS chip selects (0 or 1) that the APSS is connected
-
-      Provided by the Machine Readable Workbook.
-      Consumer: p8_pss_init
-    </description>
-    <simpleType>
-        <uint8_t>
-        </uint8_t>
-    </simpleType>
-    <hwpfToHbAttrMap>
-        <id>ATTR_APSS_CHIP_SELECT</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-    <persistency>non-volatile</persistency>
-    <readable/>
-</attribute>
 <attribute>
     <id>PM_APSS_CHIP_SELECT</id>
     <description>
       Defines which of the PSS chip selects (0 or 1) that the APSS is connected
 
       Provided by the Machine Readable Workbook.
-      Consumer: p8_pss_init
+      Consumer: p9_pm_pss_init
     </description>
     <simpleType>
         <uint8_t>
@@ -19345,8 +19323,8 @@ Measured in GB</description>
 </attribute>
 
 <enumerationType>
-    <id>APSS_CHIP_SELECT</id>
-    <description>Enumeration indicating the ATTR_APSS_CHIP_SELECT</description>
+    <id>PM_APSS_CHIP_SELECT</id>
+    <description>Enumeration for the ATTR_PM_APSS_CHIP_SELECT</description>
     <enumerator>
         <name>NONE</name>
         <value>0xFF</value>
@@ -19778,10 +19756,9 @@ Measured in GB</description>
       Platform default:   FALSE
     </description>
     <simpleType>
-        <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0</default>
-        </uint8_t>
+      <enumeration>
+        <id>SYSTEM_WOF_ENABLED</id>
+      </enumeration>
     </simpleType>
     <hwpfToHbAttrMap>
         <id>ATTR_SYSTEM_WOF_ENABLED</id>
@@ -19792,6 +19769,19 @@ Measured in GB</description>
     <writeable/>
 </attribute>
 
+<enumerationType>
+    <id>SYSTEM_WOF_ENABLED</id>
+    <description>Enumeration for Work Load Optimized Frequency</description>
+    <enumerator>
+        <name>OFF</name>
+        <value>0x00</value>
+    </enumerator>
+    <enumerator>
+        <name>ON</name>
+        <value>0x01</value>
+    </enumerator>
+</enumerationType>
+
 <attribute>
     <id>SYSTEM_RESCLK_STEP_DELAY</id>
     <description>
@@ -19806,8 +19796,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint16_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0x32</default>
         </uint16_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -19843,7 +19831,6 @@ Measured in GB</description>
     <writeable/>
 </attribute>-->
 
-<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_POWERDOWN_DELAY_NS</id>
     <description>
@@ -19858,7 +19845,7 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
+            <!-- Will be set by HWP -->
             <default>0</default>
         </uint32_t>
     </simpleType>
@@ -19870,7 +19857,6 @@ Measured in GB</description>
     <readable/>
 </attribute>
 
-<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_VDD_VOFF_SEL</id>
     <description>
@@ -19884,7 +19870,7 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
+            <!-- Will be set by HWP -->
             <default>0</default>
         </uint8_t>
     </simpleType>
@@ -19940,7 +19926,6 @@ Measured in GB</description>
     </enumerator>
 </enumerationType>
 
-<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_VCS_VOFF_SEL</id>
     <description>
@@ -19954,7 +19939,7 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
+            <!-- Will be set by HWP -->
             <default>0</default>
         </uint8_t>
     </simpleType>
@@ -20020,7 +20005,7 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
+<!-- TODO RTC:162070 Temporary default -->
             <default>0</default>
         </uint8_t>
     </simpleType>
@@ -20045,7 +20030,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
             <default>0</default>
         </uint8_t>
     </simpleType>
@@ -22675,7 +22659,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
             <default>0</default>
         </uint8_t>
     </simpleType>
@@ -22694,7 +22677,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
             <default>1</default>
         </uint8_t>
     </simpleType>
@@ -29624,6 +29606,7 @@ Measured in GB</description>
     <id>VDM_ENABLE</id>
     <description>
     Controls the enablement of Voltage Droop Monitors (VDM) in the system.
+    OFF = 0x00, ON = 0x01
 
     Producer:  Machine Readable Workbook
 
@@ -29633,10 +29616,9 @@ Measured in GB</description>
     p9_hcd_cache procedures to power on VDMs before CME booting
     </description>
     <simpleType>
-        <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0</default>
-        </uint8_t>
+      <enumeration>
+        <id>VDM_ENABLE</id>
+      </enumeration>
     </simpleType>
     <readable/>
     <persistency>non-volatile</persistency>
@@ -29646,6 +29628,19 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
+<enumerationType>
+    <id>VDM_ENABLE</id>
+    <description>Enumeration for Voltage Drop Monitor enable</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>
@@ -30545,8 +30540,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0</default>
         </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
@@ -30571,8 +30564,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0x28</default>
         </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
@@ -30597,8 +30588,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0</default>
         </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
@@ -30684,268 +30673,6 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
-<!-- RTC:162051 Remove when fixed in hwsv  -->
-<attribute>
-    <id>PROC_R_LOADLINE_VDD</id>
-    <description>
-
-      Impedance (binary microOhms) of the load
-      line from a processor VDD VRM to the
-      Processor Module pins.  This value is
-      applied to each processor instance.
-
-      Producer: Machine Readable Workbook (per the power subsystem design)
-
-      Consumers: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_R_LOADLINE_VDD</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_R_DISTLOSS_VDD</id>
-    <description>
-
-      Impedance (binary in microOhms) of the
-      VDD distribution loss sense point
-      to the circuit. This value is applied
-      to each processor instance.
-
-      Producer: Machine Readable Workbook (per the power subsystem design)
-
-      Consumers: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_R_DISTLOSS_VDD</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_VRM_VOFFSET_VDD</id>
-    <description>
-
-      Offset voltage (binary in microvolts) to
-      apply to the VDD VRM distribution
-      to the processor module.  This value is
-      applied to each processor instance.
-
-      Note:  no loadline may be present in the
-      system; thus, a value of 0 is
-      legal.
-
-      Producer: Machine Readable Workbook (per the power subsystem design)
-
-      Consumers: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_VRM_VOFFSET_VDD</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_R_LOADLINE_VDN</id>
-    <description>
-
-      Impedance (binary microOhms) of the load
-      line from a processor VDN VRM to
-      the Processor Module pins.  This value is
-      applied to each processor
-      instance.
-
-      Note:  no loadline may be present in
-      the system; thus, a value of 0 is
-      legal.
-
-      Producer: Machine Readable Workbook (per the power subsystem design)
-
-      Consumers: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0</default>
-        </uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_R_LOADLINE_VDN</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_R_DISTLOSS_VDN</id>
-    <description>
-
-      Impedance (binary in microOhms) of the VDN
-      distribution loss sense point
-      to the circuit. This value is applied to
-      each processor instance.
-
-      Producer: Machine Readable Workbook (per the power subsystem design)
-
-      Consumers: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0x28</default>
-        </uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_R_DISTLOSS_VDN</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_VRM_VOFFSET_VDN</id>
-    <description>
-
-      Offset voltage (binary in microvolts) to apply
-      to the VDN VRM distribution
-      to the processor module.  This value is applied
-      to each processor instance.
-
-      Producer: Machine Readable Workbook (per the power subsystem design)
-
-      Consumers: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0</default>
-        </uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_VRM_VOFFSET_VDN</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_R_LOADLINE_VCS</id>
-    <description>
-
-      Impedance (binary microOhms) of the load
-      line from a processor VCS VRM to
-      the Processor Module pins.  This value is
-      applied to each processor
-      instance.
-
-      Note:  no loadline may be present in the
-      system; thus, a value of 0 is
-      legal.
-
-      Producer: Machine Readable Workbook (per the power subsystem design)
-
-      Consumers: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_R_LOADLINE_VCS</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_R_DISTLOSS_VCS</id>
-    <description>
-
-      Impedance (binary in microOhms) of the
-      VCS distribution loss sense point
-      to the circuit. This value is applied
-      to each processor instance.
-
-      Producer:  Machine Readable Workbook
-      (via the power subsystem design per
-      system)
-
-      Consumer: p9_pstate_parameter_block
-
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_R_DISTLOSS_VCS</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_VRM_VOFFSET_VCS</id>
-    <description>
-
-      Offset voltage (binary in microvolts) to apply
-      to the VCS VRM distribution
-      to the processor module.  This value is applied
-      to each processor instance.
-
-      Producer:  Machine Readable Workbook
-      (via the power subsystem design per
-      system)
-
-      Consumer: FSP
-
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_VRM_VOFFSET_VCS</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-<!-- End RTC:162051 remove -->
 
 <attribute>
     <id>FREQ_BIAS_ULTRATURBO</id>
@@ -31504,8 +31231,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:161900 Temporary default -->
-            <default>0x32</default>
         </uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
@@ -31525,7 +31250,7 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
-<!-- TODO RTC:161900 Temporary default -->
+<!-- TODO RTC:162072 Temporary default -->
             <default>0</default>
         </uint32_t>
     </simpleType>
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index be22c9b8f..12fdb8299 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -139,6 +139,22 @@
     <id>MSS_MRW_MAX_DRAM_DATABUS_UTIL</id>
     <default>10000</default>
     </attribute>
+    <attribute>
+        <id>SYSTEM_WOF_ENABLED</id>
+        <default>OFF</default>
+    </attribute>
+    <attribute>
+        <id>VDM_ENABLE</id>
+        <default>OFF</default>
+    </attribute>
+    <attribute>
+        <id>IVRM_DEADZONE_MV</id>
+        <default>0x32</default>
+    </attribute>
+    <attribute>
+        <id>SYSTEM_RESCLK_STEP_DELAY</id>
+        <default>0x32</default>
+    </attribute>
 </targetInstance>
 
 <!-- System node 0 -->
@@ -5354,7 +5370,7 @@
         <default>0x0</default>
     </attribute>
     <attribute>
-        <id>APSS_CHIP_SELECT</id>
+        <id>PM_APSS_CHIP_SELECT</id>
         <default>0xff</default>
     </attribute>
     <attribute>
@@ -5395,11 +5411,7 @@
     </attribute>
     <!-- End PM_ attributes -->
     <attribute>
-        <id>PROC_R_DISTLOSS_VCS_UOHM</id>
-        <default>0x578</default>
-    </attribute>
-    <attribute>
-        <id>PROC_R_LOADLINE_VCS_UOHM</id>
+        <id>PROC_R_LOADLINE_VDD_UOHM</id>
         <default>0x23A</default>
     </attribute>
     <attribute>
@@ -5407,17 +5419,61 @@
         <default>0x96</default>
     </attribute>
     <attribute>
-        <id>PROC_R_LOADLINE_VDD_UOHM</id>
+        <id>PROC_VRM_VOFFSET_VDD_UV</id>
+        <default>0x0</default>
+    </attribute>
+    <attribute>
+        <id>PROC_R_LOADLINE_VCS_UOHM</id>
         <default>0x23A</default>
     </attribute>
     <attribute>
+        <id>PROC_R_DISTLOSS_VCS_UOHM</id>
+        <default>0x578</default>
+    </attribute>
+    <attribute>
         <id>PROC_VRM_VOFFSET_VCS_UV</id>
         <default>0x0</default>
     </attribute>
     <attribute>
-        <id>PROC_VRM_VOFFSET_VDD_UV</id>
+        <id>PROC_R_LOADLINE_VDN_UOHM</id>
+        <default>0x0</default>
+    </attribute>
+    <attribute>
+        <id>PROC_R_DISTLOSS_VDN_UOHM</id>
+        <default>0x28</default>
+    </attribute>
+    <attribute>
+        <id>PROC_VRM_VOFFSET_VDN_UV</id>
         <default>0x0</default>
     </attribute>
+    <attribute>
+        <id>SYSTEM_RESCLK_FREQ_REGIONS</id>
+        <default>0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0</default>
+    </attribute>
+    <attribute>
+        <id>SYSTEM_RESCLK_FREQ_REGION_INDEX</id>
+        <default>0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0</default>
+    </attribute>
+    <attribute>
+        <id>SYSTEM_RESCLK_L3_VALUE</id>
+        <default>0x0,0x0,0x0,0x0</default>
+    </attribute>
+    <attribute>
+        <id>SYSTEM_RESCLK_L3_VOLTAGE_THRESHOLD_MV</id>
+        <default>0x2BC</default>
+    </attribute>
+    <attribute>
+        <id>SYSTEM_RESCLK_VALUE</id>
+        <default>0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+                 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+                 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+                 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+                 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+                 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+                 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+                 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0
+        </default>
+    </attribute>
 
 </targetInstance>
 
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 60bec5611..5a866e31a 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -155,8 +155,6 @@
     <attribute><id>PM_UNDERVOLTING_FRQ_MINIMUM</id></attribute>
     <attribute><id>PM_UNDERVOLTING_FREQ_MAXIMUM</id></attribute>
     <attribute><id>PM_SPIVID_PORT_ENABLE</id></attribute>
-    <!-- remove duplicate when fixed in HWP -->
-    <attribute><id>APSS_CHIP_SELECT</id></attribute>
     <attribute><id>PM_APSS_CHIP_SELECT</id></attribute>
     <attribute><id>PM_PBAX_NODEID</id></attribute>
     <attribute><id>PBAX_GROUPID</id></attribute>
@@ -283,17 +281,6 @@
     <attribute><id>PROC_R_LOADLINE_VCS_UOHM</id></attribute>
     <attribute><id>PROC_R_DISTLOSS_VCS_UOHM</id></attribute>
     <attribute><id>PROC_VRM_VOFFSET_VCS_UV</id></attribute>
-<!-- Remove when fixed in hwsv -->
-    <attribute><id>PROC_R_LOADLINE_VDD</id></attribute>
-    <attribute><id>PROC_R_DISTLOSS_VDD</id></attribute>
-    <attribute><id>PROC_VRM_VOFFSET_VDD</id></attribute>
-    <attribute><id>PROC_R_LOADLINE_VDN</id></attribute>
-    <attribute><id>PROC_R_DISTLOSS_VDN</id></attribute>
-    <attribute><id>PROC_VRM_VOFFSET_VDN</id></attribute>
-    <attribute><id>PROC_R_LOADLINE_VCS</id></attribute>
-    <attribute><id>PROC_R_DISTLOSS_VCS</id></attribute>
-    <attribute><id>PROC_VRM_VOFFSET_VCS</id></attribute>
-<!-- End remove -->
     <attribute><id>ICACHE_LINE_SIZE</id></attribute>
     <attribute><id>ICACHE_ASSOC_SETS</id></attribute>
     <attribute><id>ICACHE_SIZE</id></attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
index ff6e2c514..f7cb3dc58 100644
--- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
@@ -147,6 +147,14 @@
     <id>MSS_MRW_MAX_DRAM_DATABUS_UTIL</id>
     <default>10000</default>
     </attribute>
+    <attribute>
+        <id>SYSTEM_WOF_ENABLED</id>
+        <default>OFF</default>
+    </attribute>
+    <attribute>
+        <id>VDM_ENABLE</id>
+        <default>OFF</default>
+    </attribute>
 </targetInstance>
 
 <!-- System node 0 -->
@@ -5353,7 +5361,7 @@
         <default>0x0</default>
     </attribute>
     <attribute>
-        <id>APSS_CHIP_SELECT</id>
+        <id>PM_APSS_CHIP_SELECT</id>
         <default>0xff</default>
     </attribute>
     <attribute>