Remove deprecated attributes

Did a sweep of some leftover P8 attributes that were clogging up
our xml files.

Change-Id: I0a1133f49fa24840bae2c9b3a9a0270cd0553fde
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66274
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@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: William G. Hoffa <wghoffa@us.ibm.com>

7 files changed, 1 insertions, 676 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 843c23d2b..5a0708531 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -275,20 +275,7 @@ push @systemAttr,
     "DMI_EREPAIR_THRESHOLD_MNFG", $reqPol->{'dmi-erepair-threshold-mnfg'},
     "MSS_MBA_ADDR_INTERLEAVE_BIT", $reqPol->{'mss_mba_addr_interleave_bit'},
     "EXTERNAL_VRM_STEPSIZE", $reqPol->{'pm_external_vrm_stepsize'},
-    "PM_SPIVID_FREQUENCY", $reqPol->{'pm_spivid_frequency'}->{content},
-    "PM_SAFE_FREQUENCY", $reqPol->{'pm_safe_frequency'}->{content},
     "PM_SAFE_FREQUENCY_MHZ", $reqPol->{'pm_safe_frequency'}->{content},
-    "PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY",
-        $reqPol->{'pm_resonant_clock_full_clock_sector_buffer_frequency'}->
-            {content},
-    "PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY",
-        $reqPol->{'pm_resonant_clock_low_band_lower_frequency'}->{content},
-    "PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY",
-        $reqPol->{'pm_resonant_clock_low_band_upper_frequency'}->{content},
-    "PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY",
-        $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},
     "SPIPSS_FREQUENCY", $reqPol->{'pm_spipss_frequency'}->{content},
     "MEM_MIRROR_PLACEMENT_POLICY", $placement,
     "MSS_MRW_DIMM_POWER_CURVE_PERCENT_UPLIFT",
@@ -303,7 +290,6 @@ push @systemAttr,
         $reqPol->{'mss_mrw_max_number_dimms_possible_per_vmem_regulator'},
     "MSS_MRW_THERMAL_MEMORY_POWER_LIMIT",
         $reqPol->{'mss_mrw_thermal_memory_power_limit'},
-    "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'},
     "MNFG_ABUS_MIN_EYE_WIDTH", $reqPol->{'mnfg-abus-min-eye-width'},
@@ -753,21 +739,10 @@ foreach my $i (@{$pmSettings->{'processor-settings'}})
     push @pmChipAttr,
     [
         $i->{target}->{node}, $i->{target}->{position},
-        "PM_UNDERVOLTING_FRQ_MINIMUM",
-            $i->{pm_undervolting_frq_minimum}->{content},
-        "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},
         $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}
     ];
 }
 
@@ -3948,25 +3923,6 @@ sub generate_proc
         # Default the values.
         print "    <!-- PM_ attributes (default values) -->\n";
         print "    <attribute>\n";
-        print "        <id>PM_UNDERVOLTING_FRQ_MINIMUM</id>\n";
-        print "        <default>0</default>\n";
-        print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_UNDERVOLTING_FREQ_MAXIMUM</id>\n";
-        print "        <default>0</default>\n";
-        print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_SPIVID_PORT_ENABLE</id>\n";
-        if( $proc % 2 == 0 ) # proc0 of DCM
-        {
-            print "        <default>0x4</default><!-- PORT0NONRED -->\n";
-        }
-        else # proc1 of DCM
-        {
-            print "        <default>0x0</default><!-- NONE -->\n";
-        }
-        print "    </attribute>\n";
-        print "    <attribute>\n";
         print "        <id>PM_APSS_CHIP_SELECT</id>\n";
         if( $proc % 2 == 0 ) # proc0 of DCM
         {
@@ -3989,30 +3945,6 @@ sub generate_proc
         print "        <id>PBAX_BRDCST_ID_VECTOR</id>\n";
         print "        <default>$lognode</default>\n";
         print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_SLEEP_ENTRY</id>\n";
-        print "        <default>0x0</default>\n";
-        print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_SLEEP_EXIT</id>\n";
-        print "        <default>0x0</default>\n";
-        print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_SLEEP_TYPE</id>\n";
-        print "        <default>0x0</default>\n";
-        print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_WINKLE_ENTRY</id>\n";
-        print "        <default>0x0</default>\n";
-        print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_WINKLE_EXIT</id>\n";
-        print "        <default>0x0</default>\n";
-        print "    </attribute>\n";
-        print "    <attribute>\n";
-        print "        <id>PM_WINKLE_TYPE</id>\n";
-        print "        <default>0x0</default>\n";
-        print "    </attribute>\n";
         print "    <!-- End PM_ attributes (default values) -->\n";
     }
     else
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index f70ab92bc..6b0c2acdd 100755
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -5561,399 +5561,6 @@
     <writeable/>
   </attribute>
 
