diff options
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C | 26 | ||||
-rw-r--r-- | src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C | 6 | ||||
-rw-r--r-- | src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C | 8 | ||||
-rw-r--r-- | src/usr/isteps/pm/pm_common.C | 2 | ||||
-rw-r--r-- | src/usr/occ/occ_common.C | 6 | ||||
-rw-r--r-- | src/usr/runtime/common/hsvc_sysdata.C | 14 | ||||
-rw-r--r-- | src/usr/runtime/test/runtimeattrstest.H | 20 | ||||
-rw-r--r-- | src/usr/targeting/attrsync.C | 2 | ||||
-rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 11 | ||||
-rw-r--r-- | src/usr/targeting/common/target.C | 14 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 123 | ||||
-rwxr-xr-x | src/usr/targeting/common/xmltohb/target_types.xml | 38 |
12 files changed, 200 insertions, 70 deletions
diff --git a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C index cafd82852..6517d1fae 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C +++ b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -98,56 +98,56 @@ fapi::ReturnCode proc_build_smp_process_system( // get PB frequency attribute FAPI_DBG("proc_build_smp_process_system: Querying PB frequency attribute"); - rc = FAPI_ATTR_GET(ATTR_FREQ_PB, + rc = FAPI_ATTR_GET(ATTR_FREQ_PB_MHZ, NULL, io_smp.freq_pb); if (!rc.ok()) { - FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PB"); + FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PB_MHZ"); break; } // get A bus frequency attribute FAPI_DBG("proc_build_smp_process_system: Querying A bus frequency attribute"); - rc = FAPI_ATTR_GET(ATTR_FREQ_A, + rc = FAPI_ATTR_GET(ATTR_FREQ_A_MHZ, NULL, io_smp.freq_a); if (!rc.ok()) { - FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_A"); + FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_A_MHZ"); break; } // get X bus frequency attribute FAPI_DBG("proc_build_smp_process_system: Querying X bus frequency attribute"); - rc = FAPI_ATTR_GET(ATTR_FREQ_X, + rc = FAPI_ATTR_GET(ATTR_FREQ_X_MHZ, NULL, io_smp.freq_x); if (!rc.ok()) { - FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_X"); + FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_X_MHZ"); break; } // get core floor frequency attribute FAPI_DBG("proc_build_smp_process_system: Querying core floor frequency attribute"); - rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_FLOOR, + rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_FLOOR_MHZ, NULL, io_smp.freq_core_floor); if (!rc.ok()) { - FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_FLOOR)"); + FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_FLOOR_MHZ)"); break; } // get core nominal frequency attribute FAPI_DBG("proc_build_smp_process_system: Querying core nominal frequency attribute"); - rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_NOMINAL, + rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_NOMINAL_MHZ, NULL, io_smp.freq_core_nom); if (!rc.ok()) { - FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_NOMINAL)"); + FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_NOMINAL_MHZ)"); break; } @@ -175,12 +175,12 @@ fapi::ReturnCode proc_build_smp_process_system( // get PCIe frequency attribute FAPI_DBG("proc_build_smp_process_system: Querying PCIe frequency attribute"); - rc = FAPI_ATTR_GET(ATTR_FREQ_PCIE, + rc = FAPI_ATTR_GET(ATTR_FREQ_PCIE_MHZ, NULL, io_smp.freq_pcie); if (!rc.ok()) { - FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PCIE"); + FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PCIE_MHZ"); break; } diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C index 156ecc593..886d2c8db 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C +++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -2348,10 +2348,10 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target, // determine nest frequency uint32_t freq_pb; - rc = FAPI_ATTR_GET(ATTR_FREQ_PB, NULL, freq_pb); + rc = FAPI_ATTR_GET(ATTR_FREQ_PB_MHZ, NULL, freq_pb); if (!rc.ok()) { - FAPI_ERR("Error from FAPI_ATTR_GET (ATTR_FREQ_PB)"); + FAPI_ERR("Error from FAPI_ATTR_GET (ATTR_FREQ_PB_MHZ)"); return rc; } diff --git a/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C b/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C index 728a83c28..1e4c9fb6f 100644 --- a/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C +++ b/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -339,11 +339,11 @@ fapi::ReturnCode cen_mem_pll_initf(const fapi::Target & i_target) FAPI_ERR("Failed to get attribute: ATTR_MSS_FREQ."); break; } - // ATTR_FREQ_PB is a "system" attribute, so use NULL as the target. - rc = FAPI_ATTR_GET( ATTR_FREQ_PB, NULL, nest_freq); + // ATTR_FREQ_PB_MHZ is a "system" attribute, so use NULL as the target. + rc = FAPI_ATTR_GET( ATTR_FREQ_PB_MHZ, NULL, nest_freq); if (rc) { - FAPI_ERR("Failed to get attribute: ATTR_FREQ_PB."); + FAPI_ERR("Failed to get attribute: ATTR_FREQ_PB_MHZ."); break; } diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C index 654f82be1..c60a362e8 100644 --- a/src/usr/isteps/pm/pm_common.C +++ b/src/usr/isteps/pm/pm_common.C @@ -145,7 +145,7 @@ namespace HBPM tS.getTopLevelTarget( sysTarget ); assert( sysTarget != NULL ); - uint32_t nestFreq = sysTarget->getAttr<ATTR_FREQ_PB>(); + uint32_t nestFreq = sysTarget->getAttr<ATTR_FREQ_PB_MHZ>(); config_data->version = HBPM::OccHostDataVersion; config_data->nestFrequency = nestFreq; diff --git a/src/usr/occ/occ_common.C b/src/usr/occ/occ_common.C index 98a01a9da..a6c7e73f5 100644 --- a/src/usr/occ/occ_common.C +++ b/src/usr/occ/occ_common.C @@ -175,7 +175,7 @@ namespace HBOCC // Save Nest Frequency; ATTR_NEST_FREQ_MHZ_type l_nestFreq = - sysTarget->getAttr<ATTR_FREQ_PB>(); + sysTarget->getAttr<ATTR_FREQ_PB_MHZ>(); size_t l_length = 0; // length of this section @@ -278,7 +278,7 @@ namespace HBOCC tS.getTopLevelTarget( sysTarget ); assert( sysTarget != NULL ); - uint32_t nestFreq = sysTarget->getAttr<ATTR_FREQ_PB>(); + uint32_t nestFreq = sysTarget->getAttr<ATTR_FREQ_PB_MHZ>(); config_data->version = HBOCC::OccHostDataVersion; config_data->nestFrequency = nestFreq; @@ -351,7 +351,7 @@ namespace HBOCC tS.getTopLevelTarget( sysTarget ); assert( sysTarget != NULL ); - uint32_t nestFreq = sysTarget->getAttr<ATTR_FREQ_PB>(); + uint32_t nestFreq = sysTarget->getAttr<ATTR_FREQ_PB_MHZ>(); diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C index 5068c9c74..c17a28e2a 100644 --- a/src/usr/runtime/common/hsvc_sysdata.C +++ b/src/usr/runtime/common/hsvc_sysdata.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -30,15 +30,15 @@ // -- Input: ../../xml/attribute_info/common_attributes.xml -- // No attributes found // -- Input: ../../xml/attribute_info/freq_attributes.xml -- -HSVC_LOAD_ATTR( ATTR_FREQ_A ); -HSVC_LOAD_ATTR( ATTR_FREQ_CORE_FLOOR ); -HSVC_LOAD_ATTR( ATTR_FREQ_CORE_NOMINAL ); +HSVC_LOAD_ATTR( ATTR_FREQ_A_MHZ ); +HSVC_LOAD_ATTR( ATTR_FREQ_CORE_FLOOR_MHZ ); +HSVC_LOAD_ATTR( ATTR_FREQ_CORE_NOMINAL_MHZ ); HSVC_LOAD_ATTR( ATTR_FREQ_MEM_REFCLOCK ); -HSVC_LOAD_ATTR( ATTR_FREQ_PB ); -HSVC_LOAD_ATTR( ATTR_FREQ_PCIE ); +HSVC_LOAD_ATTR( ATTR_FREQ_PB_MHZ ); +HSVC_LOAD_ATTR( ATTR_FREQ_PCIE_MHZ ); HSVC_LOAD_ATTR( ATTR_FREQ_PROC_REFCLOCK ); HSVC_LOAD_ATTR( ATTR_FREQ_PROC_REFCLOCK_KHZ ); -HSVC_LOAD_ATTR( ATTR_FREQ_X ); +HSVC_LOAD_ATTR( ATTR_FREQ_X_MHZ ); // -- Input: ../../xml/attribute_info/L2_L3_attributes.xml -- HSVC_LOAD_ATTR( ATTR_L2_FORCE_R_T2_EPS ); HSVC_LOAD_ATTR( ATTR_L2_R_T0_EPS ); diff --git a/src/usr/runtime/test/runtimeattrstest.H b/src/usr/runtime/test/runtimeattrstest.H index 478f405ea..0eb628cf3 100644 --- a/src/usr/runtime/test/runtimeattrstest.H +++ b/src/usr/runtime/test/runtimeattrstest.H @@ -82,11 +82,11 @@ class RuntimeAttrsTest: public CxxTest::TestSuite //Grab a couple of arbitrary attributes ReturnCode l_rc; - fapi::ATTR_FREQ_PB_Type freq = 0; - l_rc = FAPI_ATTR_GET(ATTR_FREQ_PB,NULL,freq); + fapi::ATTR_FREQ_PB_MHZ_Type freq = 0; + l_rc = FAPI_ATTR_GET(ATTR_FREQ_PB_MHZ,NULL,freq); if( l_rc ) { - TS_FAIL("Error getting fapi::ATTR_FREQ_PB"); + TS_FAIL("Error getting fapi::ATTR_FREQ_PB_MHZ"); } bool freq_found = false; @@ -102,24 +102,24 @@ class RuntimeAttrsTest: public CxxTest::TestSuite uint64_t attr = 0; while( headers[attr].id != hsvc_attr_header_t::NO_ATTRIBUTE ) { - if( headers[attr].id == fapi::ATTR_FREQ_PB ) + if( headers[attr].id == fapi::ATTR_FREQ_PB_MHZ ) { freq_found = true; if( headers[attr].sizeBytes != - sizeof(fapi::ATTR_FREQ_PB_Type) ) + sizeof(fapi::ATTR_FREQ_PB_MHZ_Type) ) { TRACFCOMP( g_trac_runtime, "size=%.16X", headers[attr].sizeBytes ); - TS_FAIL("Size of fapi::ATTR_FREQ_PB data is wrong"); + TS_FAIL("Size of fapi::ATTR_FREQ_PB_MHZ data is wrong"); } else { - fapi::ATTR_FREQ_PB_Type* freq_act = - reinterpret_cast<fapi::ATTR_FREQ_PB_Type*> + fapi::ATTR_FREQ_PB_MHZ_Type* freq_act = + reinterpret_cast<fapi::ATTR_FREQ_PB_MHZ_Type*> (beginning+headers[attr].offset); if( *freq_act != freq ) { TRACFCOMP( g_trac_runtime, "Expected=%X, Actual=%X", freq, *freq_act ); - TS_FAIL("fapi::ATTR_FREQ_PB data is wrong"); + TS_FAIL("fapi::ATTR_FREQ_PB_MHZ data is wrong"); } } } @@ -159,7 +159,7 @@ class RuntimeAttrsTest: public CxxTest::TestSuite if( !freq_found ) { - TS_FAIL("Never found FREQ_PB in system attributes"); + TS_FAIL("Never found FREQ_PB_MHZ in system attributes"); } if( !vpdMinLevel_found ) { diff --git a/src/usr/targeting/attrsync.C b/src/usr/targeting/attrsync.C index 72dff620c..2a448fd5b 100644 --- a/src/usr/targeting/attrsync.C +++ b/src/usr/targeting/attrsync.C @@ -614,7 +614,7 @@ namespace TARGETING //sys-sys-power9 - base TARGETING::Target* l_pTopLevel = NULL; TARGETING::targetService().getTopLevelTarget(l_pTopLevel); - l_pTopLevel->setAttr<ATTR_FREQ_X>(0xfa0); + l_pTopLevel->setAttr<ATTR_FREQ_X_MHZ>(0xfa0); //chip-base PredicateCTM predEnc(CLASS_ENC); diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 615fb1e4f..501fe1dd8 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -229,11 +229,20 @@ push @systemAttr, $reqPol->{'processor-refclock-frequency-khz'}->{content}, "FREQ_MEM_REFCLOCK", $reqPol->{'memory-refclock-frequency'}->{content}, "BOOT_FREQ_MHZ", $reqPol->{'boot-frequency'}->{content}, + "FREQ_A_MHZ", $reqPol->{'proc_a_frequency'}->{content}, + "FREQ_PB_MHZ", $reqPol->{'proc_pb_frequency'}->{content}, + "NEST_FREQ_MHZ", $reqPol->{'proc_pb_frequency'}->{content}, + "FREQ_PCIE_MHZ", $reqPol->{'proc_pcie_frequency'}->{content}, + "FREQ_X_MHZ", $reqPol->{'proc_x_frequency'}->{content}, +# TODO: RTC 155880 +# The attributes in this block have their names changed from ATTR_x to ATTR_x_MHZ (above). +# The old definitions are left assigned in this block in order to avoid FSP CI failure. +# They are to be removed when code in FSP are updated to use the new names. "FREQ_A", $reqPol->{'proc_a_frequency'}->{content}, "FREQ_PB", $reqPol->{'proc_pb_frequency'}->{content}, - "NEST_FREQ_MHZ", $reqPol->{'proc_pb_frequency'}->{content}, "FREQ_PCIE", $reqPol->{'proc_pcie_frequency'}->{content}, "FREQ_X", $reqPol->{'proc_x_frequency'}->{content}, +# End TODO: RTC 155880 "MSS_MBA_ADDR_INTERLEAVE_BIT", $reqPol->{'mss_mba_addr_interleave_bit'}, "MSS_MBA_CACHELINE_INTERLEAVE_MODE", $reqPol->{'mss_mba_cacheline_interleave_mode'}, diff --git a/src/usr/targeting/common/target.C b/src/usr/targeting/common/target.C index 559fd4ef7..bf0625298 100644 --- a/src/usr/targeting/common/target.C +++ b/src/usr/targeting/common/target.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -664,19 +664,19 @@ void setFrequencyAttributes(Target * i_sys, uint32_t i_newNestFreq) l_oldNestFreq, i_newNestFreq ); - //FREQ_X + //FREQ_X_MHZ uint32_t l_freqX = i_newNestFreq * 2; - i_sys->setAttr<TARGETING::ATTR_FREQ_X>(l_freqX); + i_sys->setAttr<TARGETING::ATTR_FREQ_X_MHZ>(l_freqX); TRACFCOMP(g_trac_targeting, - "ATTR_FREQ_X getting set to from %d to %d", + "ATTR_FREQ_X_MHZ getting set to from %d to %d", l_oldNestFreq*2, l_freqX ); - //FREQ_PB + //FREQ_PB_MHZ uint32_t l_freqPb = i_newNestFreq; - i_sys->setAttr<TARGETING::ATTR_FREQ_PB>(l_freqPb); + i_sys->setAttr<TARGETING::ATTR_FREQ_PB_MHZ>(l_freqPb); TRACFCOMP(g_trac_targeting, - "ATTR_FREQ_PB getting set from %d to %d", + "ATTR_FREQ_PB_MHZ getting set from %d to %d", l_oldNestFreq, l_freqPb ); diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index b11755452..465969b28 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -2485,13 +2485,13 @@ <readable/> <writeable/> <hwpfToHbAttrMap> - <id>ATTR_FREQ_CORE_FLOOR</id> + <id>ATTR_FREQ_CORE_FLOOR_MHZ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> <attribute> - <id>FREQ_PB</id> + <id>FREQ_PB_MHZ</id> <description> System attribute. The frequency of a processor's PB chiplet in MHz. @@ -2503,13 +2503,13 @@ <readable/> <writeable/> <hwpfToHbAttrMap> - <id>ATTR_FREQ_PB</id> + <id>ATTR_FREQ_PB_MHZ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> <attribute> - <id>FREQ_A</id> + <id>FREQ_A_MHZ</id> <description> System attribute. The frequency of a processor's A-bus chiplet in MHz. @@ -2522,13 +2522,13 @@ <persistency>non-volatile</persistency> <readable/> <hwpfToHbAttrMap> - <id>ATTR_FREQ_A</id> + <id>ATTR_FREQ_A_MHZ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> <attribute> - <id>FREQ_X</id> + <id>FREQ_X_MHZ</id> <description> System attribute. The frequency of a processor's X-bus chiplet in MHz. @@ -2540,7 +2540,7 @@ <readable/> <writeable/> <hwpfToHbAttrMap> - <id>ATTR_FREQ_X</id> + <id>ATTR_FREQ_X_MHZ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> @@ -3659,7 +3659,7 @@ </attribute> <attribute> - <id>FREQ_PCIE</id> + <id>FREQ_PCIE_MHZ</id> <description> The frequency of a processor's PCI-e bus in MHz. This is the same for all PCI-e busses in the system. @@ -3669,7 +3669,7 @@ <persistency>non-volatile</persistency> <readable/> <hwpfToHbAttrMap> - <id>ATTR_FREQ_PCIE</id> + <id>ATTR_FREQ_PCIE_MHZ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> @@ -3691,7 +3691,7 @@ <readable/> <writeable/> <hwpfToHbAttrMap> - <id>ATTR_FREQ_CORE_NOMINAL</id> + <id>ATTR_FREQ_CORE_NOMINAL_MHZ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> @@ -21140,7 +21140,7 @@ DEPRECATED!!!! <readable/> <writeable/> <hwpfToHbAttrMap> - <id>ATTR_FREQ_CORE_CEILING</id> + <id>ATTR_FREQ_CORE_CEILING_MHZ</id> <macro>DIRECT</macro> </hwpfToHbAttrMap> </attribute> @@ -21584,7 +21584,7 @@ DEPRECATED!!!! <array>2</array> </simpleType> <writeable/> - <persistency>non-volatile</persistency> + <persistency>volatile-zeroed</persistency> <readable/> <hwpfToHbAttrMap> <id>ATTR_PROC_HTM_BAR_SIZES</id> @@ -28698,4 +28698,103 @@ DEPRECATED!!!! </hwpfToHbAttrMap> </attribute> +<!--- TODO: RTC 155880 + The attributes in this block have their names changed from ATTR_x to ATTR_x_MHZ. + The old definitions are left in this block in order to avoid build break in FSP. + They are to be removed when code in FSP are updated to use the new names. +--> +<attribute> + <id>FREQ_PB</id> + <description> + System attribute. + The frequency of a processor's PB chiplet in MHz. + This is the same for all PB chiplets in the system. + Provided by the MRW. + </description> + <simpleType><uint32_t></uint32_t></simpleType> + <persistency>non-volatile</persistency> + <readable/> + <writeable/> + <hwpfToHbAttrMap> + <id>ATTR_FREQ_PB</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>FREQ_A</id> + <description> + System attribute. + The frequency of a processor's A-bus chiplet in MHz. + This is the same for all A-bus chiplets in the system. + Provided by the MRW. + </description> + <simpleType><uint32_t> + <default>0x1900</default> + </uint32_t></simpleType> + <persistency>non-volatile</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_FREQ_A</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>FREQ_X</id> + <description> + System attribute. + The frequency of a processor's X-bus chiplet in MHz. + This is the same for all X-bus chiplets in the system. + Provided by the MRW. + </description> + <simpleType><uint32_t></uint32_t></simpleType> + <persistency>non-volatile</persistency> + <readable/> + <writeable/> + <hwpfToHbAttrMap> + <id>ATTR_FREQ_X</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>FREQ_CORE_CEILING</id> + <description> + The maximum core frequency in MHz. + This is the same for all cores in the system. + Data is provided by MVPD #V. + </description> + <simpleType> + <uint32_t> + <default>4800</default> + </uint32_t> + </simpleType> + <persistency>volatile</persistency> + <readable/> + <writeable/> + <hwpfToHbAttrMap> + <id>ATTR_FREQ_CORE_CEILING</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>FREQ_PCIE</id> + <description> + The frequency of a processor's PCI-e bus in MHz. + This is the same for all PCI-e busses in the system. + Provided by the MRW. + </description> + <simpleType><uint32_t></uint32_t></simpleType> + <persistency>non-volatile</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_FREQ_PCIE</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<!--- TODO: End RTC 155880 workaround --> + </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 4c06d5df1..26f92acb6 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -97,9 +97,9 @@ <attribute><id>FREQ_PROC_REFCLOCK</id></attribute> <attribute><id>FREQ_PROC_REFCLOCK_KHZ</id></attribute> <attribute><id>FREQ_MEM_REFCLOCK</id></attribute> - <attribute><id>FREQ_PB</id></attribute> - <attribute><id>FREQ_A</id></attribute> - <attribute><id>FREQ_X</id></attribute> + <attribute><id>FREQ_PB_MHZ</id></attribute> + <attribute><id>FREQ_A_MHZ</id></attribute> + <attribute><id>FREQ_X_MHZ</id></attribute> <attribute><id>SP_FUNCTIONS</id></attribute> <attribute><id>HB_SETTINGS</id></attribute> <attribute><id>CEC_IPL_TYPE</id></attribute> @@ -111,7 +111,7 @@ <attribute><id>MSS_MBA_CACHELINE_INTERLEAVE_MODE</id></attribute> <attribute><id>MIRROR_BASE_ADDRESS</id></attribute> <attribute><id>PAYLOAD_IN_MIRROR_MEM</id></attribute> - <attribute><id>FREQ_PCIE</id></attribute> + <attribute><id>FREQ_PCIE_MHZ</id></attribute> <attribute><id>L2_R_T0_EPS</id></attribute> <attribute><id>L2_R_T1_EPS</id></attribute> <attribute><id>L2_R_T2_EPS</id></attribute> @@ -310,6 +310,17 @@ <attribute><id>MRW_MCS_PREFETCH_RETRY_THRESHOLD</id></attribute> <!-- AVP override for fused cores or normal cores --> <attribute><id>FUSED_CORE_OPTION</id></attribute> + +<!--- TODO: RTC 155880 + The attributes in this block have their names changed from ATTR_x to ATTR_x_MHZ. + The old definitions are left in this block in order to avoid build break in FSP. + They are to be removed when code in FSP are updated to use the new names. --> + <attribute><id>FREQ_PCIE</id></attribute> + <attribute><id>FREQ_A</id></attribute> + <attribute><id>FREQ_PB</id></attribute> + <attribute><id>FREQ_X</id></attribute> +<!-- End TODO --> + </targetType> <targetType> @@ -1932,11 +1943,11 @@ <attribute><id>MAX_ALLOWED_DIMM_FREQ</id></attribute> <attribute><id>REQUIRED_SYNCH_MODE</id></attribute> <attribute><id>BOOT_FREQ_MHZ</id></attribute> - <attribute><id>FREQ_A</id></attribute> - <attribute><id>FREQ_PB</id></attribute> + <attribute><id>FREQ_A_MHZ</id></attribute> + <attribute><id>FREQ_PB_MHZ</id></attribute> <attribute><id>NEST_FREQ_MHZ</id></attribute> - <attribute><id>FREQ_PCIE</id></attribute> - <attribute><id>FREQ_X</id></attribute> + <attribute><id>FREQ_PCIE_MHZ</id></attribute> + <attribute><id>FREQ_X_MHZ</id></attribute> <attribute><id>MSS_MBA_ADDR_INTERLEAVE_BIT</id></attribute> <attribute><id>MSS_MBA_CACHELINE_INTERLEAVE_MODE</id></attribute> <attribute><id>PROC_EPS_TABLE_TYPE</id></attribute> @@ -2130,6 +2141,17 @@ <attribute><id>MRW_DDR4_VDDR_MAX_LIMIT_POST_DRAM_INIT</id></attribute> <attribute><id>MSS_VOLT_VPP_SLOPE</id></attribute> <attribute><id>MSS_VOLT_VPP_INTERCEPT</id></attribute> + +<!--- TODO: RTC 155880 + The attributes in this block have their names changed from ATTR_x to ATTR_x_MHZ. + The old definitions are left in this block in order to avoid build break in FSP. + They are to be removed when code in FSP are updated to use the new names. --> + <attribute><id>FREQ_PCIE</id></attribute> + <attribute><id>FREQ_A</id></attribute> + <attribute><id>FREQ_PB</id></attribute> + <attribute><id>FREQ_X</id></attribute> +<!-- End TODO --> + </targetType> <!-- enc-node-power9 --> |