pm_plat_attribute.xml review changes

Change-Id: I50e7243901bc9bb17090054a570fe49d6ca2dc3c
RTC:161058
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30586
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@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: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 424 insertions, 321 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 4809472a8..85ba0600a 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -227,8 +227,8 @@ my $mruAttr = parse_xml_file($mru_ids_file);
 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_vrm_voffset_vdd','proc_r_loadline_vcs',
+        'proc_r_distloss_vcs','proc_vrm_voffset_vcs']);
 
 my $reqPol = $sysPolicy->{"required-policy-settings"};
 
@@ -265,8 +265,8 @@ push @systemAttr,
     "DMI_EREPAIR_THRESHOLD_MNFG", $reqPol->{'dmi-erepair-threshold-mnfg'},
     "MSS_MRW_THERMAL_MEMORY_POWER_LIMIT", $reqPol->{'thermal_memory_power_limit'},
     "MSS_MBA_ADDR_INTERLEAVE_BIT", $reqPol->{'mss_mba_addr_interleave_bit'},
-    "PM_EXTERNAL_VRM_STEPSIZE", $reqPol->{'pm_external_vrm_stepsize'},
-    "PM_EXTERNAL_VRM_STEPDELAY", $reqPol->{'pm_external_vrm_stepdelay'},
+    "EXTERNAL_VRM_STEPSIZE", $reqPol->{'pm_external_vrm_stepsize'},
+    "EXTERNAL_VRM_STEPDELAY", $reqPol->{'pm_external_vrm_stepdelay'},
     "PM_SPIVID_FREQUENCY", $reqPol->{'pm_spivid_frequency'}->{content},
     "PM_SAFE_FREQUENCY", $reqPol->{'pm_safe_frequency'}->{content},
     "PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY",
@@ -280,7 +280,7 @@ push @systemAttr,
         $reqPol->{'pm_resonant_clock_high_band_lower_frequency'}->{content},
     "PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY",
         $reqPol->{'pm_resonant_clock_high_band_upper_frequency'}->{content},
-    "PM_SPIPSS_FREQUENCY", $reqPol->{'pm_spipss_frequency'}->{content},
+    "SPIPSS_FREQUENCY", $reqPol->{'pm_spipss_frequency'}->{content},
     "MEM_MIRROR_PLACEMENT_POLICY", $placement,
     "MSS_MRW_DIMM_POWER_CURVE_PERCENT_UPLIFT",
         $reqPol->{'dimm_power_curve_percent_uplift'},
@@ -292,7 +292,7 @@ push @systemAttr,
         $reqPol->{'max_dram_databus_util'},
     "MSS_MRW_MAX_NUMBER_DIMMS_POSSIBLE_PER_VMEM_REGULATOR",
         $reqPol->{'max_number_dimms_possible_per_vmem_regulator'},
-    "PM_SYSTEM_IVRMS_ENABLED", $reqPol->{'pm_system_ivrms_enabled'},
+    "SYSTEM_IVRMS_ENABLED", $reqPol->{'pm_system_ivrms_enabled'},
     "PM_SYSTEM_IVRM_VPD_MIN_LEVEL", $reqPol->{'pm_system_ivrm_vpd_min_level'},
     "MNFG_DMI_MIN_EYE_WIDTH", $reqPol->{'mnfg-dmi-min-eye-width'},
     "MNFG_DMI_MIN_EYE_HEIGHT", $reqPol->{'mnfg-dmi-min-eye-height'},
@@ -425,12 +425,18 @@ for my $domain (keys %domainProgram)
 
 
 my %procLoadline = ();
