Support for PM Attributes

Adding new HWP attribute xml files and associated Targeting changes to go along with them. The MURANO and VENICE xml files contain default values provided by Greg Still. We are still waiting on the final MRW definition to update the TULETA generation script. Also using this commit to add a few other error xml files for the HostServices procedures. We need this longterm to get the error parsing stuff working. Verified IPL against Murano and Tuleta configs. Depends-On: I3af3b2bf99b4dbedb6efeb2cb35e49ba066a9c19 Change-Id: I3a5be5a7b49c7c6d7e6179f5e28e046a38a12b1e RTC: 42293 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2002 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
author: Dan Crowell <dcrowell@us.ibm.com> 2012-10-08 14:26:42 -0500
committer: A. Patrick Williams III <iawillia@us.ibm.com> 2012-11-07 16:03:23 -0600
commit: d871f70ebe8e9e91d8dd4b604dfee0303461b9aa (patch)
tree: 4e4ee913e7177514f5569df07ff51423a15432e3 /src/usr/targeting
parent: 90190a610b3452c34eb1e4848f66ad54d22e6a6f (diff)
download: talos-hostboot-d871f70ebe8e9e91d8dd4b604dfee0303461b9aa.tar.gz
talos-hostboot-d871f70ebe8e9e91d8dd4b604dfee0303461b9aa.zip
6 files changed, 3245 insertions, 6 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index a52b34232..8723c13db 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -2948,6 +2948,7 @@
         <uint8_t></uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
+    <hasStringConversion/>
     <readable/>
     <hwpfToHbAttrMap>
         <id>ATTR_PROC_EPS_TABLE_TYPE</id>
@@ -2981,6 +2982,7 @@
         <uint8_t></uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
+    <hasStringConversion/>
     <readable/>
     <hwpfToHbAttrMap>
         <id>ATTR_PROC_FABRIC_PUMP_MODE</id>
@@ -3012,6 +3014,7 @@
         <uint8_t></uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
+    <hasStringConversion/>
     <readable/>
     <hwpfToHbAttrMap>
         <id>ATTR_PROC_X_BUS_WIDTH</id>
@@ -4741,4 +4744,2088 @@ bits6:7  will be consumed together to form COARSE_LVL. </description>
     </enumerator>
 </enumerationType>
 
