diff options
Diffstat (limited to 'src/usr')
5 files changed, 20 insertions, 10 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 983a2a143..589447457 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -2771,7 +2771,7 @@ sub generate_sys #TODO CQ:SW352246 Replace hardcoded defaults with MRW values print " <attribute> - <id>MEMVPD_FREQS_MHZ</id> + <id>MSS_MRW_SUPPORTED_FREQ</id> <default> 2133, 2400, diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 913fe168e..cef38c4f6 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -10668,7 +10668,7 @@ firmware notes: Used as override attribute for pstate procedure <!--TOOD RTC: 151938 Make sure that these are set up by parseMRW script--> <attribute> - <id>MEMVPD_FREQS_MHZ</id> + <id>MSS_MRW_SUPPORTED_FREQ</id> <description> List of memory frequencies supported by the current system. </description> @@ -10681,7 +10681,7 @@ firmware notes: Used as override attribute for pstate procedure <persistency>non-volatile</persistency> <readable/> <hwpfToHbAttrMap> - <id>ATTR_MEMVPD_FREQS_MHZ</id> + <id>ATTR_MSS_MRW_SUPPORTED_FREQ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> @@ -19124,17 +19124,23 @@ Measured in GB</description> <id>MAX_ALLOWED_DIMM_FREQ</id> <description> Maximum frequency (in MHz) that this system can run the DIMMs at. - There are 4 possible values determined by the dimm configuration. + There are 5 possible values determined by the dimm configuration. + For configurations which have mixed rank configurations, the lowest + frequency based on ranks of either DIMM is chosen. For example if + there was a 1R and a 2R DIMM installed, and 1R dual drop was a lower + max freq than 2R dual drop, then the 1R max freq would be the max allowed. [0]=One rank, single drop [1]=Two rank, single drop - [2]=One rank, dual drop - [3]=Two rank, dual drop + [2]=Four rank, single drop + [3]=One rank, dual drop + [4]=Two rank, dual drop A value of zero would indicate an unsupported configuration. </description> <simpleType> <uint32_t> + <default>2400,2400,2400,2400,2400</default> </uint32_t> - <array>4</array> + <array>5</array> </simpleType> <hwpfToHbAttrMap> <id>ATTR_MAX_ALLOWED_DIMM_FREQ</id> diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml index 221547a8e..56f0ed6ea 100644 --- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml @@ -101,6 +101,10 @@ <id>FREQ_PB_MHZ</id> <default>0x7D0</default> </attribute> + <attribute> + <id>REQUIRED_SYNCH_MODE</id> + <default>2</default><!-- NEVER --> + </attribute> <attribute> <id>PAYLOAD_BASE</id> <!-- Value of 0x0 for standalone systems, no payload to start --> @@ -127,7 +131,7 @@ <default>EPS_TYPE_LE</default> </attribute> <attribute> - <id>MEMVPD_FREQS_MHZ</id> + <id>MSS_MRW_SUPPORTED_FREQ</id> <default> 2133, 2400, diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 1ac64aa7a..83e2b4c4e 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -576,7 +576,7 @@ </attribute> <attribute><id>HB_HRMOR_NODAL_BASE</id></attribute> <attribute><id>TPM_REQUIRED</id></attribute> - <attribute><id>MEMVPD_FREQS_MHZ</id></attribute> + <attribute><id>MSS_MRW_SUPPORTED_FREQ</id></attribute> <!-- Max/min config attributes --> <attribute><id>MAX_PROC_CHIPS_PER_NODE</id></attribute> <attribute><id>MAX_EXS_PER_PROC_CHIP</id></attribute> diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml index ba76e51b5..41d4a6c54 100644 --- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml @@ -131,7 +131,7 @@ <default>EPS_TYPE_LE</default> </attribute> <attribute> - <id>MEMVPD_FREQS_MHZ</id> + <id>MSS_MRW_SUPPORTED_FREQ</id> <default> 1866, 2133, |
