diff options
| -rwxr-xr-x | src/usr/runtime/common/create_hsvc_data.pl | 12 | ||||
| -rw-r--r-- | src/usr/runtime/common/extra_runtime_attributes.xml | 11 | ||||
| -rw-r--r-- | src/usr/runtime/common/hsvc_exdata.C | 6 | ||||
| -rw-r--r-- | src/usr/runtime/common/hsvc_procdata.C | 146 | ||||
| -rw-r--r-- | src/usr/runtime/common/hsvc_sysdata.C | 9 | ||||
| -rw-r--r-- | src/usr/runtime/populate_attributes.C | 47 |
6 files changed, 120 insertions, 111 deletions
diff --git a/src/usr/runtime/common/create_hsvc_data.pl b/src/usr/runtime/common/create_hsvc_data.pl index ce29a52f0..12b7392a4 100755 --- a/src/usr/runtime/common/create_hsvc_data.pl +++ b/src/usr/runtime/common/create_hsvc_data.pl @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012 +# COPYRIGHT International Business Machines Corp. 2012,2013 # # p1 # @@ -181,7 +181,7 @@ foreach my $ifile (@input_files) # sysdata print SYS_FILE "// -- Input: $ifile --\n"; - if( $#sys > 0 ) + if( $#sys >= 0 ) { @sys = sort(@sys); foreach my $attr (@sys) @@ -197,9 +197,9 @@ foreach my $ifile (@input_files) # procdata print PROC_FILE "// -- Input: $ifile --\n"; - if( $#proc > 0 ) + if( $#proc >= 0 ) { - @sys = sort(@proc); + @proc = sort(@proc); foreach my $attr (@proc) { # HSVC_LOAD_ATTR( ATTR_FREQ_PB ); @@ -213,9 +213,9 @@ foreach my $ifile (@input_files) # exdata print EX_FILE "// -- Input: $ifile --\n"; - if( $#ex > 0 ) + if( $#ex >= 0 ) { - @sys = sort(@ex); + @ex = sort(@ex); foreach my $attr (@ex) { # HSVC_LOAD_ATTR( ATTR_FREQ_PB ); diff --git a/src/usr/runtime/common/extra_runtime_attributes.xml b/src/usr/runtime/common/extra_runtime_attributes.xml index 0c3356302..ae7c1785c 100644 --- a/src/usr/runtime/common/extra_runtime_attributes.xml +++ b/src/usr/runtime/common/extra_runtime_attributes.xml @@ -5,7 +5,7 @@ <!-- --> <!-- IBM CONFIDENTIAL --> <!-- --> -<!-- COPYRIGHT International Business Machines Corp. 2012 --> +<!-- COPYRIGHT International Business Machines Corp. 2012,2013 --> <!-- --> <!-- p1 --> <!-- --> @@ -29,11 +29,6 @@ Parser only requires attribute, id and targetType tags. --> <attribute> - <id>ATTR_CHIP_ID</id> - <targetType>TARGET_TYPE_PROC_CHIP</targetType> -</attribute> - -<attribute> <id>ATTR_FUNCTIONAL</id> <targetType>TARGET_TYPE_PROC_CHIP</targetType> </attribute> @@ -53,3 +48,7 @@ Parser only requires attribute, id and targetType tags. <targetType>TARGET_TYPE_SYSTEM</targetType> </attribute> +<attribute> + <id>ATTR_SCRATCH_UINT32_1</id> + <targetType>TARGET_TYPE_SYSTEM</targetType> +</attribute> diff --git a/src/usr/runtime/common/hsvc_exdata.C b/src/usr/runtime/common/hsvc_exdata.C index f60531a75..4d4f23be2 100644 --- a/src/usr/runtime/common/hsvc_exdata.C +++ b/src/usr/runtime/common/hsvc_exdata.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012 */ +/* COPYRIGHT International Business Machines Corp. 2012,2013 */ /* */ /* p1 */ /* */ @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// Generated on Wed Oct 17 08:41:32 CDT 2012 by dcrowell from +// Generated on Thu Feb 14 14:54:31 CST 2013 by dcrowell from // -- Input: src/usr/runtime/common/extra_runtime_attributes.xml -- HSVC_LOAD_ATTR( ATTR_CHIP_UNIT_POS ); HSVC_LOAD_ATTR( ATTR_FUNCTIONAL ); @@ -30,3 +30,5 @@ HSVC_LOAD_ATTR( ATTR_FUNCTIONAL ); HSVC_LOAD_ATTR( ATTR_PM_SPWUP_FSP ); HSVC_LOAD_ATTR( ATTR_PM_SPWUP_OCC ); HSVC_LOAD_ATTR( ATTR_PM_SPWUP_PHYP ); +// -- Input: src/usr/hwpf/hwp/chip_attributes.xml -- +// No attributes found diff --git a/src/usr/runtime/common/hsvc_procdata.C b/src/usr/runtime/common/hsvc_procdata.C index a3547192e..b71b99565 100644 --- a/src/usr/runtime/common/hsvc_procdata.C +++ b/src/usr/runtime/common/hsvc_procdata.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012 */ +/* COPYRIGHT International Business Machines Corp. 2012,2013 */ /* */ /* p1 */ /* */ @@ -20,102 +20,110 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// Generated on Wed Oct 17 08:41:32 CDT 2012 by dcrowell from +// Generated on Thu Feb 14 14:54:31 CST 2013 by dcrowell from // -- Input: src/usr/runtime/common/extra_runtime_attributes.xml -- -HSVC_LOAD_ATTR( ATTR_CHIP_ID ); HSVC_LOAD_ATTR( ATTR_FUNCTIONAL ); // -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_plat.xml -- -HSVC_LOAD_ATTR( ATTR_PROC_DCM_INSTALLED ); -HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPSIZE ); +HSVC_LOAD_ATTR( ATTR_PM_APSS_CHIP_SELECT ); HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY ); -HSVC_LOAD_ATTR( ATTR_PM_SAFE_VOLTAGE ); -HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM ); +HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPSIZE ); +HSVC_LOAD_ATTR( ATTR_PM_PBAX_BRDCST_ID_VECTOR ); +HSVC_LOAD_ATTR( ATTR_PM_PBAX_CHIPID ); +HSVC_LOAD_ATTR( ATTR_PM_PBAX_NODEID ); HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MAXIMUM ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE ); +HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM ); +HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_SAFE_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_SAFE_VOLTAGE ); HSVC_LOAD_ATTR( ATTR_PM_SLEEP_ENTRY ); HSVC_LOAD_ATTR( ATTR_PM_SLEEP_EXIT ); HSVC_LOAD_ATTR( ATTR_PM_SLEEP_TYPE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE ); HSVC_LOAD_ATTR( ATTR_PM_WINKLE_ENTRY ); HSVC_LOAD_ATTR( ATTR_PM_WINKLE_EXIT ); HSVC_LOAD_ATTR( ATTR_PM_WINKLE_TYPE ); -HSVC_LOAD_ATTR( ATTR_PM_SAFE_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_APSS_CHIP_SELECT ); -HSVC_LOAD_ATTR( ATTR_PM_PBAX_NODEID ); -HSVC_LOAD_ATTR( ATTR_PM_PBAX_CHIPID ); -HSVC_LOAD_ATTR( ATTR_PM_PBAX_BRDCST_ID_VECTOR ); // -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_hwp.xml -- -HSVC_LOAD_ATTR( ATTR_PM_POWER_PROXY_TRACE_TIMER ); -HSVC_LOAD_ATTR( ATTR_PM_PPT_TIMER_MATCH_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_PPT_TIMER_TICK ); HSVC_LOAD_ATTR( ATTR_PM_AISS_TIMEOUT ); -HSVC_LOAD_ATTR( ATTR_PM_PSTATE_STEPSIZE ); HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_RANGE ); HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_PMC_HANGPULSE_DIVIDER ); -HSVC_LOAD_ATTR( ATTR_PM_PVSAFE_PSTATE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FRAME_SIZE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME1 ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME2 ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_POLARITY ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_PHASE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_DIVIDER ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_GEN_ENABLE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_CHECK_ENABLE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAJORITY_VOTE_ENABLE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAX_RETRIES ); -HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_POLYNOMIAL_ENABLES ); +HSVC_LOAD_ATTR( ATTR_PM_IVRMS_ENABLED ); HSVC_LOAD_ATTR( ATTR_PM_OCC_HEARTBEAT_TIME ); -HSVC_LOAD_ATTR( ATTR_PM_SLEEP_WINKLE_REQUEST_TIMEOUT ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0 ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1 ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT ); +HSVC_LOAD_ATTR( ATTR_PM_PBAX_RCV_RESERV_TIMEOUT ); +HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RESERV_TIMEOUT ); +HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RETRY_COUNT_OVERCOMMIT_ENABLE ); +HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RETRY_THRESHOLD ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY0 ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY1 ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY0_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY1 ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY1_VALUE ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0 ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1 ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1_VALUE ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY0 ); -HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY1 ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY0_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY1 ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY1_VALUE ); HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0 ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1 ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0 ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1 ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT ); +HSVC_LOAD_ATTR( ATTR_PM_PMC_HANGPULSE_DIVIDER ); +HSVC_LOAD_ATTR( ATTR_PM_POWER_PROXY_TRACE_TIMER ); +HSVC_LOAD_ATTR( ATTR_PM_PPT_TIMER_MATCH_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_PPT_TIMER_TICK ); HSVC_LOAD_ATTR( ATTR_PM_PSTATE0_FREQUENCY ); -HSVC_LOAD_ATTR( ATTR_PM_IVRMS_ENABLED ); -HSVC_LOAD_ATTR( ATTR_PM_SAFE_PSTATE ); +HSVC_LOAD_ATTR( ATTR_PM_PSTATE_STEPSIZE ); +HSVC_LOAD_ATTR( ATTR_PM_PVSAFE_PSTATE ); HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_ENABLE ); HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_FULL_CSB_PSTATE ); +HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HFRHIGH_PSTATE ); +HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HFRLOW_PSTATE ); HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LFRLOW_PSTATE ); HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LFRUPPER_PSTATE ); -HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HFRLOW_PSTATE ); -HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HFRHIGH_PSTATE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FRAME_SIZE ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_OUT_COUNT ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_DELAY ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_COUNT ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_POLARITY ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_PHASE ); +HSVC_LOAD_ATTR( ATTR_PM_SAFE_PSTATE ); +HSVC_LOAD_ATTR( ATTR_PM_SLEEP_WINKLE_REQUEST_TIMEOUT ); HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_DIVIDER ); -HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTER_FRAME_DELAY_SETTING ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_PHASE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_POLARITY ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FRAME_SIZE ); HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTER_FRAME_DELAY ); -HSVC_LOAD_ATTR( ATTR_PM_PBAX_RCV_RESERV_TIMEOUT ); -HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RETRY_COUNT_OVERCOMMIT_ENABLE ); -HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RETRY_THRESHOLD ); -HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RESERV_TIMEOUT ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTER_FRAME_DELAY_SETTING ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_COUNT ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_DELAY ); +HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_OUT_COUNT ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_DIVIDER ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_PHASE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_POLARITY ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_CHECK_ENABLE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_GEN_ENABLE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_POLYNOMIAL_ENABLES ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FRAME_SIZE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY_VALUE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME1 ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME2 ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAJORITY_VOTE_ENABLE ); +HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAX_RETRIES ); +// -- Input: src/usr/hwpf/hwp/chip_attributes.xml -- +HSVC_LOAD_ATTR( ATTR_CHIP_HAS_SBE ); +HSVC_LOAD_ATTR( ATTR_CHIP_ID ); +HSVC_LOAD_ATTR( ATTR_CHIP_REGIONS_TO_ENABLE ); +HSVC_LOAD_ATTR_P( ATTR_EC ); +HSVC_LOAD_ATTR( ATTR_FABRIC_CHIP_ID ); +HSVC_LOAD_ATTR( ATTR_FABRIC_NODE_ID ); +HSVC_LOAD_ATTR( ATTR_FSI_GP_REG_SCOM_ACCESS ); +HSVC_LOAD_ATTR_P( ATTR_NAME ); +HSVC_LOAD_ATTR( ATTR_PROC_DCM_INSTALLED ); diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C index ab9a341cf..57b0cd373 100644 --- a/src/usr/runtime/common/hsvc_sysdata.C +++ b/src/usr/runtime/common/hsvc_sysdata.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012 */ +/* COPYRIGHT International Business Machines Corp. 2012,2013 */ /* */ /* p1 */ /* */ @@ -20,9 +20,10 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// Generated on Wed Oct 17 08:41:32 CDT 2012 by dcrowell from +// Generated on Thu Feb 14 14:54:31 CST 2013 by dcrowell from // -- Input: src/usr/runtime/common/extra_runtime_attributes.xml -- -// No attributes found +HSVC_LOAD_ATTR( ATTR_FREQ_PB ); +HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT32_1 ); // -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_plat.xml -- HSVC_LOAD_ATTR( ATTR_FREQ_CORE_MAX ); HSVC_LOAD_ATTR( ATTR_PROC_DPLL_DIVIDER ); @@ -31,3 +32,5 @@ HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE ); HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET ); // -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_hwp.xml -- // No attributes found +// -- Input: src/usr/hwpf/hwp/chip_attributes.xml -- +// No attributes found diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C index 043c3b126..05fc98ff6 100644 --- a/src/usr/runtime/populate_attributes.C +++ b/src/usr/runtime/populate_attributes.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/runtime/populate_attributes.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/runtime/populate_attributes.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file populate_attributes.C @@ -410,8 +409,6 @@ errlHndl_t populate_node_attributes( uint64_t i_nodeNum ) ADD_HUID( (all_procs[p]) ); // for debug ADD_PHYS_PATH( (all_procs[p]) ); ADD_ECMD_STRING(); - HSVC_LOAD_ATTR_P( ATTR_EC ); - HSVC_LOAD_ATTR_P( ATTR_NAME ); // Use a generated file for the list of attributes to load #include "common/hsvc_procdata.C" |