+<!-- Support for pm_attributes_all_hwp.xml -->
+
+<attribute>
+    <id>PM_POWER_PROXY_TRACE_TIMER</id>
+    <description>
+      PROC_CHIP Attribute
+        The  Power Proxy Trace timer (binary in microseconds) defines the time between Power Proxy Trace records when no other event that would otherwise produce a record has occured.  Values must be within a range of 32us to 64ms.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_POWER_PROXY_TRACE_TIMER</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PPT_TIMER_MATCH_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        The delay is 32us * ATTR_PM_PPT_TIMER_MATCH_VALUE
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PPT_TIMER_MATCH_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PPT_TIMER_TICK</id>
+    <description>
+      PROC_CHIP Attribute
+        Defines the Power Proxy Trace interval timer tick (0=25us, 1=0.5us, 2=1us, and 3=2us)
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PPT_TIMER_TICK</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_AISS_TIMEOUT</id>
+    <description>
+      PROC_CHIP Attribute
+        Defines the timeout value for the Architected Idle State Sequencer (AISS).
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_AISS_TIMEOUT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PSTATE_STEPSIZE</id>
+    <description>
+      PROC_CHIP Attribute
+        Unsigned 7 bit (baby-) stepsize for Pstate transitions between the Global Pstate Actual and the Global Pstate Target. Only non-zero values are supported for this dial.
+
+Used to setup the PMC voltage controller
+
+Producer: proc_build_pstate_tables.C
+
+Consumer: OCC pstate_init()
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PSTATE_STEPSIZE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_EXTERNAL_VRM_STEPDELAY_RANGE</id>
+    <description>
+      PROC_CHIP Attribute
+        Selects the resolution for the step delay count after a voltage change (decimal value N for this field divides the prv clock by 2^(N+3))
+
+A 4 bit field  selects one of the the upper 16bit of a 19bit counter (16+3) incremented in the nest/4 domain
+
+Consumer: proc_pm.scominit
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_EXTERNAL_VRM_STEPDELAY_RANGE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_EXTERNAL_VRM_STEPDELAY_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Step delay after a voltage change in increments of vrm_stepdelay_range.  Setting this dial to a value N causes a delay of N cycles of the divided nest clk (see dial vrm_stepdelay_range). The closed formula is as follows: Delay_seconds = vrm_stepdelay_value * ( 2^(3 + vrm_stepdelay_range) / (Nest_frequency_Hz/4))
+
+Consumer: proc_pm.scominit
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_EXTERNAL_VRM_STEPDELAY_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PMC_HANGPULSE_DIVIDER</id>
+    <description>
+      PROC_CHIP Attribute
+        Divides the hang pulse to PMC to achieve XXXX. Note that this needs to be set according to the description of dial pmc_occ_heartbeat_time
+
+Producer:  prc_pm_effective
+
+Consumer: proc_pm.scominit
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PMC_HANGPULSE_DIVIDER</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PVSAFE_PSTATE</id>
+    <description>
+      PROC_CHIP Attribute
+        
+Pstate that is invoked in the PMC voltage controller upon the loss of the OCC Heartbeat..
+
+Producer:  proc_pm_effective.C
+
+Consumer: proc_pm.scominit
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PVSAFE_PSTATE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_FRAME_SIZE</id>
+    <description>
+      PROC_CHIP Attribute
+        Number of data bits per individual SPIVID transaction (also referred to as frame) during chip select assertion
+
+Supported values: 0x20 (32d)
+
+Chip Select assertion duration is spi_frame_size + 2
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_FRAME_SIZE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_IN_DELAY_FRAME1</id>
+    <description>
+      PROC_CHIP Attribute
+        Number of SPIVID clocks after chip select to wait before capturing MISO input in frame 1
+
+Supported values: 0x00 to spi_frame_size.  Values beyond spi_frame_size result in the input never being captured
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_IN_DELAY_FRAME1</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_IN_DELAY_FRAME2</id>
+    <description>
+      PROC_CHIP Attribute
+        Number of SPI clocks after chip select to wait before capturing MISO input in frame 2
+
+Supported values: 0x00 to spi_frame_size.  Values beyond spi_frame_size result in the input never being captured
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_IN_DELAY_FRAME2</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_CLOCK_POLARITY</id>
+    <description>
+      PROC_CHIP Attribute
+        SPVID Clock Polarity  (CPOL=0 means that clk idle is deasserted, CPOL=1 means that clk idle is asserted)
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_CLOCK_POLARITY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_CLOCK_PHASE</id>
+    <description>
+      PROC_CHIP Attribute
+        SPI clock phase (CPHA=0 means to change/sample values of data signals on first edge, otherwise on 2nd)
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_CLOCK_PHASE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_CLOCK_DIVIDER</id>
+    <description>
+      PROC_CHIP Attribute
+        SPIVID clock speed divider to divide the nest_nclk/4 mesh clock, which results in a divider = (nest_freq/ (SPI_freq*8))-1
+For a 2.4GHz nest clock, this means that the SPI clk can be theoretically adjusted between 600MHz and 0.29MHz (cycle time 1.66ns...3.41us, in 1.66ns steps). However, a practical range is 0.5...25MHz.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_CLOCK_DIVIDER</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay between command and status frames of a SPIVID 'WRITE' operation (binary in nanoseconds)
+Consumer: proc_pmc_init
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay between two frames of a Write command as measured from the end of the last bit of the first frame until the chip select of the second frame, which contains the status, is asserted.  This delay allows for the checking and status data production in the SPIVID chip.
+
+Delay is computed as:  (value * ~100ns_hang_pulse)  +0/-~100ns_hang_pulse time
+
+0x00000: Wait 1 SPI Clock
+0x00001 - 0x1FFFF: value = number of ~100ns_hang_pulses
+
+For values greater than 0x00000, the actual delay is 1 SPI Clock + the time delay designated by the value defined. Max. delay at 0x1FFFF: 13.1ms + 1 SPI clock cycle.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_INTER_RETRY_DELAY_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay between command retry attempts.
+
+Delay is computed as:  (value * ~100ns_hang_pulse)  +0/-~100ns_hang_pulse time
+
+0x0000: Wait 1 SPI Clock
+0x0001 - 0xFFFF: value = number of ~100ns_hang_pulses
+
+For values greater than 0x00000, the actual delay is 1 SPI Clock + the time delay designated by the value defined. Max. delay at 0x1FFFF: 13.1ms + 1 SPI clock cycle.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_INTER_RETRY_DELAY_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_INTER_RETRY_DELAY</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay between SPIVID reture attempts when WRITE command status indicates an error (binary in nanoseconds)
+Consumer: proc_pmc_init
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_INTER_RETRY_DELAY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_CRC_GEN_ENABLE</id>
+    <description>
+      PROC_CHIP Attribute
+        EnableS CRC generation from processor to VRM device. This will produce an 8b CRC per the enabled polynomial. If CRC generation is disabled, the full 32 bits at the data input of the SPI master are transmitted.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_CRC_GEN_ENABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_CRC_CHECK_ENABLE</id>
+    <description>
+      PROC_CHIP Attribute
+        Enables CRC checking in the processor of frames from the VRM device.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_CRC_CHECK_ENABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_MAJORITY_VOTE_ENABLE</id>
+    <description>
+      PROC_CHIP Attribute
+        enables the a majority vote on the 3B of status payload on a frame received by the master as each of these have a 1 byte status field replicated three (3) times by the slave.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_MAJORITY_VOTE_ENABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_MAX_RETRIES</id>
+    <description>
+      PROC_CHIP Attribute
+        Number retries upon detected errors.
+
+0x00: No retry
+0x01 to 0x1F: 1 to 31 respectively
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_MAX_RETRIES</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_CRC_POLYNOMIAL_ENABLES</id>
+    <description>
+      PROC_CHIP Attribute
+        CRC8 Polynomial Enables
+
+An 8 bit mask vector to enable XORs in the CRC generation and checking LFSRs at the respective bit position. MSB (x^8) is omitted since it is always enabled, so the mask layout is (x^7,x^6,x^5,x^4,x^3,x^2,x^1,1)
+
+Planned CRC8 polynomial: x^8 + x^7 + x^6 + x^4 + x^2 + 1
+Value to enable planned polynomial: 0b1101_0101 (=0xD5)
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_CRC_POLYNOMIAL_ENABLES</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_OCC_HEARTBEAT_TIME</id>
+    <description>
+      PROC_CHIP Attribute
+        Time within which the OCC firmware must access the PMC or the OCC will be considered faulty whereby  FIRs and malfunction alerts will be produced . (binary in nanoseconds)
+Consumer: OCC FW
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_OCC_HEARTBEAT_TIME</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SLEEP_WINKLE_REQUEST_TIMEOUT</id>
+    <description>
+      PROC_CHIP Attribute
+        Time (binary in ns) that will be the threshold value for the PMC PORE request timeout.
+
+Consumer: proc_pmc_init.C.  Will be translated to a DYNAMIC ATTRIBUTE for use by proc_pm..scominit  as a multiple of PM hang pulses.. Counter starts at 0, is increased with every tp_pmc_hang_pulse as long as PORE is busy and set the PMC local FIR bit 19 when count = threshold.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SLEEP_WINKLE_REQUEST_TIMEOUT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_CORE_DELAY0</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) after a step in the Core power-up  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_CORE_DELAY0</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_CORE_DELAY1</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) after a step in the Core power-up  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_CORE_DELAY1</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_CORE_DELAY0_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 0  between any step in the Core power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_CORE_DELAY0_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_CORE_DELAY1_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 1  between any step in the Core power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_CORE_DELAY1_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT</id>
+    <description>
+      PROC_CHIP Attribute
+        Binary vector where the most significant bits (0:11) identify the delay to be used for that step of the sequence.  Power up goes from 11, then 10, then 9,.... then 0.
+
+0 in the bit position:  use ATTR_PM_PFET_POWERUP_CORE_DELAY0;
+
+1 in the bit position:  use ATTR_PM_PFET_POWERUP_CORE_DELAY1
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_CORE_DELAY0</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) between a step in the Core power-down  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_CORE_DELAY0</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_CORE_DELAY1</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) between a step in the Core power-down  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_CORE_DELAY1</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_CORE_DELAY0_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 0  between any step in the Core power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_CORE_DELAY0_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_CORE_DELAY1_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 1  between any step in the Core power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_CORE_DELAY1_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT</id>
+    <description>
+      PROC_CHIP Attribute
+        Binary vector where the most significant bits (0:11) identify the delay to be used for that step of the sequence.  Power up goes from 11, then 10, then 9,.... then 0.
+
+0 in the bit position:  use ATTR_PM_PFET_POWERUP_CORE_DELAY0;
+
+1 in the bit position:  use ATTR_PM_PFET_POWERUP_CORE_DELAY1
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_ECO_DELAY0</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) after a step in the ECO power-up  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_ECO_DELAY0</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_ECO_DELAY1</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) after a step in the ECO power-up  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_ECO_DELAY1</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_ECO_DELAY0_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 0  between any step in the ECO power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_ECO_DELAY0_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_ECO_DELAY1_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 1  between any step in the ECO power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_ECO_DELAY1_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT</id>
+    <description>
+      PROC_CHIP Attribute
+        Binary vector where the most significant bits (0:11) identify the delay to be used for that step of the sequence.  Power up goes from 11, then 10, then 9,.... then 0.
+
+0 in the bit position:  use ATTR_PM_PFET_POWERUP_ECO_DELAY0;
+
+1 in the bit position:  use ATTR_PM_PFET_POWERUP_ECO_DELAY1
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_ECO_DELAY0</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) between a step in the ECO power-down  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_ECO_DELAY0</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_ECO_DELAY1</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay (binary in nanoseconds) between a step in the ECO power-down  PFET sequence.  Enabled per step by the vector defined in ATTR_PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_ECO_DELAY1</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_ECO_DELAY0_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 0  between any step in the ECO power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_ECO_DELAY0_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_ECO_DELAY1_VALUE</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay value 1  between any step in the ECO power-up  PFET sequence.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_ECO_DELAY1_VALUE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT</id>
+    <description>
+      PROC_CHIP Attribute
+        Binary vector where the most significant bits (0:11) identify the delay to be used for that step of the ECO power up sequence.  Power up goes from 11, then 10, then 9,.... then 0.  0 in the bit position:  use ATTR_PM_PFET_POWERUP_ECO_DELAY0;  1 in the bit position:  use ATTR_PM_PFET_POWERUP_ECO_DELAY1
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PSTATE0_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+        Defines the center point of the Pstate space in the frequency domain.  Binary in Khz.
+
+Producer: proc_build_gpstate.C
+
+Consumers: proc_pcbs_init.C, proc_pcbs_lpst_init.C, 
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PSTATE0_FREQUENCY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_IVRMS_ENABLED</id>
+    <description>
+      PROC_CHIP Attribute
+        Indicates whether available internal voltage regulation macros (iVRMs) are to enabled.  This indicates that module VPD has valid #M keywords available.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_IVRMS_ENABLED</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SAFE_PSTATE</id>
+    <description>
+      PROC_CHIP Attribute
+        Safe Pstate
+
+Valid Values:-128 thru 127
+
+Producer: proc_pm_effective.C
+
+DYNAMIC_ATTRIBUTE
+
+Consumer: proc_pcbs_init.C
+
+Establishes the Pstate that the core chiplet will take on if:
+psafe less than or equal to PMSR[global_actual_pstate]
+AND any of the following conditions are true:
+Loss of OCC Heartbeat if occ_heartbeat_en is set
+PMGP0[force_safe_mode] is set
+
+If psafe > PMSR[global_actual_pstate], the  global_actual_pstate is forced.
+
+The value of Psafe needs to be at or below the nominal Pstate to make sure safe operation of all chiplets.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SAFE_PSTATE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_ENABLE</id>
+    <description>
+      PROC_CHIP Attribute
+        Resonant Clock Enable
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_ENABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_FULL_CSB_PSTATE</id>
+    <description>
+      PROC_CHIP Attribute
+        FCSB = Full Clock Sector Buffer (8b in terms of Pstate)
+Defines the Pstate for the point at which clock sector buffers should be at full strength.  This is to support Vmin operation.
+
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_FULL_CSB_PSTATE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_LFRLOW_PSTATE</id>
+    <description>
+      PROC_CHIP Attribute
+        LFRLower = Low Frequency Resonant Lower.  Defines the Pstate for the lower end of the Low Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_LFRLOW_PSTATE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_LFRUPPER_PSTATE</id>
+    <description>
+      PROC_CHIP Attribute
+        LFRUpper = Low Frequency Resonant Upper. Defines the Pstate for the upper end of the Low Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_LFRUPPER_PSTATE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_HFRLOW_PSTATE</id>
+    <description>
+      PROC_CHIP Attribute
+        HFRLower = High Frequency Resonant Low. Defines the Pstate for the lower end of the High Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_HFRLOW_PSTATE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_HFRHIGH_PSTATE</id>
+    <description>
+      PROC_CHIP Attribute
+        HFRUpper = High Frequency Resonant Upper. Defines the Pstate for the upper end of the High Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_HFRHIGH_PSTATE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_FRAME_SIZE</id>
+    <description>
+      PROC_CHIP Attribute
+        Number of data bits per individual SPIPSS transaction (also referred to as frame) during chip select assertion
+
+Supported values: 0x10 (16d),
+
+Chip Select assertion duration is spi_frame_size + 2
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_FRAME_SIZE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_OUT_COUNT</id>
+    <description>
+      PROC_CHIP Attribute
+        Number of bits sent out MOSI of the frame
+
+Supported values: 0x000 to spi_frame_size.  Values beyond spi_frame_size are ignored.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_OUT_COUNT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_IN_DELAY</id>
+    <description>
+      PROC_CHIP Attribute
+        Number of SPI clocks after chip select to wait before capturing MISO input
+
+Supported values: 0x000 to spi_frame_size.  Values beyond spi_frame_size result in the input never being captured
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_IN_DELAY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_IN_COUNT</id>
+    <description>
+      PROC_CHIP Attribute
+        Number of bits captured on MISO input
+
+Supported values: 0x000 to spi_frame_size.  The actual number of bits captured is spi_frame_size - spi_in_delay
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_IN_COUNT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_CLOCK_POLARITY</id>
+    <description>
+      PROC_CHIP Attribute
+        SPIPSS Clock Polarity  (CPOL=0 means that clk idle is deasserted, CPOH=1 means that clk idle is asserted)
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_CLOCK_POLARITY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_CLOCK_PHASE</id>
+    <description>
+      PROC_CHIP Attribute
+        SPIPSS clock phase (CPHA=0 means to change/sample values of data signals on first edge, otherwise on 2nd)
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_CLOCK_PHASE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_CLOCK_DIVIDER</id>
+    <description>
+      PROC_CHIP Attribute
+        SPI clock speed divider to divide the nest_nclk/4 mesh clock, which results in a divider = (nest_freq/ (SPI_freq*8))-1
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_CLOCK_DIVIDER</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_INTER_FRAME_DELAY_SETTING</id>
+    <description>
+      PROC_CHIP Attribute
+        
+Delay is computed as:  (value * ~100ns_hang_pulse)  +0/-~100ns_hang_pulse time
+
+0x00000: Wait 1 PSS Clock
+0x00001 - 0x1FFFF: value = number of ~100ns_hang_pulses
+
+For values greater than 0x00000, the actual delay is 1 PSS Clock + the time delay designated by the value defined. Max. delay at 0x1FFFF: 13.1ms + 1 PSSI clock cycle.
+
+Producer: proc_pm_effective
+
+Consumer: proc_pss_init
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_INTER_FRAME_DELAY_SETTING</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_INTER_FRAME_DELAY</id>
+    <description>
+      PROC_CHIP Attribute
+        Delay between two frames of a P2S command as measured from the end of the last bit of the first frame until the chip select of the second frame.  (binary in nanoseconds)
+
+Consumer: proc_pm_effective
+
+Produces ATTR_PM_SPIPSS_INTER_FRAME_DELAY_SETTING
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIPSS_INTER_FRAME_DELAY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PBAX_RCV_RESERV_TIMEOUT</id>
+    <description>
+      PROC_CHIP Attribute
+        PBAX Data Timeout Divider
+Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang pulses are received under the following conditions:
+- Data Hi packet accepted and timeout waiting for Data Lo packet.
+- Reservation aquired and timeout waiting for Data Hi packet.
+
+00000 = Data Timeout is Disabled
+00001 = divided hang pulse = PBAX hang pulse
+00010 = divided hang pulse = PBAX hang pulse/2
+00011 = divided hang pulse = PBAX hang pulse/3
+. . .
+11111  = divided hang pulse = PBAX hang pulse/31
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PBAX_RCV_RESERV_TIMEOUT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PBAX_SND_RETRY_COUNT_OVERCOMMIT_ENABLE</id>
+    <description>
+      PROC_CHIP Attribute
+        PBAX Send Retry count overcommit
+Mode bit to count overcommit retries for the send retry threshold when sending PBAX commands on the powerbus.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PBAX_SND_RETRY_COUNT_OVERCOMMIT_ENABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PBAX_SND_RETRY_THRESHOLD</id>
+    <description>
+      PROC_CHIP Attribute
+        PBAX Send Retry Threshold
+Defines the maximum number of retry attempts by the Send Engine for any phase of the PBAX transaction set before the operation is dropped and status bit are set.  This does not count PowerBus overcommit retries unless snd_retry_count_overcom bit is set.
+
+0x00 :  No Timeout
+0x01 :  1 attempt
+0x02 :   2 attempts
+.etc.
+0xFF :  255 attempts
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PBAX_SND_RETRY_THRESHOLD</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PBAX_SND_RESERV_TIMEOUT</id>
+    <description>
+      PROC_CHIP Attribute
+        PBAX Send Reservation Timeout Divider
+Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang pulses are received after attempting to acquire a reservation with the PBAX Receive engine before declaring a Send Reservation Timeout error.
+
+00000 = Send Reservation Timeout is Disabled
+00001 = divided hang pulse = PBAX hang pulse
+00010 = divided hang pulse = PBAX hang pulse/2
+00011 = divided hang pulse = PBAX hang pulse/3
+. . .
+11111  = divided hang pulse = PBAX hang pulse/31
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PBAX_SND_RESERV_TIMEOUT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPWUP_FSP</id>
+    <description>
+      EX_CHIPLET Attribute
+        PBAX Send Reservation Timeout Divider
+Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang pulses are received after attempting to acquire a reservation with the PBAX Receive engine before declaring a Send Reservation Timeout error.
+
+00000 = Send Reservation Timeout is Disabled
+00001 = divided hang pulse = PBAX hang pulse
+00010 = divided hang pulse = PBAX hang pulse/2
+00011 = divided hang pulse = PBAX hang pulse/3
+. . .
+11111  = divided hang pulse = PBAX hang pulse/31
+        Arbitration Attribute for FSP special wakeups:  upon set, increment, upon clear, decrement;   hardware bit only cleared upon attribute being 0.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPWUP_FSP</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPWUP_OCC</id>
+    <description>
+      EX_CHIPLET Attribute
+        PBAX Send Reservation Timeout Divider
+Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang pulses are received after attempting to acquire a reservation with the PBAX Receive engine before declaring a Send Reservation Timeout error.
+
+00000 = Send Reservation Timeout is Disabled
+00001 = divided hang pulse = PBAX hang pulse
+00010 = divided hang pulse = PBAX hang pulse/2
+00011 = divided hang pulse = PBAX hang pulse/3
+. . .
+11111  = divided hang pulse = PBAX hang pulse/31
+        Arbitration Attribute for FSP special wakeups:  upon set, increment, upon clear, decrement;   hardware bit only cleared upon attribute being 0.
+        Arbitration Attribute for OCC special wakeups:  upon set, increment, upon clear, decrement;   hardware bit only cleared upon attribute being 0.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPWUP_OCC</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPWUP_PHYP</id>
+    <description>
+      EX_CHIPLET Attribute
+        PBAX Send Reservation Timeout Divider
+Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang pulses are received after attempting to acquire a reservation with the PBAX Receive engine before declaring a Send Reservation Timeout error.
+
+00000 = Send Reservation Timeout is Disabled
+00001 = divided hang pulse = PBAX hang pulse
+00010 = divided hang pulse = PBAX hang pulse/2
+00011 = divided hang pulse = PBAX hang pulse/3
+. . .
+11111  = divided hang pulse = PBAX hang pulse/31
+        Arbitration Attribute for FSP special wakeups:  upon set, increment, upon clear, decrement;   hardware bit only cleared upon attribute being 0.
+        Arbitration Attribute for OCC special wakeups:  upon set, increment, upon clear, decrement;   hardware bit only cleared upon attribute being 0.
+        Arbitration Attribute for PHYP special wakeups:  upon set, increment, upon clear, decrement;   hardware bit only cleared upon attribute being 0.
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPWUP_PHYP</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<!-- End pm_attributes_all_hwp.xml -->
+
+
+<!-- Support for pm_attributes_all_plat.xml -->
+
+<attribute>
+    <id>PROC_DCM_INSTALLED</id>
+    <description>
+      PROC_CHIP Attribute
+This attribute is set to 1 if the target processor is part of a Dual Chip Module (DCM).
+
+Used for enabling operations between the two chips for to voltage control based on 'interchip_mode' and the settings of PMIC0.
+
+Consumer: proc_pm.scominit
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_DCM_INSTALLED</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_EXTERNAL_VRM_STEPSIZE</id>
+    <description>
+      PROC_CHIP Attribute
+Step size (binary in microvolts) to take upon external VRM voltage transitions.  The value set here must take into account where internal VRMs are enabled or not as, when they are enabled, the step size must account for the tracking (eg PFET strength recalculation) for the step.
+
+MRWB after system characterization
+
+Consumer: proc_build_pstate_tables.C, proc_pmc_init.C -config
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_EXTERNAL_VRM_STEPSIZE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_EXTERNAL_VRM_STEPDELAY</id>
+    <description>
+      PROC_CHIP Attribute
+Step delay (binary in microseconds) after a voltage change
+
+Producer:  MRWB after system characterization
+
+
+Consumer: proc_pmc_init -config
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_EXTERNAL_VRM_STEPDELAY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SAFE_VOLTAGE</id>
+    <description>
+      PROC_CHIP Attribute
+
+Voltage (binary in 5mv units) that is invoked upon the loss of the OCC Heartbeat.
+
+Used to determine the Pstate to load into the hardware for automatic reaction upon the loss of the OCC heartbeat .  This value needs to be at or above that which supports the nominal frequency to make sure safe operation of all chiplets.
+
+The value is translated to the Pstate space.
+
+Consumer: proc_pm_effective.C
+
+DYNAMIC_ATTRIBUTE: ATTR_PM_SAFE_PSTATE
+
+Consumer: proc_pm.scominit 
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SAFE_VOLTAGE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+    <description>
+      PROC_CHIP Attribute
+Minimum frequency (binary in 5mv units) for which undervolting is allowed.  Will be internally rounded to the nearest ATTR_PROC_REFCLK_FREQUENCY / 8 value.
+
+Consumer: OCC FW; OCC Lab Tools
+
+Need to create a process for MRWB elements to get passed to OCC (FW or lab tools)
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+    <description>
+      PROC_CHIP Attribute
+Maximum frequency for which undervolting is allowed.  Will be internally rounded to the nearest ATTR_PROC_REFCLK_FREQUENCY / 8 value.
+
+Consumer: OCC FW; OCC Lab Tools
+
+Need to create a process for MRWB elements to get passed to OCC (FW or lab tools)
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIVID_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+SPI Clock Frequency (binary in MHz)
+Consumer: proc_pm_effective
+
+Produces ATTR_PM_SPIVID_CLOCK_DIVIDER
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_FREQUENCY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</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.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SPIVID_PORT_ENABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SLEEP_ENTRY</id>
+    <description>
+      PROC_CHIP Attribute
+Setting depends on di/dt charateristics of the system.
+
+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 -config and proc_pcbs_init
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SLEEP_ENTRY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SLEEP_EXIT</id>
+    <description>
+      PROC_CHIP Attribute
+Setting depends on di/dt charateristics of the system and the setting of ATTR_PM_SLEEP_TYPE.
+
+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 -config and proc_pcbs_init
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SLEEP_EXIT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SLEEP_TYPE</id>
+    <description>
+      PROC_CHIP Attribute
+Sleep Power Off Select:
+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 -config and proc_pcbs_init
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SLEEP_TYPE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_WINKLE_ENTRY</id>
+    <description>
+      PROC_CHIP Attribute
+Setting depends on di/dt charateristics of the system.
+
+Set Assisted if power off serialization is needed and WINKE_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 -config and proc_pcbs_init
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_WINKLE_ENTRY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_WINKLE_EXIT</id>
+    <description>
+      PROC_CHIP Attribute
+Setting depends on di/dt charateristics of the system and the setting of ATTR_PM_WINKE_TYPE.
+
+Set to Assisted if power on serialization is needed and WINKE_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_WINKE_TYPE=Deep as this necessary for restore.
+
+Setting to Hardware is a test mode for Fast only.
+
+Producer: MRWB
+
+Consumer:  proc_pm_effective and proc_pcbs_init.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_WINKLE_EXIT</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_WINKLE_TYPE</id>
+    <description>
+      PROC_CHIP Attribute
+Winkle Power Off Select:
+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)
+
+Producer: MRWB
+
+Consumer:  proc_pm_init -config and proc_pcbs_init
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_WINKLE_TYPE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SAFE_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+Safe Frequency (binary in MHz)
+
+Indicates the frequency that the cores will be moved to in the event of the loss of the OCC Heartbead.  This value needs to be  at or below the nominal frequency to make sure safe operation of all chiplets.
+
+The value is translated to the Pstate space.
+
+Consumer: proc_pm_effective.C
+
+DYNAMIC_ATTRIBUTE: ATTR_PM_SAFE_PSTATE
+
+Consumer: proc_pcbs_init.C  
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_SAFE_FREQUENCY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+    <description>
+      PROC_CHIP 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.
+    </description>
+    <simpleType>	
+        <uint32_t></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_LOW_BAND_LOWER_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+Frequency (binary in MHz)) for the lower end of the Low Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+Frequency (binary in MHz) for the upper end of the Low Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+Frequency (binary in MHz) for the lower end of the High Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+Frequency (binary in MHz)) for the upper end of the High Frequency Resonant band
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_SPIPSS_FREQUENCY</id>
+    <description>
+      PROC_CHIP Attribute
+SPIPSS Clock Frequency (binary in MHz)
+
+Valid range: 0.5MHz to 25MHz
+
+Consumer: proc_pmc_init
+    </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
+    </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>
+      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.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PBAX_NODEID</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PBAX_CHIPID</id>
+    <description>
+      PROC_CHIP Attribute
+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.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PBAX_CHIPID</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PM_PBAX_BRDCST_ID_VECTOR</id>
+    <description>
+      PROC_CHIP Attribute
+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.
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PM_PBAX_BRDCST_ID_VECTOR</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PROC_R_LOADLINE</id>
+    <description>
+      SYSTEM Attribute
+Impedance (binary microOhms) of the load line from a processor VRM to the Processor Module pins.  This value is applied to each processor instance.
+
+Producer: MRWB (via the power subsystem design per system)
+
+Consumers: proc_build_gpstate_table.C
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_R_LOADLINE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PROC_R_DISTLOSS</id>
+    <description>
+      SYSTEM Attribute
+Impedance (binary in microOhms) of the distribution loss the sense point to the circuit.  This value is applied to each processor instance.
+
+Producer: MRWB (via the power subsystem design per system)
+
+Consumers: proc_build_gpstate_table.C
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_R_DISTLOSS</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PROC_VRM_VOFFSET</id>
+    <description>
+      SYSTEM Attribute
+Offset voltage (binary in microvolts) to apply to the VRM distribution to the processor module.  This value is applied to each processor instance.
+
+Producer: MRWB (via the power subsystem design per system)
+
+Consumers: proc_build_gpstate_table.C
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_VRM_VOFFSET</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>PROC_DPLL_DIVIDER</id>
+    <description>
+      SYSTEM Attribute
+Feedback divider x forward divider setting for the DPLL
+
+Producer: MRWB
+
+Consumers: proc_build_gpstate_table.C
+    </description>
+    <simpleType>	
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_DPLL_DIVIDER</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>FREQ_CORE_MAX</id>
+    <description>
+      SYSTEM Attribute
+Maximum frequency (binary in MHz) that any processor in the system will run.  Used to define the top end of the PState range in the frequency space.
+From this, the ATTR_PROCPM_PSTATE0_FREQUENCY is computed using ATTR_SYSTEM_REFCLK_FREQUENCY to determine the step size.
+
+Producer: MRWB (system design)
+
+Consumers: proc_build_gpstate_table.C (among others)
+    </description>
+    <simpleType>	
+        <uint32_t></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_FREQ_CORE_MAX</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<!-- End pm_attributes_all_plat.xml -->
+
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk
index 6a6cb8395..5493824be 100644
--- a/src/usr/targeting/common/xmltohb/common.mk
+++ b/src/usr/targeting/common/xmltohb/common.mk
@@ -69,7 +69,9 @@ FAPI_ATTR_SOURCES =          \
     dram_initialization/proc_setup_bars/proc_setup_bars_memory_attributes.xml \
     dram_initialization/proc_setup_bars/proc_setup_bars_l3_attributes.xml \
     dram_initialization/proc_setup_bars/proc_setup_bars_mmio_attributes.xml \