-$procLoadline{PROC_R_LOADLINE_VDD}{sys}  = $reqPol->{'proc_r_loadline_vdd' }[0];
-$procLoadline{PROC_R_DISTLOSS_VDD}{sys}  = $reqPol->{'proc_r_distloss_vdd' }[0];
-$procLoadline{PROC_VRM_VOFFSET_VDD}{sys} = $reqPol->{'proc_vrm_voffset_vdd'}[0];
-$procLoadline{PROC_R_LOADLINE_VCS}{sys}  = $reqPol->{'proc_r_loadline_vcs' }[0];
-$procLoadline{PROC_R_DISTLOSS_VCS}{sys}  = $reqPol->{'proc_r_distloss_vcs' }[0];
-$procLoadline{PROC_VRM_VOFFSET_VCS}{sys} = $reqPol->{'proc_vrm_voffset_vcs'}[0];
+$procLoadline{PROC_R_LOADLINE_VDD_UOHM}{sys}
+    = $reqPol->{'proc_r_loadline_vdd' }[0];
+$procLoadline{PROC_R_DISTLOSS_VDD_UOHM}{sys}
+    = $reqPol->{'proc_r_distloss_vdd' }[0];
+$procLoadline{PROC_VRM_VOFFSET_VDD_UV}{sys}
+    = $reqPol->{'proc_vrm_voffset_vdd'}[0];
+$procLoadline{PROC_R_LOADLINE_VCS_UOHM}{sys}
+    = $reqPol->{'proc_r_loadline_vcs' }[0];
+$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];
 
 #Save avsbus data to add to proc target type later
 our %voltageRails = (
@@ -579,9 +585,22 @@ my $pmSettings = parse_xml_file($pm_settings_file,
                        forcearray=>['processor-settings']);
 
 my @pmChipAttr; # Repeated [NODE, POS, ATTR, VAL, ATTR, VAL, ATTR, VAL...]
+my $pbaxAttr;
+my $pbaxId;
 
 foreach my $i (@{$pmSettings->{'processor-settings'}})
 {
+    if(exists $i->{pm_pbax_groupid})
+    {
+        $pbaxAttr = "PBAX_GROUPID";
+        $pbaxId = $i->{pm_pbax_groupid};
+    }
+    else
+    {
+        $pbaxAttr = "PBAX_GROUPID";
+        $pbaxId = $i->{pm_pbax_nodeid};
+    }
+
     push @pmChipAttr,
     [
         $i->{target}->{node}, $i->{target}->{position},
@@ -590,17 +609,17 @@ 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},
-        "PM_APSS_CHIP_SELECT", $i->{pm_apss_chip_select},
-        "PM_PBAX_NODEID", $i->{pm_pbax_nodeid},
-        "PM_PBAX_CHIPID", $i->{pm_pbax_chipid},
-        "PM_PBAX_BRDCST_ID_VECTOR", $i->{pm_pbax_brdcst_id_vector},
+        "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},
         "PM_SLEEP_ENTRY", $i->{pm_sleep_entry},
         "PM_SLEEP_EXIT", $i->{pm_sleep_exit},
         "PM_SLEEP_TYPE", $i->{pm_sleep_type},
         "PM_WINKLE_ENTRY", $i->{pm_winkle_entry},
         "PM_WINKLE_EXIT", $i->{pm_winkle_exit},
-        "PM_WINKLE_TYPE", $i->{pm_winkle_type},
-    ]
+        "PM_WINKLE_TYPE", $i->{pm_winkle_type}
+    ];
 }
 
 my @SortedPmChipAttr = sort byNodePos @pmChipAttr;
