diff options
author | Nick Bofferding <bofferdn@us.ibm.com> | 2015-03-11 00:37:28 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-03-26 07:10:30 -0500 |
commit | 443e443dd12dd902ab58143a19c6489a27307abd (patch) | |
tree | 5de5693ad2d83a8cd70c3fee029f12a54cfde2a1 | |
parent | 9ab6a2659dd6378e1b5317d3eac1e664cb8cdfec (diff) | |
download | talos-hostboot-443e443dd12dd902ab58143a19c6489a27307abd.tar.gz talos-hostboot-443e443dd12dd902ab58143a19c6489a27307abd.zip |
Support Alpine per-socket proc loadline attributes
- Moved proc loadline attributes to processor target, from system
- Moved same attributes from system to proc for runtime
- Updated runtime tests to use different system attributes
- Updated MRW parser to override invidual proc loadline attributes
- Updated system XML files to reflect attribute moves
Change-Id: Ie61c3ef87ce20b5fd8f537f63ec97904d89859b6
RTC: 125036
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16595
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r-- | src/usr/runtime/common/hsvc_procdata.C | 6 | ||||
-rw-r--r-- | src/usr/runtime/common/hsvc_sysdata.C | 6 | ||||
-rw-r--r-- | src/usr/runtime/test/runtimeattrstest.H | 40 | ||||
-rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 60 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_MURANO.system.xml | 120 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml | 120 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_VENICE.system.xml | 216 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 14 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml | 120 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml | 125 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml | 72 |
11 files changed, 714 insertions, 185 deletions
diff --git a/src/usr/runtime/common/hsvc_procdata.C b/src/usr/runtime/common/hsvc_procdata.C index 8e177143f..d2e6a7f01 100644 --- a/src/usr/runtime/common/hsvc_procdata.C +++ b/src/usr/runtime/common/hsvc_procdata.C @@ -162,6 +162,12 @@ HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VCS_BIAS_DOWN ); HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VCS_BIAS_UP ); HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VDD_BIAS_DOWN ); HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VDD_BIAS_UP ); +HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VCS ); +HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VDD ); +HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VCS ); +HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VDD ); +HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VCS ); +HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VDD ); // -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml -- HSVC_LOAD_ATTR( ATTR_PNOR_I2C_ADDRESS_BYTES ); HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_ADDRESS_BYTES ); diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C index b9a94e380..5068c9c74 100644 --- a/src/usr/runtime/common/hsvc_sysdata.C +++ b/src/usr/runtime/common/hsvc_sysdata.C @@ -75,12 +75,6 @@ HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_SYSTEM_IVRMS_ENABLED ); HSVC_LOAD_ATTR( ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL ); -HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VCS ); -HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VDD ); -HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VCS ); -HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VDD ); -HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VCS ); -HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VDD ); // -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml -- // No attributes found // -- Input: ../../xml/attribute_info/proc_chip_ec_feature.xml -- diff --git a/src/usr/runtime/test/runtimeattrstest.H b/src/usr/runtime/test/runtimeattrstest.H index ee0eb7f76..9236225bd 100644 --- a/src/usr/runtime/test/runtimeattrstest.H +++ b/src/usr/runtime/test/runtimeattrstest.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -88,13 +90,14 @@ class RuntimeAttrsTest: public CxxTest::TestSuite } bool freq_found = false; - fapi::ATTR_PROC_R_LOADLINE_VDD_Type loadline = 0; - l_rc = FAPI_ATTR_GET(ATTR_PROC_R_LOADLINE_VDD,NULL,loadline); + fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type vpdMinLevel = 0; + l_rc = FAPI_ATTR_GET( + ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL,NULL,vpdMinLevel); if( l_rc ) { - TS_FAIL("Error getting fapi::ATTR_PROC_R_LOADLINE_VDD"); + TS_FAIL("Error getting fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL"); } - bool loadline_found = false; + bool vpdMinLevel_found = false; uint64_t attr = 0; while( headers[attr].id != hsvc_attr_header_t::NO_ATTRIBUTE ) @@ -120,24 +123,28 @@ class RuntimeAttrsTest: public CxxTest::TestSuite } } } - else if( headers[attr].id == fapi::ATTR_PROC_R_LOADLINE_VDD ) + else if( headers[attr].id + == fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL ) { - loadline_found = true; + vpdMinLevel_found = true; if( headers[attr].sizeBytes != - sizeof(fapi::ATTR_PROC_R_LOADLINE_VDD_Type) ) + sizeof(fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type) ) { TRACFCOMP( g_trac_runtime, "size=%.16X", headers[attr].sizeBytes ); - TS_FAIL("Size of fapi::ATTR_PROC_R_LOADLINE_VDD data is wrong"); + TS_FAIL("Size of fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL " + "data is wrong"); } else { - fapi::ATTR_PROC_R_LOADLINE_VDD_Type* loadline_act = - reinterpret_cast<fapi::ATTR_PROC_R_LOADLINE_VDD_Type*> + fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type* + vpdMinLevel_act = reinterpret_cast< + fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type*> (beginning+headers[attr].offset); - if( *loadline_act != loadline ) + if( *vpdMinLevel_act != vpdMinLevel ) { - TRACFCOMP( g_trac_runtime, "Expected=%X, Actual=%X", loadline, *loadline_act ); - TS_FAIL("fapi::ATTR_PROC_R_LOADLINE_VDD data is wrong"); + TRACFCOMP( g_trac_runtime, "Expected=%X, Actual=%X", vpdMinLevel, *vpdMinLevel_act ); + TS_FAIL("fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL data " + "is wrong"); } } } @@ -154,9 +161,10 @@ class RuntimeAttrsTest: public CxxTest::TestSuite { TS_FAIL("Never found FREQ_PB in system attributes"); } - if( !loadline_found ) + if( !vpdMinLevel_found ) { - TS_FAIL("Never found ATTR_PROC_R_LOADLINE_VDD in system attributes"); + TS_FAIL("Never found ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL in system " + "attributes"); } TRACFCOMP( g_trac_runtime, "testVerifySystemAttributes> finish" ); diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 76404387e..7cc87ce82 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -148,7 +148,11 @@ my $mruAttr = parse_xml_file($mru_ids_file); # Process the system-policy MRW file #------------------------------------------------------------------------------ my $system_policy_file = open_mrw_file($mrwdir, "${sysname}-system-policy.xml"); -my $sysPolicy = parse_xml_file($system_policy_file); +my $sysPolicy = parse_xml_file($system_policy_file, + forcearray=>['proc_r_loadline_vdd','proc_r_distloss_vdd', + 'proc_vrm_voffset_vdd','proc_r_loadline_vcs','proc_r_distloss_vcs', + 'proc_vrm_voffset_vcs']); + my $reqPol = $sysPolicy->{"required-policy-settings"}; my @systemAttr; # Repeated {ATTR, VAL, ATTR, VAL, ATTR, VAL...} @@ -207,12 +211,6 @@ push @systemAttr, "PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY", $reqPol->{'pm_resonant_clock_high_band_upper_frequency'}->{content}, "PM_SPIPSS_FREQUENCY", $reqPol->{'pm_spipss_frequency'}->{content}, - "PROC_R_LOADLINE_VDD", $reqPol->{'proc_r_loadline_vdd'}, - "PROC_R_DISTLOSS_VDD", $reqPol->{'proc_r_distloss_vdd'}, - "PROC_VRM_VOFFSET_VDD", $reqPol->{'proc_vrm_voffset_vdd'}, - "PROC_R_LOADLINE_VCS", $reqPol->{'proc_r_loadline_vcs'}, - "PROC_R_DISTLOSS_VCS", $reqPol->{'proc_r_distloss_vcs'}, - "PROC_VRM_VOFFSET_VCS", $reqPol->{'proc_vrm_voffset_vcs'}, "MEM_MIRROR_PLACEMENT_POLICY", $placement, "MRW_DIMM_POWER_CURVE_PERCENT_UPLIFT", $reqPol->{'dimm_power_curve_percent_uplift'}, @@ -262,6 +260,34 @@ push @systemAttr, "OPT_MEMMAP_GROUP_POLICY", $reqPol->{'memmap_group_policy'}, ]; +my %procLoadline = (); +$procLoadline{PROC_R_LOADLINE_VDD}{sys} = $reqPol->{'proc_r_loadline_vdd' }[0]; +$procLoadline{PROC_R_DISTLOSS_VDD}{sys} = $reqPol->{'proc_r_distloss_vdd' }[0]; +$procLoadline{PROC_VRM_VOFFSET_VDD}{sys} = $reqPol->{'proc_vrm_voffset_vdd'}[0]; +$procLoadline{PROC_R_LOADLINE_VCS}{sys} = $reqPol->{'proc_r_loadline_vcs' }[0]; +$procLoadline{PROC_R_DISTLOSS_VCS}{sys} = $reqPol->{'proc_r_distloss_vcs' }[0]; +$procLoadline{PROC_VRM_VOFFSET_VCS}{sys} = $reqPol->{'proc_vrm_voffset_vcs'}[0]; + +my $optPol = $sysPolicy->{"optional-policy-settings"}; +if(defined $optPol->{'loadline-overrides'}) +{ + foreach my $attr (keys %procLoadline) + { + my $mrwPolicy = lc $attr; + foreach my $pol (@ {$optPol->{'loadline-overrides'}{$mrwPolicy}} ) + { + if(defined $pol->{target}) + { + if(defined $procLoadline{$attr}{ $pol->{target} }) + { + die "Multiple overrides of $attr specified for same target " + . "proc $pol->{target}\n"; + } + $procLoadline{$attr}{ $pol->{target} } = $pol->{content} ; + } + } + } +} if ($reqPol->{'mba_cacheline_interleave_mode_control'} eq 'required') { @@ -3245,7 +3271,25 @@ sub generate_proc </attribute>\n"; } - print " </targetInstance>\n"; + my $nXpY = "n" . $node . "p" . $proc; + foreach my $attr (keys %procLoadline) + { + my $val; + if(defined $procLoadline{$attr}{ $nXpY }) + { + $val = $procLoadline{$attr}{ $nXpY }; + } + else + { + $val = $procLoadline{$attr}{sys}; + } + print " <attribute>\n"; + print " <id>$attr</id>\n"; + print " <default>$val</default>\n"; + print " </attribute>\n"; + } + + print "</targetInstance>\n"; } diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index 0f507be10..f7551fc7d 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -222,30 +222,6 @@ <default>0xa</default> </attribute> <attribute> - <id>PROC_R_LOADLINE_VDD</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VDD</id> - <default>0x140</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VDD</id> - <default>0</default> - </attribute> - <attribute> - <id>PROC_R_LOADLINE_VCS</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VCS</id> - <default>0xdac</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VCS</id> - <default>0</default> - </attribute> - <attribute> <id>MEM_MIRROR_PLACEMENT_POLICY</id> <default>0</default><!-- NORMAL --> </attribute> @@ -741,6 +717,30 @@ <id>I2C_BUS_SPEED_ARRAY</id> <default>1000,1000,0,400,0,0</default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n0p0 EX units --> @@ -1631,6 +1631,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n0p1 EX units --> @@ -2518,6 +2542,30 @@ <id>I2C_BUS_SPEED_ARRAY</id> <default>1000,1000,0,400,0,0</default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n0p2 EX units --> @@ -3399,6 +3447,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n0p3 EX units --> diff --git a/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml b/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml index 39dca5dcd..ae7e3402e 100644 --- a/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NAPLES.system.xml @@ -207,30 +207,6 @@ <default>0xa</default> </attribute> <attribute> - <id>PROC_R_LOADLINE_VDD</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VDD</id> - <default>0x140</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VDD</id> - <default>0</default> - </attribute> - <attribute> - <id>PROC_R_LOADLINE_VCS</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VCS</id> - <default>0xdac</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VCS</id> - <default>0</default> - </attribute> - <attribute> <id>MEM_MIRROR_PLACEMENT_POLICY</id> <default>0</default><!-- NORMAL --> </attribute> @@ -693,6 +669,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Naples n0p0 EX units --> @@ -1563,6 +1563,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Naples n0p1 EX units --> @@ -2424,6 +2448,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Naples n0p2 EX units --> @@ -3285,6 +3333,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Naples 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 8adbbc1fa..c25236472 100644 --- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml @@ -226,30 +226,6 @@ <default>0xa</default> </attribute> <attribute> - <id>PROC_R_LOADLINE_VDD</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VDD</id> - <default>0x140</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VDD</id> - <default>0</default> - </attribute> - <attribute> - <id>PROC_R_LOADLINE_VCS</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VCS</id> - <default>0xdac</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VCS</id> - <default>0</default> - </attribute> - <attribute> <id>MEM_MIRROR_PLACEMENT_POLICY</id> <default>0</default><!-- NORMAL --> </attribute> @@ -703,6 +679,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p0 EX units --> @@ -1945,6 +1945,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p1 EX units --> @@ -3186,6 +3210,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p2 EX units --> @@ -4427,6 +4475,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p3 EX units --> @@ -5668,6 +5740,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p4 EX units --> @@ -6878,6 +6974,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p5 EX units --> @@ -8086,6 +8206,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p6 EX units --> @@ -9294,6 +9438,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p7 EX units --> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index d2376886b..15e19500c 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -141,12 +141,6 @@ <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>PROC_R_LOADLINE_VDD</id></attribute> - <attribute><id>PROC_R_DISTLOSS_VDD</id></attribute> - <attribute><id>PROC_VRM_VOFFSET_VDD</id></attribute> - <attribute><id>PROC_R_LOADLINE_VCS</id></attribute> - <attribute><id>PROC_R_DISTLOSS_VCS</id></attribute> - <attribute><id>PROC_VRM_VOFFSET_VCS</id></attribute> <attribute><id>FREQ_CORE_MAX</id></attribute> <attribute><id>CPM_TURBO_BOOST_PERCENT</id></attribute> <!-- End pm_plat_attributes.xml --> @@ -525,7 +519,13 @@ </attribute> <attribute><id>PROC_PCIE_LANE_EQUALIZATION</id></attribute> <attribute><id>CDM_DOMAIN</id><default>FABRIC</default></attribute> - <attribute><id>HOT_PLUG_POWER_CONTROLLER_INFO</id></attribute> + <attribute><id>HOT_PLUG_POWER_CONTROLLER_INFO</id></attribute> + <attribute><id>PROC_R_LOADLINE_VDD</id></attribute> + <attribute><id>PROC_R_DISTLOSS_VDD</id></attribute> + <attribute><id>PROC_VRM_VOFFSET_VDD</id></attribute> + <attribute><id>PROC_R_LOADLINE_VCS</id></attribute> + <attribute><id>PROC_R_DISTLOSS_VCS</id></attribute> + <attribute><id>PROC_VRM_VOFFSET_VCS</id></attribute> </targetType> <targetType> diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml index e65ef9bb4..6fe6c9532 100644 --- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml @@ -189,30 +189,6 @@ <default>0xa</default> </attribute> <attribute> - <id>PROC_R_LOADLINE_VDD</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VDD</id> - <default>0x140</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VDD</id> - <default>0</default> - </attribute> - <attribute> - <id>PROC_R_LOADLINE_VCS</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VCS</id> - <default>0xdac</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VCS</id> - <default>0</default> - </attribute> - <attribute> <id>MNFG_DMI_MIN_EYE_WIDTH</id> <default>0x0a</default> </attribute> @@ -527,6 +503,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n0p0 EX units @@ -978,6 +978,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n0p1 EX units @@ -1413,6 +1437,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n2p0 EX units @@ -1849,6 +1897,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Murano n2p1 EX units diff --git a/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml b/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml index bdf99c249..3c3302a1e 100644 --- a/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml @@ -189,30 +189,6 @@ <default>0xa</default> </attribute> <attribute> - <id>PROC_R_LOADLINE_VDD</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VDD</id> - <default>0x140</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VDD</id> - <default>0</default> - </attribute> - <attribute> - <id>PROC_R_LOADLINE_VCS</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VCS</id> - <default>0xdac</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VCS</id> - <default>0</default> - </attribute> - <attribute> <id>MNFG_DMI_MIN_EYE_WIDTH</id> <default>0x0a</default> </attribute> @@ -577,6 +553,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Naples n0p0 EX units: Define only EX3 for now to preserve AWAN memory (model n_2_b n1_e8014_n8_pC_c1000_cen2_cen018_unopt_1 --> @@ -1094,8 +1094,31 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> - </attribute> - + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> @@ -1529,7 +1552,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> - + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Naples n2p0 EX units @@ -1962,7 +2008,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> - + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Naples n2p1 EX units diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml index d68d561fe..0f507e5b6 100644 --- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml @@ -188,30 +188,6 @@ <default>0xa</default> </attribute> <attribute> - <id>PROC_R_LOADLINE_VDD</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VDD</id> - <default>0x140</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VDD</id> - <default>0</default> - </attribute> - <attribute> - <id>PROC_R_LOADLINE_VCS</id> - <default>0x23a</default> - </attribute> - <attribute> - <id>PROC_R_DISTLOSS_VCS</id> - <default>0xdac</default> - </attribute> - <attribute> - <id>PROC_VRM_VOFFSET_VCS</id> - <default>0</default> - </attribute> - <attribute> <id>MNFG_DMI_MIN_EYE_WIDTH</id> <default>0x0a</default> </attribute> @@ -590,6 +566,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p0 EX units --> @@ -1702,6 +1702,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </default> </attribute> + <attribute> + <id>PROC_R_LOADLINE_VDD</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VDD</id> + <default>0x140</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VDD</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_R_LOADLINE_VCS</id> + <default>0x23a</default> + </attribute> + <attribute> + <id>PROC_R_DISTLOSS_VCS</id> + <default>0xdac</default> + </attribute> + <attribute> + <id>PROC_VRM_VOFFSET_VCS</id> + <default>0</default> + </attribute> </targetInstance> <!-- Venice n0p1 EX units --> |