-    activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml
+    activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml \
+    runtime_attributes/pm_attributes_all_hwp.xml \
+    runtime_attributes/pm_attributes_all_plat.xml 
 
 
 XMLTOHB_GENERIC_XML     = generic.xml
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 343b0e319..f154fb129 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -35,6 +35,9 @@
        * each Centaur membuf chip has 2 MBA chiplets
         * each MBA chiplet has 2 ports
          * each MBA port connects to 2 logical dimms 
+
+     Values for pm_attributes_all_plat.xml attributes was provided by 
+         Greg Still on 10/17/1012.
      ================================================================= -->
 
 <!-- System -->
@@ -149,6 +152,23 @@
         <id>MSS_CLEANER_ENABLE</id>
         <default>1</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_R_LOADLINE</id>
+        <default>890</default>
+    </attribute>
+    <attribute><id>PROC_R_DISTLOSS</id>
+        <default>100</default>
+    </attribute>
+    <attribute><id>PROC_VRM_VOFFSET</id>
+        <default>1000</default>
+    </attribute>
+    <attribute><id>FREQ_CORE_MAX</id>
+        <default>4000</default>
+    </attribute>
+    <attribute><id>PROC_DPLL_DIVIDER</id>
+        <default>10</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- System node 0 -->
@@ -229,6 +249,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>1</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b100</default><!-- PORT0NONRED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Murano n0p0 EX units -->
@@ -753,6 +850,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40001000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>1</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b000</default><!-- NONE -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0xFF</default><!-- NONE -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>1</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Murano n0p1 EX units -->
@@ -1278,6 +1452,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40002000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>1</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b100</default><!-- PORT0NONRED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0xFF</default><!-- NONE -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>2</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Murano n0p2 EX units -->
@@ -1804,6 +2055,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40003000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>1</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b000</default><!-- NONE -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0xFF</default><!-- NONE -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>3</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Murano n0p3 EX units -->
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index e34ed07b8..32bab9ce8 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -40,6 +40,8 @@
       relationship to the FSI ports:
         cMFSI Port 0-7 = Logical MCS Port 4,5,6,7,0,1,2,3
 