-  <enumerationType>
-    <description>Enumeration for the ATTR_PM_APSS_CHIP_SELECT</description>
-    <enumerator>
-      <name>NONE</name>
-      <value>0xFF</value>
-    </enumerator>
-    <enumerator>
-      <name>CS0</name>
-      <value>0x00</value>
-    </enumerator>
-    <enumerator>
-      <name>CS1</name>
-      <value>0x01</value>
-    </enumerator>
-    <id>PM_APSS_CHIP_SELECT</id>
-  </enumerationType>
-
-  <attribute>
-    <id>PM_PBAX_NODEID</id>
-    <description>
-      DEPRECATED!!!  Use PBAX_GROUPID instead
-      PROC_CHIP Attribute
-      Receive PBAX Nodeid. Value that indicates this PBA's PBAX Node affinity.
-      This is matched to pbax_nodeid of the PMISC Address phase.
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
-    <description>
-      SYSTEM Attribute
-      Frequency (binary in MHz) for the point at which clock sector buffers
-      should be at full strength.  This is to support Vmin operation.
-      Setting cannot overlap the Low or High bands.
-
-      Provided by the Machine Readable Workbook after system characterization.
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-      <id>ATTR_PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
-      <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-  </attribute>
-
-  <attribute>
-    <id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
-    <description>
-      SYSTEM Attribute
-      Frequency (binary in MHz) for the lower end of the High Frequency
-      Resonant band
-
-      Provided by the Machine Readable Workbook after system characterization.
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
-    <description>
-      SYSTEM Attribute
-      Frequency (binary in MHz)) for the upper end of the High Frequency
-      Resonant band
-
-      Provided by the Machine Readable Workbook after system characterization.
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
-    <description>
-      SYSTEM Attribute
-      Frequency (binary in MHz)) for the lower end of the Low Frequency
-      Resonant band
-
-      Provided by the Machine Readable Workbook after system characterization.
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
-    <description>
-      SYSTEM Attribute
-      Frequency (binary in MHz) for the upper end of the Low Frequency
-      Resonant band
-
-      Provided by the Machine Readable Workbook after system characterization.
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SAFE_FREQUENCY</id>
-    <description>
-      Frequency (binary in KHz) indicating the frequency that the cores will be moved
-      to in the event of the loss of the OCC Heartbeat.  This value needs to be the maximum
-      of the DpoMin frequency for proper PowerBus operation and the PowerSave value for
-      the present part.
-
-      Provided by the Machine Readable Workbook after system characterization.
-
-      The value is translated to the Pstate space.
-
-      Producer:  Machine Readable Workbook
-
-      Consumers: p8_build_gpstate_table.C
-
-      DYNAMIC_ATTRIBUTE: ATTR_PM_SAFE_PSTATE
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SLEEP_ENTRY</id>
-    <description>
-      PROC_CHIP Attribute
-
-Set Assisted if power off serialization is needed and SLEEP_TYPE=Fast;  Set to Hardware if the system can handle the unrelated powering off between cores.  Hardware setting decreases entry latency
-
-Producer: MRWB
-
-Consumer:  proc_pm_init and proc_pcbs_init
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SLEEP_EXIT</id>
-    <description>
-      PROC_CHIP Attribute
-
-Set to Assisted if power on serialization is needed and SLEEP_TYPE=Fast;  Set to Hardware if the system can handle the unrelated powering off between cores.  Hardware setting decreases entry latency
-Must be set to Assisted if ATTR_PM_SLEEP_TYPE=Deep as this necessary for restore.
-
-Setting to Hardware is a test mode for Fast only.
-
-Producer: MRWB
-
-Consumer:  proc_pm_init and proc_pcbs_init.
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SLEEP_TYPE</id>
-    <description>
-      PROC_CHIP Attribute
-Selects which voltage level to place the Core domain PFETs upon Sleep entry. 0 = Vret (Fast Sleep Mode), 1 = Voff (Deep Sleep Mode)
-
-Producer: MRWB
-
-Consumer:  proc_pm_init and proc_pcbs_init
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SPIVID_FREQUENCY</id>
-    <description>
-      SYSTEM Attribute
-      SPI Clock Frequency (binary in MHz)
-
-      Consumer: proc_pm_effective
-
-      Produces ATTR_PM_SPIVID_CLOCK_DIVIDER
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SPIVID_PORT_ENABLE</id>
-    <description>
-      PROC_CHIP Attribute
-      Defines the configuration of the SPIVID ports from the target.
-      - NONE means that no VRM is attached.
-      - PORTxNONRED means that the indicated port is used in a non-redundant
-                    configuration.
-      - REDUNDANT means that all three are connected and considered redundant.
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SPWUP_FSP</id>
-    <description>
-      EX_CHIPLET Attribute
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SPWUP_OCC</id>
-    <description>
-      EX_CHIPLET Attribute
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_SPWUP_PHYP</id>
-    <description>
-      EX_CHIPLET Attribute
-    </description>
-    <simpleType>
-      <uint32_t/>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-  </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.
-     If the #M version is greater than or equal to this value, the IVRMs are allowed to be enable from a level of part perspective.
-     Producer: MRWB
-     Consumer:  p8_build_pstate_datablock.C
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_UNDERVOLTING_FREQ_MAXIMUM</id>
-    <description>
-      Override for Maximum frequency for which undervolting is allowed.
-
-      If value = 0, the value of VPD Turbo data point is passed to OCC FW via
-      Pstate SuperStructure.
-
-      If value != 0, this value will be passed to OCC FW via Pstate SuperStructure
-      as the ceiling frequency for enabled CPMs.
-
-      Will be internally rounded to the nearest ATTR_PROC_REFCLK_FREQUENCY / 8 value.
-
-      Consumer: OCC FW; OCC Lab Tools
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_UNDERVOLTING_FRQ_MINIMUM</id>
-    <description>
-      Override for Minimum frequency for which undervolting is allowed.
-
-      If value = 0, the value of VPD CPMin data point is passed to OCC FW via
-      Pstate SuperStructure.
-
-      If value != 0, this value will be passed to OCC FW via Pstate SuperStructure
-      as the floor frequency for enabled CPMs.
-
-      Will be internally rounded to the nearest ATTR_PROC_REFCLK_FREQUENCY / 8 value.
-
-      Consumer: OCC FW; OCC Lab Tools
-
-      Provided by the Machine Readable Workbook.
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_WINKLE_ENTRY</id>
-    <description>Setting depends on di/dt charateristics of the system.
-
-        Set Assisted if power off serialization is needed and WINKLE_TYPE=Fast;
-        Set to Hardware if the system can handle the unrelated powering off between cores.
-        Hardware setting decreases entry latency
-
-        Producer: MRWB
-
-        Consumer:  p8_poreslw_init.C
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_WINKLE_EXIT</id>
-    <description>Setting depends on di/dt charateristics of the system and the setting of ATTR_PM_WINKLE_TYPE.
-
-        Set to Assisted if power on serialization is needed and WINKLE_TYPE=Fast;  Set to Hardware if the system
-        can handle the unrelated powering off between cores.  Hardware setting decreases entry latency.
-        Must be set to Assisted if ATTR_PM_WINKLE_TYPE=Deep as this necessary for restore.
-
-        Setting to Hardware is a test mode for Fast only.
-
-        Producer: MRWB
-
-        Consumer:  p8_poreslw_init.C
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
-  <attribute>
-    <id>PM_WINKLE_TYPE</id>
-    <description>
-      PROC_CHIP Attribute
-Selects which voltage level to place the Core and ECO domain PFETs upon Winkle entry. 0 = Vret (Fast Winkle Mode), 1 = Voff (Deep Winkle Mode)
-    </description>
-    <simpleType>
-      <uint8_t/>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
   <attribute>
     <description>Save state of the sfc driver flash workarounds for runtime</description>
     <id>PNOR_FLASH_WORKAROUNDS</id>
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
index 0bc77fb14..c7d87beaa 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
@@ -502,41 +502,6 @@
     </attribute>
 
     <attribute>
