PM plat attribute updates to handle MRW changes

Change-Id: I076ed28668e983705bf8f83c022b4fd1c0b886d4
RTC:162893
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35912
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 17 insertions, 10 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 2a8c6500a..5363a5edf 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -335,6 +335,8 @@ push @systemAttr,
     "MSS_MRW_PERIODIC_MEMCAL_MODE_OPTIONS", $reqPol->{'mss_mrw_periodic_memcal_mode_options'},
     "MSS_MRW_PERIODIC_ZQCAL_MODE_OPTIONS", $reqPol->{'mss_mrw_periodic_zqcal_mode_options'},
     "MSS_MRW_SAFEMODE_MEM_THROTTLED_N_COMMANDS_PER_PORT", $reqPol->{'mss_mrw_safemode_mem_throttled_n_commands_per_port'},
+    "MSS_MRW_PWR_SLOPE", $reqPol->{'mss_mrw_pwr_slope'},
+    "MSS_MRW_PWR_INTERCEPT", $reqPol->{'mss_mrw_pwr_intercept'},
     "PROC_FSP_MMIO_MASK_SIZE", 0x0000000100000000,
     "PROC_FSP_BAR_SIZE", 0xFFFFFC00FFFFFFFF,
     "PROC_FSP_BAR_BASE_ADDR_OFFSET", 0x0000030100000000 ,
@@ -345,13 +347,24 @@ push @systemAttr,
     "PROC_NPU_MMIO_BAR_BASE_ADDR_OFFSET", 0x0000030200000000,
     "CP_REFCLOCK_RCVR_TERM", $reqPol->{'processor-refclock-receiver-termination'},
     "IO_REFCLOCK_RCVR_TERM", $reqPol->{'pci-refclock-receiver-termination'},
-    #TODO RTC: 163418 Set Power Management Attribute Defaults based on MRW values
     "SYSTEM_WOF_ENABLED", $reqPol->{'system_wof_enabled'},
     "VDM_ENABLE", $reqPol->{'vdm_enable'},
     "IVRM_DEADZONE_MV", $reqPol->{'ivrm_deadzone_mv'},
     "SYSTEM_RESCLK_STEP_DELAY", $reqPol->{'system_resclk_step_delay'},
     #TODO RTC: 167921 Add MRW parsing code to perl scripts to populate ATTR_NEST_LEAKAGE_PERCENT
     "NEST_LEAKAGE_PERCENT", 60,
+    "TDP_RDP_CURRENT_FACTOR", $reqPol->{'tdp_rdp_current_factor'},
+    "PM_SAFE_VOLTAGE_MV", $reqPol->{'pm_safe_voltage_mv'},
+    "IVRM_STRENGTH_LOOKUP", $reqPol->{'ivrm_strength_lookup'},
+    "IVRM_VIN_MULTIPLIER", $reqPol->{'ivrm_vin_multiplier'},
+    "IVRM_VIN_MAX_MV", $reqPol->{'ivrm_vin_max_mv'},
+    "IVRM_STEP_DELAY_NS", $reqPol->{'ivrm_step_delay_ns'},
+    "IVRM_STABILIZATION_DELAY_NS", $reqPol->{'ivrm_stabilization_delay_ns'},
+    "SYSTEM_RESCLK_ENABLE", $reqPol->{'system_resclk_enable'},
+    "STOP4_DISABLE", $reqPol->{'stop4_disable'},
+    "STOP5_DISABLE", $reqPol->{'stop5_disable'},
+    "STOP8_DISABLE", $reqPol->{'stop8_disable'},
+    "STOP11_DISABLE", $reqPol->{'stop11_disable'},
 ];
 
 if ($reqPol->{'mss_mrw_refresh_rate_request'} eq 'SINGLE')
@@ -681,10 +694,10 @@ my $pbaxId;
 
 foreach my $i (@{$pmSettings->{'processor-settings'}})
 {
-    if(exists $i->{pm_pbax_groupid})
+    if(exists $i->{pbax_groupid})
     {
         $pbaxAttr = "PBAX_GROUPID";
-        $pbaxId = $i->{pm_pbax_groupid};
+        $pbaxId = $i->{pbax_groupid};
     }
     else
     {
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 5d6495108..46c08c458 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -5661,8 +5661,6 @@ Divider for the 1us PBAX hang pulse.  A hang is detected after two divided hang
     </description>
     <simpleType>
         <uint8_t>
-<!-- TODO RTC:162070 Temporary default -->
-            <default>0</default>
         </uint8_t>
     </simpleType>
     <persistency>non-volatile</persistency>
@@ -31459,8 +31457,6 @@ Measured in GB</description>
     </description>
     <simpleType>
         <uint32_t>
-<!-- TODO RTC:162072 Temporary default -->
-            <default>0</default>
         </uint32_t>
     </simpleType>
     <persistency>non-volatile</persistency>
@@ -32286,7 +32282,6 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
-<!--TODO RTC:163418 Get Attribute defaults from MRW for the following (START)-->
 <attribute>
     <id>PM_SAFE_VOLTAGE_MV</id>
     <description>
@@ -32392,7 +32387,7 @@ Measured in GB</description>
 </attribute>
 
 <attribute>
-    <id>SYSTEM_RESCLK_ENABLE</id> <!-- <vdm_enable>OFF</vdm_enable> ??-->
+    <id>SYSTEM_RESCLK_ENABLE</id>
     <description>
       Controls the enablement of resonant clocking in the system.
 
@@ -32413,7 +32408,6 @@ Measured in GB</description>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
-<!--TODO RTC:163418 Get Attribute defaults from MRW for the previous (END)-->
 
 <attribute>
     <id>BAD_DQ_BITMAP</id>