+     Values for pm_attributes_all_plat.xml attributes was provided by 
+         Greg Still on 10/17/1012.
      ================================================================= -->
 
 <!-- System -->
@@ -126,6 +128,23 @@
         <id>MSS_CLEANER_ENABLE</id>
         <default>1</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_R_LOADLINE</id>
+        <default>890</default>
+    </attribute>
+    <attribute><id>PROC_R_DISTLOSS</id>
+        <default>100</default>
+    </attribute>
+    <attribute><id>PROC_VRM_VOFFSET</id>
+        <default>1000</default>
+    </attribute>
+    <attribute><id>FREQ_CORE_MAX</id>
+        <default>4000</default>
+    </attribute>
+    <attribute><id>PROC_DPLL_DIVIDER</id>
+        <default>10</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- System node 0 -->
@@ -206,6 +225,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p0 EX units -->
@@ -1065,6 +1161,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40001000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p1 EX units -->
@@ -1924,6 +2097,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40002000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p2 EX units -->
@@ -2783,6 +3033,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40003000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p3 EX units -->
@@ -3640,6 +3967,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40004000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p4 EX units -->
@@ -4499,6 +4903,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40005000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p5 EX units -->
@@ -5356,6 +5837,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40006000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p6 EX units -->
@@ -6214,6 +6772,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40007000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 <!-- Venice n0p7 EX units -->
@@ -13285,6 +13920,83 @@
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_DCM_INSTALLED</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id>
+        <default>2500</default>
+    </attribute>
+    <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SAFE_VOLTAGE</id>
+        <default>1100</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id>
+        <default>900</default>
+    </attribute>
+    <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id>
+        <default>1250</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_SPIVID_PORT_ENABLE</id>
+        <default>0b111</default><!-- REDUNDANT -->
+    </attribute>
+    <attribute><id>PM_SLEEP_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_SLEEP_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_WINKLE_ENTRY</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_EXIT</id>
+        <default>1</default><!-- ASSISTED -->
+    </attribute>
+    <attribute><id>PM_WINKLE_TYPE</id>
+        <default>1</default><!-- DEEP -->
+    </attribute>
+    <attribute><id>PM_SAFE_FREQUENCY</id>
+        <default>3200</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY</id>
+        <default>2000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY</id>
+        <default>2300</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY</id>
+        <default>3000</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY</id>
+        <default>3050</default>
+    </attribute>
+    <attribute><id>PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY</id>
+        <default>4800</default>
+    </attribute>
+    <attribute><id>PM_SPIPSS_FREQUENCY</id>
+        <default>10</default>
+    </attribute>
+    <attribute><id>PM_APSS_CHIP_SELECT</id>
+        <default>0x00</default><!-- CS0 -->
+    </attribute>
+    <attribute><id>PM_PBAX_NODEID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_CHIPID</id>
+        <default>0</default>
+    </attribute>
+    <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id>
+        <default>0</default>
+    </attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetInstance>
 
 
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 3ce48084a..a64bc44d9 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -124,6 +124,13 @@
     <attribute><id>L3_W_EPS</id></attribute>
     <attribute><id>NOMINAL_FREQ_MHZ</id></attribute>
     <attribute><id>MNFG_FLAGS</id></attribute>