-        <id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
-        <default>0x1e8480</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
-        <default>0x3136a2</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
-        <default>0x499102</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
-        <default>0x1e70f8</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
-        <default>0x30b4c0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SAFE_FREQUENCY</id>
-        <default>2028</default>
-    </attribute>
-
-
-    <attribute>
-        <id>PM_SPIVID_FREQUENCY</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SYSTEM_IVRM_VPD_MIN_LEVEL</id>
-        <default>0x00</default>
-    </attribute>
-
-    <attribute>
         <id>PRIMARY_CAPABILITIES</id>
         <default>
             <field><id>reserved</id><value/></field>
@@ -571,10 +536,6 @@
 
 
 
-    <attribute>
-        <id>PROC_REFCLOCK_RCVR_TERM</id>
-        <default>0x0</default>
-    </attribute>
 
 
 
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
index 2cff7a108..8bca7bcaf 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
@@ -496,41 +496,6 @@
     </attribute>
 
     <attribute>
-        <id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
-        <default>0x1e8480</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
-        <default>0x3136a2</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
-        <default>0x499102</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
-        <default>0x1e70f8</default>
-    </attribute>
-    <attribute>
-        <id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
-        <default>0x30b4c0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SAFE_FREQUENCY</id>
-        <default>2028</default>
-    </attribute>
-
-
-    <attribute>
-        <id>PM_SPIVID_FREQUENCY</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SYSTEM_IVRM_VPD_MIN_LEVEL</id>
-        <default>0x00</default>
-    </attribute>
-
-    <attribute>
         <id>PRIMARY_CAPABILITIES</id>
         <default>
             <field><id>reserved</id><value/></field>
