diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/isteps/istep08/call_host_slave_sbe_config.C | 106 | ||||
| -rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 7 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 4 | ||||
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/target_types.xml | 1 |
4 files changed, 9 insertions, 109 deletions
diff --git a/src/usr/isteps/istep08/call_host_slave_sbe_config.C b/src/usr/isteps/istep08/call_host_slave_sbe_config.C index ced8e3dd5..4867b6b6e 100644 --- a/src/usr/isteps/istep08/call_host_slave_sbe_config.C +++ b/src/usr/isteps/istep08/call_host_slave_sbe_config.C @@ -69,73 +69,6 @@ using namespace TARGETING; namespace ISTEP_08 { //****************************************************************************** -// set_proc_boot_voltage_vid -//****************************************************************************** -errlHndl_t set_proc_boot_voltage_vid() -{ - errlHndl_t l_errl = NULL; - IStepError l_stepError; - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ENTER set_proc_boot_voltage_vid()"); - do - { - // Get the top level target/system target - Target* l_pTopLevelTarget = NULL; - targetService().getTopLevelTarget(l_pTopLevelTarget); - - // If there is no top level target, terminate - assert(l_pTopLevelTarget, "ERROR: Top level " - "target not found - slave_sbe.C::set_proc_boot_voltage_vid"); - - // Get all Procs - PredicateCTM l_proc(CLASS_CHIP, TYPE_PROC); - PredicateIsFunctional l_functional; - PredicatePostfixExpr l_procs; - - l_procs.push(&l_proc).push(&l_functional).And(); - - TargetRangeFilter l_filter( targetService().begin(), - targetService().end(), - &l_procs ); - - //@TODO: RTC:153745 add this get ATTR - /* - ATTR_BOOT_FREQ_MHZ_type l_boot_freq_mhz = - l_pTopLevelTarget->getAttr<ATTR_BOOT_FREQ_MHZ>(); - for(; l_filter; ++l_filter) - { - - l_errl = FREQVOLTSVC::runProcGetVoltage(*l_filter, - l_boot_freq_mhz); - if( l_errl ) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR: calling runProcGetVoltage for Proc " - "Target HUID[0x%08X]", - l_filter->getAttr<ATTR_HUID>()); - - - // Deconfig the processor - l_errl->addHwCallout(*l_filter, - HWAS::SRCI_PRIORITY_LOW, - HWAS::DECONFIG, - HWAS::GARD_NULL); - - - // Commit error log - errlCommit( l_errl, HWPF_COMP_ID ); - } - } -*/ - - } while( 0 ); - - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "EXIT set_proc_boot_voltage_vid()"); - return l_errl; -} - -//****************************************************************************** // call_host_slave_sbe function //****************************************************************************** void* call_host_slave_sbe_config(void *io_pArgs) @@ -183,45 +116,6 @@ void* call_host_slave_sbe_config(void *io_pArgs) } } // end of cycling through all processor chips -#ifdef CONFIG_HTMGT - // Set system frequency attributes - l_errl = FREQVOLTSVC::setSysFreq(); - if (l_errl ) - { - // Create IStep error log and cross reference error that occurred - l_stepError.addErrorDetails( l_errl ); - - // Commit Error - errlCommit( l_errl, HWPF_COMP_ID ); - } -#endif // CONFIG_HTMGT - - // If there is no FSP, set ATTR_PROC_BOOT_VOLTAGE_VID - if (!INITSERVICE::spBaseServicesEnabled()) - { - l_errl = set_proc_boot_voltage_vid(); - if( l_errl ) - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "Error setting PROC_BOOT_VOLTAGE_VID: " - "slave_sbe.C::call_host_slave_sbe_config()" ); - // Create IStep error log - l_stepError.addErrorDetails( l_errl ); - - // Commit Error - errlCommit( l_errl, HWPF_COMP_ID ); - } - - // Enable SBE interrupt for OP systems - TARGETING::Target* l_sys = NULL; - targetService().getTopLevelTarget(l_sys); - assert( l_sys != NULL ); - - //@TODO: RTC:153745 Add this set ATTR call - //TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "Enabling SBE interrupt for OP systems"); - //l_sys->setAttr<ATTR_FORCE_SKIP_SBE_MASTER_INTR_SERVICE>(0); - } - // Resolve the side characteristics of the Processor SBE Seeproms #if 0 //@TODO-RTC:138226 diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 29d565265..b0c65fa66 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -23,7 +23,6 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG -# Author: Van Lee vanlee@us.ibm.com # # Usage: # @@ -3635,6 +3634,12 @@ sub generate_proc print " <!-- End PM_ attributes -->\n"; } + # Pull the value from the system policy we grabbed earlier + print " <attribute>\n"; + print " <id>BOOT_FREQ_MHZ</id>\n"; + print " <default>$reqPol->{'boot-frequency'}->{content}</default>\n"; + print " </attribute>\n"; + my $nXpY = "n" . $node . "p" . $proc; foreach my $attr (keys %procLoadline) diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 66495791a..fa4032224 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -6607,7 +6607,7 @@ DEPRECATED!!!! <attribute> <id>BOOT_FREQ_MHZ</id> <description> - Boot frequency in MHZ. Default is 50% of nominal. + EQ Boot frequency in MHZ. </description> <simpleType> <uint32_t> @@ -14792,7 +14792,7 @@ Measured in GB</description> </attribute> <attribute> - <id>PROC_BOOT_VOLTAGE_VID</id> + <id>PROC_BOOT_VOLTAGE_VID</id><!-- deprecated --> <description> Proc Boot Voltage </description> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 511f1f25a..b401a4296 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -1120,6 +1120,7 @@ <!-- End processor characteristics for HDAT --> <attribute><id>LPC_BASE_ADDR</id></attribute> + <attribute><id>BOOT_FREQ_MHZ</id></attribute> </targetType> |