+    <!-- Start pm_attributes_all_plat.xml -->
+    <attribute><id>PROC_R_LOADLINE</id></attribute>
+    <attribute><id>PROC_R_DISTLOSS</id></attribute>
+    <attribute><id>PROC_VRM_VOFFSET</id></attribute>
+    <attribute><id>FREQ_CORE_MAX</id></attribute>
+    <attribute><id>PROC_DPLL_DIVIDER</id></attribute>
+    <!-- End pm_attributes_all_plat.xml -->
 </targetType>
 
 <targetType>
@@ -227,6 +234,103 @@
      <attribute><id>SLW_IMAGE_SIZE</id></attribute>
      <attribute><id>MSS_INTERLEAVE_ENABLE</id></attribute>
      <attribute><id>MSS_MCS_GROUP_32</id></attribute>
+     <!-- Start pm_attributes_all_plat.xml -->
+     <attribute><id>PROC_DCM_INSTALLED</id></attribute>
+     <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id></attribute>
+     <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id></attribute>
+     <attribute><id>PM_SAFE_VOLTAGE</id></attribute>
+     <attribute><id>PM_PSTATE_UNDERVOLTING_MINIMUM</id></attribute>
+     <attribute><id>PM_PSTATE_UNDERVOLTING_MAXIMUM</id></attribute>
+     <attribute><id>PM_SPIVID_FREQUENCY</id></attribute>
+     <attribute><id>PM_SPIVID_PORT_ENABLE</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_WINKLE_ENTRY</id></attribute>
+     <attribute><id>PM_WINKLE_EXIT</id></attribute>
+     <attribute><id>PM_WINKLE_TYPE</id></attribute>
+     <attribute><id>PM_SAFE_FREQUENCY</id></attribute>
+     <attribute><id>PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_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_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>PM_APSS_CHIP_SELECT</id></attribute>
+     <attribute><id>PM_PBAX_NODEID</id></attribute>
+     <attribute><id>PM_PBAX_CHIPID</id></attribute>
+     <attribute><id>PM_PBAX_BRDCST_ID_VECTOR</id></attribute>
+     <!-- End pm_attributes_all_plat.xml -->
+     <!-- Start pm_attributes_all_hwp.xml -->
+     <attribute><id>PM_POWER_PROXY_TRACE_TIMER</id></attribute>
+     <attribute><id>PM_PPT_TIMER_MATCH_VALUE</id></attribute>
+     <attribute><id>PM_PPT_TIMER_TICK</id></attribute>
+     <attribute><id>PM_AISS_TIMEOUT</id></attribute>
+     <attribute><id>PM_PSTATE_STEPSIZE</id></attribute>
+     <attribute><id>PM_EXTERNAL_VRM_STEPDELAY_RANGE</id></attribute>
+     <attribute><id>PM_EXTERNAL_VRM_STEPDELAY_VALUE</id></attribute>
+     <attribute><id>PM_PMC_HANGPULSE_DIVIDER</id></attribute>
+     <attribute><id>PM_PVSAFE_PSTATE</id></attribute>
+     <attribute><id>PM_SPIVID_FRAME_SIZE</id></attribute>
+     <attribute><id>PM_SPIVID_IN_DELAY_FRAME1</id></attribute>
+     <attribute><id>PM_SPIVID_IN_DELAY_FRAME2</id></attribute>
+     <attribute><id>PM_SPIVID_CLOCK_POLARITY</id></attribute>
+     <attribute><id>PM_SPIVID_CLOCK_PHASE</id></attribute>
+     <attribute><id>PM_SPIVID_CLOCK_DIVIDER</id></attribute>
+     <attribute><id>PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS</id></attribute>
+     <attribute><id>PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS_VALUE</id></attribute>
+     <attribute><id>PM_SPIVID_INTER_RETRY_DELAY_VALUE</id></attribute>
+     <attribute><id>PM_SPIVID_INTER_RETRY_DELAY</id></attribute>
+     <attribute><id>PM_SPIVID_CRC_GEN_ENABLE</id></attribute>
+     <attribute><id>PM_SPIVID_CRC_CHECK_ENABLE</id></attribute>
+     <attribute><id>PM_SPIVID_MAJORITY_VOTE_ENABLE</id></attribute>
+     <attribute><id>PM_SPIVID_MAX_RETRIES</id></attribute>
+     <attribute><id>PM_SPIVID_CRC_POLYNOMIAL_ENABLES</id></attribute>
+     <attribute><id>PM_OCC_HEARTBEAT_TIME</id></attribute>
+     <attribute><id>PM_SLEEP_WINKLE_REQUEST_TIMEOUT</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_CORE_DELAY0</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_CORE_DELAY1</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_CORE_DELAY0_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_CORE_DELAY1_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_CORE_DELAY0</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_CORE_DELAY1</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_CORE_DELAY0_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_CORE_DELAY1_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_ECO_DELAY0</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_ECO_DELAY1</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_ECO_DELAY0_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_ECO_DELAY1_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_ECO_DELAY0</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_ECO_DELAY1</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_ECO_DELAY0_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_ECO_DELAY1_VALUE</id></attribute>
+     <attribute><id>PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT</id></attribute>
+     <attribute><id>PM_PSTATE0_FREQUENCY</id></attribute>
+     <attribute><id>PM_IVRMS_ENABLED</id></attribute>
+     <attribute><id>PM_SAFE_PSTATE</id></attribute>
+     <attribute><id>PM_RESONANT_CLOCK_ENABLE</id></attribute>
+     <attribute><id>PM_RESONANT_CLOCK_FULL_CSB_PSTATE</id></attribute>
+     <attribute><id>PM_RESONANT_CLOCK_LFRLOW_PSTATE</id></attribute>
+     <attribute><id>PM_RESONANT_CLOCK_LFRUPPER_PSTATE</id></attribute>
+     <attribute><id>PM_RESONANT_CLOCK_HFRLOW_PSTATE</id></attribute>
+     <attribute><id>PM_RESONANT_CLOCK_HFRHIGH_PSTATE</id></attribute>
+     <attribute><id>PM_SPIPSS_FRAME_SIZE</id></attribute>
+     <attribute><id>PM_SPIPSS_OUT_COUNT</id></attribute>
+     <attribute><id>PM_SPIPSS_IN_DELAY</id></attribute>
+     <attribute><id>PM_SPIPSS_IN_COUNT</id></attribute>
+     <attribute><id>PM_SPIPSS_CLOCK_POLARITY</id></attribute>
+     <attribute><id>PM_SPIPSS_CLOCK_PHASE</id></attribute>
+     <attribute><id>PM_SPIPSS_CLOCK_DIVIDER</id></attribute>
+     <attribute><id>PM_SPIPSS_INTER_FRAME_DELAY_SETTING</id></attribute>
+     <attribute><id>PM_SPIPSS_INTER_FRAME_DELAY</id></attribute>
+     <attribute><id>PM_PBAX_RCV_RESERV_TIMEOUT</id></attribute>
+     <attribute><id>PM_PBAX_SND_RETRY_COUNT_OVERCOMMIT_ENABLE</id></attribute>
+     <attribute><id>PM_PBAX_SND_RETRY_THRESHOLD</id></attribute>
+     <attribute><id>PM_PBAX_SND_RESERV_TIMEOUT</id></attribute>
+     <!-- End pm_attributes_all_hwp.xml -->
 </targetType>
 
 <targetType>