@@ -565,12 +530,6 @@
 
 
 
-    <attribute>
-        <id>PROC_REFCLOCK_RCVR_TERM</id>
-        <default>0x0</default>
-    </attribute>
-
-
 
     <attribute>
         <id>REDUNDANT_CLOCKS</id>
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index d5ff50f0d..553fbeeb8 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -5558,26 +5558,10 @@
 
     <!-- PM_ attributes -->
     <attribute>
-        <id>PM_UNDERVOLTING_FRQ_MINIMUM</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>PM_UNDERVOLTING_FREQ_MAXIMUM</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SPIVID_PORT_ENABLE</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
         <id>PM_APSS_CHIP_SELECT</id>
         <default>0xff</default>
     </attribute>
     <attribute>
-        <id>PM_PBAX_NODEID</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
         <id>PBAX_CHIPID</id>
         <default>0x1</default>
     </attribute>
@@ -5585,30 +5569,6 @@
         <id>PBAX_BRDCST_ID_VECTOR</id>
         <default>0x0</default>
     </attribute>
-    <attribute>
-        <id>PM_SLEEP_ENTRY</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SLEEP_EXIT</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SLEEP_TYPE</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_WINKLE_ENTRY</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_WINKLE_EXIT</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_WINKLE_TYPE</id>
-        <default>0x0</default>
-    </attribute>
     <!-- End PM_ attributes -->
     <attribute>
         <id>PROC_R_LOADLINE_VDD_UOHM</id>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 22491a14e..16a7fc60d 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -61,9 +61,6 @@
       <id>PHYS_PATH</id>
     </attribute>
     <attribute>