@@ -3905,6 +3924,8 @@ 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
         {
@@ -3920,11 +3941,11 @@ sub generate_proc
         print "        <default>0</default>\n";
         print "    </attribute>\n";
         print "    <attribute>\n";
-        print "        <id>PM_PBAX_CHIPID</id>\n";
+        print "        <id>PBAX_CHIPID</id>\n";
         print "        <default>$logid</default>\n";
         print "    </attribute>\n";
         print "    <attribute>\n";
-        print "        <id>PM_PBAX_BRDCST_ID_VECTOR</id>\n";
+        print "        <id>PBAX_BRDCST_ID_VECTOR</id>\n";
         print "        <default>$lognode</default>\n";
         print "    </attribute>\n";
         print "    <attribute>\n";
@@ -4006,7 +4027,7 @@ sub generate_proc
         if(index($attr, "VRM_VOFFSET" ) != -1)
         {
             print "    <attribute>\n";
-            print "        <id>".$attr."_UV</id>\n";
+            print "        <id>".$attr."</id>\n";
             print "        <default>$val</default>\n";
             print "    </attribute>\n";
         }
@@ -4014,7 +4035,7 @@ sub generate_proc
         else
         {
             print "    <attribute>\n";
-            print "        <id>".$attr."_UOHM</id>\n";
+            print "        <id>".$attr."</id>\n";
             print "        <default>$val</default>\n";
             print "    </attribute>\n";
         }
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index a87ac8c69..640c6c521 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -5333,7 +5333,7 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
 <!-- Support for pm_plat_attributes.xml -->
 
 <attribute>
-    <id>PM_EXTERNAL_VRM_STEPSIZE</id>
+    <id>EXTERNAL_VRM_STEPSIZE</id>
     <description>
       SYSTEM Attribute
       Step size (binary in microvolts) to take upon external VRM voltage
@@ -5351,13 +5351,13 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
     <persistency>non-volatile</persistency>
     <readable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_PM_EXTERNAL_VRM_STEPSIZE</id>
+        <id>ATTR_EXTERNAL_VRM_STEPSIZE</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>PM_EXTERNAL_VRM_STEPDELAY</id>
+    <id>EXTERNAL_VRM_STEPDELAY</id>
     <description>
       SYSTEM Attribute
       Step delay (binary in microseconds) after a voltage change
@@ -5372,7 +5372,7 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
     <persistency>non-volatile</persistency>
     <readable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_PM_EXTERNAL_VRM_STEPDELAY</id>
+        <id>ATTR_EXTERNAL_VRM_STEPDELAY</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
@@ -5554,48 +5554,6 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
 </attribute>
 
 <attribute>
-    <id>PM_SPIPSS_FREQUENCY</id>
-    <description>
-      SYSTEM Attribute
-      SPIPSS Clock Frequency (binary in MHz)
-
-      Valid range: 0.5MHz to 25MHz
-
-      Consumer: proc_pmc_init
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PM_SPIPSS_FREQUENCY</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PM_APSS_CHIP_SELECT</id>
-    <description>
-      PROC_CHIP Attribute
-      Defines which of the PSS chip selects that the APSS is connected
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-        <uint8_t></uint8_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PM_APSS_CHIP_SELECT</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
     <id>PM_PBAX_NODEID</id>
     <description>
       DEPRECATED!!!  Use PBAX_GROUPID instead
@@ -5626,7 +5584,10 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
       Provided by the Machine Readable Workbook.
     </description>
     <simpleType>
-        <uint8_t></uint8_t>
+        <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
+        </uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
     <readable/>
@@ -5637,7 +5598,7 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
 </attribute>
 
 <attribute>
-    <id>PM_PBAX_CHIPID</id>
+    <id>PBAX_CHIPID</id>
     <description>
       PROC_CHIP Attribute
       Receive PBAX Chipid. Value that indicates this PBA's PBAX Chipid within
@@ -5652,13 +5613,13 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
     <persistency>non-volatile</persistency>
     <readable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_PM_PBAX_CHIPID</id>
+        <id>ATTR_PBAX_CHIPID</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
 
 <attribute>
-    <id>PM_PBAX_BRDCST_ID_VECTOR</id>
+    <id>PBAX_BRDCST_ID_VECTOR</id>
     <description>
       PROC_CHIP Attribute
       Receive PBAX Broadcast Group. Vector that is indexed when decoded PMISC
@@ -5674,7 +5635,7 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
     <persistency>non-volatile</persistency>
     <readable/>
     <hwpfToHbAttrMap>
-        <id>ATTR_PM_PBAX_BRDCST_ID_VECTOR</id>
+        <id>ATTR_PBAX_BRDCST_ID_VECTOR</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
@@ -14953,119 +14914,6 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
-<!--TODO RTC:160430 Remove these attributes when hwsv updates their xml-->
-
-<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.
-
-      Producer:  Machine Readable Workbook (via the power subsystem design per system)
-
-      Consumer: p8_build_gpstate_table.C
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-</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: p8_build_gpstate_table.C
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-</attribute>
-
-<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.
-
-      Consumers: p8_build_gpstate_table.C
-
-      Provided by the Machine Readable Workbook (via the power subsystem design
-      per system)
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-</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.
-
-      Producer:  Machine Readable Workbook (via the power subsystem design per system)
-
-      Consumer: p8_build_gpstate_table.C
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-</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 (via the power subsystem design per system)
-
-      Consumer: p8_build_gpstate_table.C
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-</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: p8_build_gpstate_table.C
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <writeable/>
-</attribute>
-
-<!--TODO RTC:160430 END -->
-
 <attribute>
     <id>PM_UNDERVOLTING_FRQ_MINIMUM</id>
     <description>
@@ -15505,23 +15353,6 @@ Measured in GB</description>
 </enumerationType>
 
 <attribute>
-    <id>PM_SYSTEM_IVRMS_ENABLED</id>
-    <description>System control to allow (if all other attribute tests yield true values) or categorically disallow IVRM enablement
-     Producer: MRWB
-     Consumer:  p8_build_pstate_datablock.C
-    </description>
-    <simpleType>
-        <uint8_t></uint8_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PM_SYSTEM_IVRMS_ENABLED</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
     <id>PM_SYSTEM_IVRM_VPD_MIN_LEVEL</id>
     <description>Version level of #M that represents the minimum for IVRM characterized parts.
      If this value is non-zero and the #M version level is less than this value, IVRMs are disabled.
@@ -19011,6 +18842,7 @@ Measured in GB</description>
     <readable/>
 </attribute>
 
+<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_POWERUP_DELAY_NS</id>
     <description>
@@ -19019,6 +18851,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint32_t>
     </simpleType>
     <readable/>
@@ -19177,28 +19011,6 @@ Measured in GB</description>
 </attribute>-->
 
 <attribute>
-    <id>EXTERNAL_VRM_STEPSIZE</id>
-    <description>
-      Step delay (binary in microseconds) after a voltage change
-
-      Consumer: p9_build_pstate_datablock ->
-                        Pstate Parameter Block (PSPB) for PGPE
-
-      Provided by the Machine Readable Workbook after system characterization.
-    </description>
-    <simpleType>
-        <uint8_t>
-        </uint8_t>
-    </simpleType>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EXTERNAL_VRM_STEPSIZE</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-</attribute>
-
-<attribute>
     <id>AVSBUS_FREQUENCY</id>
     <description>
       AVSBus Clock Frequency (binary in KHz)
@@ -19373,6 +19185,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -19391,9 +19205,9 @@ Measured in GB</description>
       Data (VPD) (typically the PowerSave value) and the minimum allowed for
       correct operation of the fabric bus.
 
-      Producer: Machine Readable Workbook
+      Producer: p9_setup_evid (first pass)
 
-      Consumer: p9_setup_evid
+      Consumer: p9_setup_evid (second pass)
     </description>
     <simpleType>
         <uint32_t>
@@ -19416,9 +19230,9 @@ Measured in GB</description>
       Data (VPD) (typically the PowerSave value) and the minimum allowed for
       correct operation of the fabric bus.
 
-      Producer: Machine Readable Workbook
+      Producer: p9_setup_evid (first pass)
 
-      Consumer: p9_setup_evid
+      Consumer: p9_setup_evid (second pass)
     </description>
     <simpleType>
         <uint32_t>
@@ -19458,6 +19272,7 @@ Measured in GB</description>
     <readable/>
 </attribute>
 
+<!-- removed duplicate when fixed in HWP -->
 <attribute>
     <id>APSS_CHIP_SELECT</id>
     <description>
@@ -19477,6 +19292,25 @@ Measured in GB</description>
     <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
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_APSS_CHIP_SELECT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
 
 <enumerationType>
     <id>APSS_CHIP_SELECT</id>
@@ -19913,6 +19747,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -19938,6 +19774,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0x32</default>
         </uint8_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -19973,6 +19811,7 @@ Measured in GB</description>
     <writeable/>
 </attribute>-->
 
+<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_POWERDOWN_DELAY_NS</id>
     <description>
@@ -19987,6 +19826,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint32_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -19997,6 +19838,7 @@ Measured in GB</description>
     <readable/>
 </attribute>
 
+<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_VDD_VOFF_SEL</id>
     <description>
@@ -20010,6 +19852,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -20064,6 +19908,7 @@ Measured in GB</description>
     </enumerator>
 </enumerationType>
 
+<!-- Will eventually be hardcoded -->
 <attribute>
     <id>PFET_VCS_VOFF_SEL</id>
     <description>
@@ -20077,6 +19922,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -20141,6 +19988,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -20153,71 +20002,6 @@ Measured in GB</description>
 </attribute>
 
 <attribute>
-    <id>PBAX_CHIPID</id>
-    <description>
-      Receive PBAX Chipid. Value that indicates this PBA's PBAX Chipid within
-      the PBAX node.  Is matched to pbax_chipid of the Address phase if
-      pbax_type=unicast.
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-        <uint8_t>
-        </uint8_t>
-    </simpleType>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PBAX_CHIPID</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-    <persistency>non-volatile</persistency>
-    <readable/>
-</attribute>
-
-<attribute>
-    <id>PBAX_BRDCST_ID_VECTOR</id>
-    <description>
-      Receive PBAX Broadcast Group. Vector that is indexed when decoded PMISC
-      pbax_type=broadcast with the decoded PMISC pbax_chipid value.  If the
-      bit in this vector at the decoded bit location is a 1, then this receive
-      engine will participate in the broadcast operation.
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-        <uint8_t>
-        </uint8_t>
-    </simpleType>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PBAX_BRDCST_ID_VECTOR</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-    <persistency>non-volatile</persistency>
-    <readable/>
-</attribute>
-
-<attribute>
-    <id>EXTERNAL_VRM_STEPDELAY</id>
-    <description>
-      Step delay (binary in microseconds) after a voltage change
-
-      Consumer: p9_build_pstate_datablock ->
-                        Pstate Parameter Block (PSPB) for PGPE
-
-      Provided by the Machine Readable Workbook after system characterization.
-    </description>
-    <simpleType>
-        <uint32_t>
-        </uint32_t>
-    </simpleType>
-    <hwpfToHbAttrMap>
-        <id>ATTR_EXTERNAL_VRM_STEPDELAY</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-    <persistency>non-volatile</persistency>
-    <readable/>
-</attribute>
-
-<attribute>
     <id>VCS_I2C_RAIL</id>
     <description>
       Step delay (binary in microseconds) after a voltage change
@@ -20229,6 +20013,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
     <hwpfToHbAttrMap>
@@ -20247,9 +20033,9 @@ Measured in GB</description>
       Data (VPD) (typically the PowerSave value) and the minimum allowed for
       correct operation of the fabric bus.
 
-      Producer: Machine Readable Workbook
+      Producer: p9_setup_evid (first pass)
 
-      Consumer: p9_setup_evid
+      Consumer: p9_setup_evid (second pass)
     </description>
     <simpleType>
         <uint32_t>
@@ -22832,9 +22618,11 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
-    <persistency>volatile</persistency>
+    <persistency>volatile-zeroed</persistency>
     <readable/>
     <hwpfToHbAttrMap>
         <id>ATTR_DUMP_STOP_INFO_SUPPRESS_ERROR_TRACE</id>
@@ -22849,9 +22637,11 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>1</default>
         </uint8_t>
     </simpleType>
-    <persistency>volatile</persistency>
+    <persistency>volatile-zeroed</persistency>
     <readable/>
     <hwpfToHbAttrMap>
         <id>ATTR_DUMP_STOP_INFO_ENABLE_ERRORLOG</id>
@@ -29541,6 +29331,8 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
         </uint8_t>
     </simpleType>
     <readable/>
@@ -29564,6 +29356,7 @@ Measured in GB</description>
         </uint8_t>
     </simpleType>
     <readable/>
+<!-- TODO RTC:162011 VPD -->
     <persistency>volatile-zeroed</persistency>
     <hwpfToHbAttrMap>
       <id>ATTR_DPLL_DYNAMIC_FMAX_ENABLE</id>
@@ -29584,6 +29377,7 @@ Measured in GB</description>
         </uint8_t>
     </simpleType>
     <readable/>
+<!-- TODO RTC:162011 VPD -->
     <persistency>volatile-zeroed</persistency>
     <hwpfToHbAttrMap>
       <id>ATTR_DPLL_DYNAMIC_FMIN_ENABLE</id>
@@ -29606,6 +29400,7 @@ Measured in GB</description>
         </uint8_t>
     </simpleType>
     <readable/>
+<!-- TODO RTC:162011 VPD -->
     <persistency>volatile-zeroed</persistency>
     <hwpfToHbAttrMap>
       <id>ATTR_DPLL_DROOP_PROTECT_ENABLE</id>
@@ -29627,6 +29422,7 @@ Measured in GB</description>
         </uint8_t>
     </simpleType>
     <readable/>
+<!-- TODO RTC:162011 VPD -->
     <persistency>volatile-zeroed</persistency>
     <hwpfToHbAttrMap>
       <id>ATTR_DPLL_VDM_RESPONSE</id>
@@ -30410,7 +30206,10 @@ Measured in GB</description>
 
     </description>
     <simpleType>
-        <uint32_t></uint32_t>
+        <uint32_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
+        </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
     <readable/>
@@ -30433,7 +30232,10 @@ Measured in GB</description>
 
     </description>
     <simpleType>
-        <uint32_t></uint32_t>
+        <uint32_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0x28</default>
+        </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
     <readable/>
@@ -30456,7 +30258,10 @@ Measured in GB</description>
 
     </description>
     <simpleType>
-        <uint32_t></uint32_t>
+        <uint32_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
+        </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
     <readable/>
@@ -30541,6 +30346,269 @@ 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>
     <description>
@@ -31097,7 +31165,10 @@ Measured in GB</description>
 
     </description>
     <simpleType>
-        <uint8_t></uint8_t>
+        <uint8_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0x32</default>
+        </uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
     <readable/>
@@ -31115,7 +31186,10 @@ Measured in GB</description>
 
     </description>
     <simpleType>
-        <uint32_t></uint32_t>
+        <uint32_t>
+<!-- TODO RTC:161900 Temporary default -->
+            <default>0</default>
+        </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
     <readable/>
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index bb34ad1f2..5486e53b8 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -5193,7 +5193,7 @@
         <default>0x0</default>
     </attribute>
     <attribute>
-        <id>PM_APSS_CHIP_SELECT</id>
+        <id>APSS_CHIP_SELECT</id>
         <default>0xff</default>
     </attribute>
     <attribute>
@@ -5201,11 +5201,11 @@
         <default>0x0</default>
     </attribute>
     <attribute>
-        <id>PM_PBAX_CHIPID</id>
+        <id>PBAX_CHIPID</id>
         <default>0x1</default>
     </attribute>
     <attribute>
-        <id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <id>PBAX_BRDCST_ID_VECTOR</id>
         <default>0x0</default>
     </attribute>
     <attribute>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 145940113..d1a07ebfd 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -155,12 +155,12 @@
     <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>
-    <attribute><id>PM_PBAX_CHIPID</id></attribute>
     <attribute><id>PBAX_CHIPID</id></attribute>
-    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id></attribute>
     <attribute><id>PBAX_BRDCST_ID_VECTOR</id></attribute>
     <attribute><id>PM_SLEEP_ENTRY</id></attribute>
     <attribute><id>PM_SLEEP_EXIT</id></attribute>
@@ -283,6 +283,17 @@
     <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>
@@ -627,8 +638,8 @@
     <attribute><id>MRW_SAFEMODE_MEM_THROTTLE_NUMERATOR_PER_MBA</id></attribute>
     <attribute><id>MRW_SAFEMODE_MEM_THROTTLE_NUMERATOR_PER_CHIP</id></attribute>
     <attribute><id>MSS_MRW_THERMAL_MEMORY_POWER_LIMIT</id></attribute>
-    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id></attribute>
-    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id></attribute>
+    <attribute><id>EXTERNAL_VRM_STEPSIZE</id></attribute>
+    <attribute><id>EXTERNAL_VRM_STEPDELAY</id></attribute>
     <attribute><id>PM_SPIVID_FREQUENCY</id></attribute>
     <attribute><id>PM_SAFE_FREQUENCY</id></attribute>
     <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id></attribute>
@@ -636,7 +647,7 @@
     <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id></attribute>
     <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id></attribute>
     <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id></attribute>
-    <attribute><id>PM_SPIPSS_FREQUENCY</id></attribute>
+    <attribute><id>SPIPSS_FREQUENCY</id></attribute>
     <attribute><id>MEM_MIRROR_PLACEMENT_POLICY</id></attribute>
     <attribute><id>MSS_MRW_DIMM_POWER_CURVE_PERCENT_UPLIFT</id></attribute>
     <attribute><id>MSS_MRW_DIMM_POWER_CURVE_PERCENT_UPLIFT_IDLE</id></attribute>
@@ -648,7 +659,7 @@
     <attribute><id>MSS_MRW_VMEM_REGULATOR_POWER_LIMIT_PER_DIMM_ADJ_ENABLE</id></attribute>
     <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>PM_SYSTEM_IVRMS_ENABLED</id></attribute>
+    <attribute><id>SYSTEM_IVRMS_ENABLED</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>
@@ -846,8 +857,6 @@
     <attribute><id>FSP_BAR_SIZE</id></attribute>
     <attribute><id>MRW_VMEM_REGULATOR_MEMORY_POWER_LIMIT_PER_DIMM_DDR4</id></attribute>
     <attribute><id>MRW_VMEM_REGULATOR_MEMORY_POWER_LIMIT_PER_DIMM_DDR3</id></attribute>
-    <attribute><id>SYSTEM_IVRMS_ENABLED</id></attribute>
-    <attribute><id>SPIPSS_FREQUENCY</id></attribute>
     <attribute><id>STOP11_DISABLE</id></attribute>
     <attribute><id>SYSTEM_RESCLK_STEP_DELAY</id></attribute>
     <attribute><id>DPLL_DROOP_PROTECT_ENABLE</id></attribute>
@@ -855,10 +864,7 @@
     <attribute><id>DPLL_DYNAMIC_FMAX_ENABLE</id></attribute>
     <attribute><id>DPLL_VDM_RESPONSE</id></attribute>
     <attribute><id>MSS_VMEM_REGULATOR_MAX_DIMM_COUNT</id></attribute>
-    <attribute><id>EXTERNAL_VRM_STEPDELAY</id></attribute>
     <attribute><id>SYSTEM_WOF_ENABLED</id></attribute>
-    <attribute><id>EXTERNAL_VRM_STEPSIZE</id></attribute>
-    <attribute><id>VCS_I2C_BUSNUM</id></attribute>
     <attribute><id>AVSBUS_FREQUENCY</id></attribute>
     <attribute><id>PROC_FABRIC_ASYNC_SAFE_MODE</id></attribute>
     <attribute><id>VDM_ENABLE</id></attribute>
@@ -1026,6 +1032,9 @@
     <attribute><id>SCRATCH7_VALID</id></attribute>
     <attribute><id>OCC_LFIR</id></attribute>
     <attribute><id>PBA_LFIR</id></attribute>
+    <attribute><id>EXTERNAL_VRM_STEPSIZE</id></attribute>
+    <attribute><id>EXTERNAL_VRM_STEPDELAY</id></attribute>
+    <attribute><id>AVSBUS_FREQUENCY</id></attribute>
     <!-- proc_fbc_eff_config_links -->
     <attribute><id>PROC_FABRIC_X_ATTACHED_LINK_ID</id></attribute>
     <attribute><id>PROC_FABRIC_X_ATTACHED_CHIP_ID</id></attribute>
@@ -1227,7 +1236,6 @@
     <attribute><id>WAIT_N1</id></attribute>
     <attribute><id>WAIT_N0</id></attribute>
     <attribute><id>START_SEEPROM_ADDR</id></attribute>
-    <attribute><id>APSS_CHIP_SELECT</id></attribute>
     <attribute><id>MASTER_CORE</id></attribute>
     <attribute><id>MASTER_EX</id></attribute>
     <attribute><id>CHIP_REGIONS_TO_ENABLE</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 e1fe230ce..08aafd21e 100644
--- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
@@ -5161,7 +5161,7 @@
         <default>0x0</default>
     </attribute>
     <attribute>
-        <id>PM_APSS_CHIP_SELECT</id>
+        <id>APSS_CHIP_SELECT</id>
         <default>0xff</default>
     </attribute>
     <attribute>
@@ -5169,11 +5169,11 @@
         <default>0x0</default>
     </attribute>
     <attribute>
-        <id>PM_PBAX_CHIPID</id>
+        <id>PBAX_CHIPID</id>
         <default>0x1</default>
     </attribute>
     <attribute>
-        <id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <id>PBAX_BRDCST_ID_VECTOR</id>
         <default>0x0</default>
     </attribute>
     <attribute>