Replace hardcoded values in genHwsvMrw script with real MRW values

Previously we had hardcoded some attributes from
memory_mrw_attributes.xml because they were not in the MRW yet
Now they have been added and two attributes have been marked
as depricated.

Change-Id: Ifadb18d20101853178f029ff363ccfca6af26991
RTC: 161768
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31161
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 53 insertions, 11 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 63b5d4fce..48f2bb13b 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -329,15 +329,10 @@ push @systemAttr,
     "MSS_MRW_PREFETCH_ENABLE", $reqPol->{'mss_prefetch_enable'},
     "MSS_MRW_CLEANER_ENABLE", $reqPol->{'mss_cleaner_enable'},
     #TODO RTC:161768 these need to come from MRW
-    "MSS_MRW_MEM_M_DRAM_CLOCKS", 512,
-    "MSS_MRW_FINE_REFRESH_MODE", 0,
-    "MSS_MRW_TEMP_REFRESH_RANGE", 1,
-    "MSS_MRW_RESET_DELAY_BEFORE_CAL", 0,
-    "MSS_MRW_MCS_PREFETCH_RETRY_THRESHOLD", 0,
-    "MSS_MRW_PERIODIC_MEMCAL_MODE_OPTIONS", 0xD90C,
-    "MSS_MRW_PERIODIC_ZQCAL_MODE_OPTIONS", 0x8000,
-    "MSS_MRW_DRAM_2N_MODE", 0,
-    "MSS_MRW_SAFEMODE_MEM_THROTTLED_N_COMMANDS_PER_PORT", 32,
+    "MSS_MRW_MEM_M_DRAM_CLOCKS", $reqPol->{'mss_mrw_mem_m_dram_clocks'},
+    "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'},
     "PROC_FSP_MMIO_MASK_SIZE", 0x0000000100000000,
     "PROC_FSP_BAR_SIZE", 0xFFFFFC00FFFFFFFF,
     "PROC_FSP_BAR_BASE_ADDR_OFFSET", 0x0000030100000000 ,
@@ -348,6 +343,49 @@ push @systemAttr,
     "PROC_NPU_MMIO_BAR_BASE_ADDR_OFFSET", 0x0000030200000000,
 ];
 
+if ($reqPol->{'mss_mrw_fine_refresh_mode'} eq 'NORMAL')
+{
+    push @systemAttr, ['MSS_MRW_FINE_REFRESH_MODE', 0];
+}
+elsif ($reqPol->{'mss_mrw_fine_refresh_mode'} eq 'FIXED_2X')
+{
+    push @systemAttr, ['MSS_MRW_FINE_REFRESH_MODE', 1];
+}
+elsif ($reqPol->{'mss_mrw_fine_refresh_mode'} eq 'FIXED_4X')
+{
+    push @systemAttr, ['MSS_MRW_FINE_REFRESH_MODE', 2];
+}
+elsif ($reqPol->{'mss_mrw_fine_refresh_mode'} eq 'FLY_2X')
+{
+    push @systemAttr, ['MSS_MRW_FINE_REFRESH_MODE', 5];
+}
+elsif ($reqPol->{'mss_mrw_fine_refresh_mode'} eq 'FLY_4X')
+{
+    push @systemAttr, ['MSS_MRW_FINE_REFRESH_MODE', 6];
+}
+
+if ($reqPol->{'mss_mrw_temp_refresh_range'} eq 'NORMAL')
+{
+    push @systemAttr, ['MSS_MRW_TEMP_REFRESH_RANGE', 0];
+}
+elsif ($reqPol->{'mss_mrw_temp_refresh_range'} eq 'EXTEND')
+{
+    push @systemAttr, ['MSS_MRW_TEMP_REFRESH_RANGE', 1];
+}
+
+if ($reqPol->{'mss_mrw_dram_2N_mode'} eq 'AUTO')
+{
+    push @systemAttr, ['MSS_MRW_DRAM_2N_MODE', 0];
+}
+elsif ($reqPol->{'mss_mrw_dram_2N_mode'} eq 'FORCE_TO_1N_MODE')
+{
+    push @systemAttr, ['MSS_MRW_DRAM_2N_MODE', 1];
+}
+elsif ($reqPol->{'mss_mrw_dram_2N_mode'} eq 'FORCE_TO_2N_MODE')
+{
+    push @systemAttr, ['MSS_MRW_DRAM_2N_MODE', 2];
+}
+
 if ($reqPol->{'required_synch_mode'} eq 'never')
 {
     push @systemAttr, ['REQUIRED_SYNCH_MODE', 2];
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index bd9b76419..a5014d84b 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -18259,6 +18259,7 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
+<!--Deprecated-->
 <attribute>
     <id>MSS_MRW_MCS_PREFETCH_RETRY_THRESHOLD</id>
     <description>
@@ -18270,13 +18271,14 @@ Measured in GB</description>
     <simpleType>
         <uint8_t></uint8_t>
     </simpleType>
-    <persistency>non-volatile</persistency>
+    <persistency>volatile-zeroed</persistency>
     <readable/>
     <hwpfToHbAttrMap>
         <id>ATTR_MSS_MRW_MCS_PREFETCH_RETRY_THRESHOLD</id>
         <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
+<!--Deprecated-->
 
 <attribute>
     <id>EFF_DRAM_TCCD_S</id>
@@ -24835,6 +24837,7 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
+<!--Deprecated-->
 <attribute>
     <id>MSS_MRW_RESET_DELAY_BEFORE_CAL</id>
     <description>
@@ -24845,13 +24848,14 @@ Measured in GB</description>
       <uint8_t>
       </uint8_t>
     </simpleType>
-    <persistency>non-volatile</persistency>
+    <persistency>volatile-zeroed</persistency>
     <readable/>
     <hwpfToHbAttrMap>
       <id>ATTR_MSS_MRW_RESET_DELAY_BEFORE_CAL</id>
       <macro>DIRECT</macro>
     </hwpfToHbAttrMap>
 </attribute>
+<!--Deprecated-->
 
 <attribute>
     <id>MSS_MRW_PERIODIC_MEMCAL_MODE_OPTIONS</id>