-      <id>PNOR_FLASH_WORKAROUNDS</id>
-    </attribute>
-    <attribute>
       <id>PRIMARY_CAPABILITIES</id>
     </attribute>
     <attribute>
@@ -470,36 +467,6 @@
       <id>LOCATION_CODE</id>
     </attribute>
     <attribute>
-      <id>PM_PBAX_NODEID</id>
-    </attribute>
-    <attribute>
-      <id>PM_SLEEP_ENTRY</id>
-    </attribute>
-    <attribute>
-      <id>PM_SLEEP_EXIT</id>
-    </attribute>
-    <attribute>
-      <id>PM_SLEEP_TYPE</id>
-    </attribute>
-    <attribute>
-      <id>PM_SPIVID_PORT_ENABLE</id>
-    </attribute>
-    <attribute>
-      <id>PM_UNDERVOLTING_FREQ_MAXIMUM</id>
-    </attribute>
-    <attribute>
-      <id>PM_UNDERVOLTING_FRQ_MINIMUM</id>
-    </attribute>
-    <attribute>
-      <id>PM_WINKLE_ENTRY</id>
-    </attribute>
-    <attribute>
-      <id>PM_WINKLE_EXIT</id>
-    </attribute>
-    <attribute>
-      <id>PM_WINKLE_TYPE</id>
-    </attribute>
-    <attribute>
       <default>
         <field>
           <id>reserved</id>
@@ -1422,28 +1389,7 @@
       <id>PLCK_IPL_ATTR_OVERRIDES_EXIST</id>
     </attribute>
     <attribute>
-      <id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_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_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
-    </attribute>
-    <attribute>
-      <id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
-    </attribute>
-    <attribute>
-      <id>PM_SAFE_FREQUENCY</id>
-    </attribute>
-    <attribute>
-      <id>PM_SPIVID_FREQUENCY</id>
-    </attribute>
-    <attribute>
-      <id>PM_SYSTEM_IVRM_VPD_MIN_LEVEL</id>
+      <id>PNOR_FLASH_WORKAROUNDS</id>
     </attribute>
     <attribute>
       <id>PROC_REFCLOCK_RCVR_TERM</id>
diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
index b61fa0166..6113547ec 100644
--- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
@@ -5466,26 +5466,10 @@
 
     <!-- PM_ attributes -->
     <attribute>
-        <id>PM_UNDERVOLTING_FRQ_MINIMUM</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>PM_UNDERVOLTING_FREQ_MAXIMUM</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SPIVID_PORT_ENABLE</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
         <id>PM_APSS_CHIP_SELECT</id>
         <default>0xff</default>
     </attribute>
     <attribute>
-        <id>PM_PBAX_NODEID</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
         <id>PBAX_CHIPID</id>
         <default>0x1</default>
     </attribute>
@@ -5493,30 +5477,6 @@
         <id>PBAX_BRDCST_ID_VECTOR</id>
         <default>0x0</default>
     </attribute>
-    <attribute>
-        <id>PM_SLEEP_ENTRY</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SLEEP_EXIT</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_SLEEP_TYPE</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_WINKLE_ENTRY</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_WINKLE_EXIT</id>
-        <default>0x0</default>
-    </attribute>
-    <attribute>
-        <id>PM_WINKLE_TYPE</id>
-        <default>0x0</default>
-    </attribute>
     <!-- End PM_ attributes -->
     <attribute>
         <id>PROC_R_DISTLOSS_VCS_UOHM</id>