@@ -323,6 +427,11 @@
         <id>TYPE</id>
         <default>EX</default>
     </attribute>
+    <!-- Start pm_attributes_all_hwp.xml -->
+    <attribute><id>PM_SPWUP_FSP</id></attribute>
+    <attribute><id>PM_SPWUP_OCC</id></attribute>
+    <attribute><id>PM_SPWUP_PHYP</id></attribute>
+    <!-- End pm_attributes_all_hwp.xml -->
 </targetType>
 
 <targetType>
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index 3ea0493d9..f09d6c5d7 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -275,6 +275,7 @@ sub validateSubElements {
 
     if($mustBeHash && (ref($element) ne "HASH"))
     {
+        print "name=$name, mustBeHash=$mustBeHash, element=$element, criteria=$criteria \n";
         fatal("$name must be in the form of a hash.");
     }
 
@@ -285,7 +286,7 @@ sub validateSubElements {
         if(!exists $criteria->{$subElementName})
         {
             fatal("$name element cannot have child element of type "
-                . "\"$subElementName\".");
+                  . "\"$subElementName\".");
         }
     }
 
@@ -295,15 +296,15 @@ sub validateSubElements {
            && (!exists $element->{$subElementName}))
         {
             fatal("$name element missing required child element "
-                . "\"$subElementName\".");
+                  . "\"$subElementName\".");
         }
 
         if(exists $element->{$subElementName}
-            && ($criteria->{$subElementName}{isscalar} == 1)
-            && (ref ($element->{$subElementName}) eq "HASH"))
+           && ($criteria->{$subElementName}{isscalar} == 1)
+             && (ref ($element->{$subElementName}) eq "HASH"))
         {
             fatal("$name element child element \"$subElementName\" should be "
-                . "scalar, but is a hash.");
+                  . "scalar, but is a hash.");
         }
     }
 }
author	Dan Crowell <dcrowell@us.ibm.com>	2012-10-08 14:26:42 -0500
committer	A. Patrick Williams III <iawillia@us.ibm.com>	2012-11-07 16:03:23 -0600
commit	d871f70ebe8e9e91d8dd4b604dfee0303461b9aa (patch)
tree	4e4ee913e7177514f5569df07ff51423a15432e3 /src/usr/targeting
parent	90190a610b3452c34eb1e4848f66ad54d22e6a6f (diff)
download	talos-hostboot-d871f70ebe8e9e91d8dd4b604dfee0303461b9aa.tar.gz talos-hostboot-d871f70ebe8e9e91d8dd4b604dfee0303461b9aa.zip