x86/cpu: Cleanup of INTEL_FAM6_foo
Subsystems (13)
Peter Zijlstra
maintainercover x86/cpu: Cleanup of INTEL_FAM6_foo
Hi,
I seem to have missed 'spring' but here goes...
Peter Zijlstra
maintainerPATCH 1/3 x86/cpu: Fix Gracemont uarch
Alderlake N is an E-core only product using Gracemont micro-architecture. It fits the pre-existing naming scheme perfectly fine, adhere to it.
--- arch/x86/events/intel/core.c | 2 +- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/events/msr.c | 2 +- arch/x86/events/rapl.c | 2 +- arch/x86/include/asm/intel-family.h | 3 ++- arch/x86/kernel/cpu/intel_epb.c | 2 +- arch/x86/mm/init.c | 2 +- drivers/idle/intel_idle.c | 10 +++++----- drivers/platform/x86/intel/pmc/core.c | 2 +- drivers/powercap/intel_rapl_common.c | 2 +- drivers/powercap/intel_rapl_msr.c | 2 +- drivers/thermal/intel/intel_tcc_cooling.c | 2 +- tools/power/x86/turbostat/turbostat.c | 2 +- 14 files changed, 19 insertions(+), 18 deletions(-)
arch/x86/events/intel/core.c +1 -1
@@ -6167,7 +6167,7 @@ __init int intel_pmu_init(void) name ="Tremont" ;break ; -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT : x86_pmu.mid_ack = true;memcpy (hw_cache_event_ids, glp_hw_cache_event_ids,sizeof (hw_cache_event_ids));
arch/x86/events/intel/cstate.c +1 -1
@@ -669,6 +669,7 @@ static const struct x86_cpu_id intel_cstX86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_D , &glm_cstates),X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT , &glm_cstates),X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_L , &glm_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_L , &icl_cstates), X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_cstates),
@@ -684,7 +685,6 @@ static const struct x86_cpu_id intel_cstX86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_cstates), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_cstates), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_cstates),
arch/x86/events/intel/uncore.c +1 -1
@@ -1858,7 +1858,6 @@ static const struct x86_cpu_id intel_uncX86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_uncore_init),
@@ -1867,6 +1866,7 @@ static const struct x86_cpu_id intel_uncX86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &spr_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_D , &snr_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &adl_uncore_init), {}, };MODULE_DEVICE_TABLE (x86cpu, intel_uncore_match);
arch/x86/events/msr.c +1 -1
@@ -106,7 +106,7 @@ static bool test_intel(int idx, void *dacase INTEL_FAM6_ROCKETLAKE :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT :case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S :
arch/x86/events/rapl.c +1 -1
@@ -804,7 +804,7 @@ static const struct x86_cpu_id rapl_modeX86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &model_skl), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &model_skl), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &model_spr),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &model_spr), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &model_skl),
arch/x86/include/asm/intel-family.h +2 -1
@@ -114,7 +114,6 @@#define INTEL_FAM6_ALDERLAKE 0x97/* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A/* Golden Cove / Gracemont */ -#define INTEL_FAM6_ALDERLAKE_N 0xBE#define INTEL_FAM6_RAPTORLAKE 0xB7#define INTEL_FAM6_RAPTORLAKE_P 0xBA
@@ -154,6 +153,8 @@#define INTEL_FAM6_ATOM_TREMONT 0x96/* Elkhart Lake */ #define INTEL_FAM6_ATOM_TREMONT_L 0x9C/* Jasper Lake */ +#define INTEL_FAM6_ATOM_GRACEMONT 0xBE/* Alderlake N */ +#define INTEL_FAM6_SIERRAFOREST_X 0xAF#define INTEL_FAM6_GRANDRIDGE 0xB6
arch/x86/kernel/cpu/intel_epb.c +1 -1
@@ -206,7 +206,7 @@ static int intel_epb_offline(unsigned instatic const struct x86_cpu_id intel_epb_normal[] = {X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L ,ENERGY_PERF_BIAS_NORMAL_POWERSAVE ), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT ,ENERGY_PERF_BIAS_NORMAL_POWERSAVE ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P ,ENERGY_PERF_BIAS_NORMAL_POWERSAVE ),
arch/x86/mm/init.c +1 -1
@@ -273,7 +273,7 @@ static void __init probe_page_size_mask(static const struct x86_cpu_id invlpg_miss_ids[] = {INTEL_MATCH (INTEL_FAM6_ALDERLAKE ),INTEL_MATCH (INTEL_FAM6_ALDERLAKE_L ), -INTEL_MATCH (INTEL_FAM6_ALDERLAKE_N ), +INTEL_MATCH (INTEL_FAM6_ATOM_GRACEMONT ),INTEL_MATCH (INTEL_FAM6_RAPTORLAKE ),INTEL_MATCH (INTEL_FAM6_RAPTORLAKE_P ),INTEL_MATCH (INTEL_FAM6_RAPTORLAKE_S ),
drivers/idle/intel_idle.c +5 -5
@@ -960,7 +960,7 @@ static struct cpuidle_state adl_l_cstate .enter = NULL } }; -static struct cpuidle_state adl_n_cstates[]__initdata = { +static struct cpuidle_state gmt_cstates[]__initdata = { { .name ="C1" , .desc ="MWAIT 0x00" ,
@@ -1405,8 +1405,8 @@ static const struct idle_cpu idle_cpu_ad .state_table = adl_l_cstates, }; -static const struct idle_cpu idle_cpu_adl_n__initconst = { - .state_table = adl_n_cstates, +static const struct idle_cpu idle_cpu_gmt__initconst = { + .state_table = gmt_cstates, };static const struct idle_cpu idle_cpu_spr__initconst = {
@@ -1479,7 +1479,7 @@ static const struct x86_cpu_id intel_idlX86_MATCH_INTEL_FAM6_MODEL (ICELAKE_D , &idle_cpu_icx),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &idle_cpu_adl),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &idle_cpu_adl_l), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &idle_cpu_adl_n), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &idle_cpu_gmt),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &idle_cpu_spr),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &idle_cpu_spr), X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &idle_cpu_knl),
@@ -1979,7 +1979,7 @@ static void __init intel_idle_init_cstatbreak ;case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT :adl_idle_state_table_update ();break ; }
drivers/platform/x86/intel/pmc/core.c +1 -1
@@ -1123,7 +1123,7 @@ static const struct x86_cpu_id intel_pmcX86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_L , icl_core_init),X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , tgl_core_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , tgl_core_init), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , tgl_core_init), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , tgl_core_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , adl_core_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , tgl_core_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, adl_core_init),
drivers/powercap/intel_rapl_common.c +1 -1
@@ -1250,7 +1250,7 @@ static const struct x86_cpu_id rapl_ids[X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &rapl_defaults_core), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &rapl_defaults_core), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &rapl_defaults_core),
drivers/powercap/intel_rapl_msr.c +1 -1
@@ -141,7 +141,7 @@ static const struct x86_cpu_id pl4_suppoX86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L ,NULL ), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N ,NULL ), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P ,NULL ), X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, NULL),
drivers/thermal/intel/intel_tcc_cooling.c +1 -1
@@ -60,7 +60,7 @@ static const struct x86_cpu_id tcc_ids[]X86_MATCH_INTEL_FAM6_MODEL (COMETLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L ,NULL ), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N ,NULL ), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P ,NULL ), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL),
tools/power/x86/turbostat/turbostat.c +1 -1
@@ -5447,7 +5447,7 @@ unsigned int intel_model_duplicates(unsicase INTEL_FAM6_LAKEFIELD :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT :case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S :
[tip: perf/core] x86/cpu: Fix Gracemont uarch
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 882cdb06b668488a42ef717a260c05ba7dc43a49 Gitweb: https://git.kernel.org/tip/882cdb06b668488a42ef717a260c05ba7dc43a49 Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 07 Aug 2023 14:38:07 +02:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 09 Aug 2023 21:51:06 +02:00
x86/cpu: Fix Gracemont uarch
Alderlake N is an E-core only product using Gracemont micro-architecture. It fits the pre-existing naming scheme perfectly fine, adhere to it.
--- arch/x86/events/intel/core.c | 2 +- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/events/msr.c | 2 +- arch/x86/events/rapl.c | 2 +- arch/x86/include/asm/intel-family.h | 3 ++- arch/x86/kernel/cpu/intel_epb.c | 2 +- arch/x86/mm/init.c | 2 +- drivers/idle/intel_idle.c | 10 +++++----- drivers/platform/x86/intel/pmc/core.c | 2 +- drivers/powercap/intel_rapl_common.c | 2 +- drivers/powercap/intel_rapl_msr.c | 2 +- drivers/thermal/intel/intel_tcc_cooling.c | 2 +- tools/power/x86/turbostat/turbostat.c | 2 +- 14 files changed, 19 insertions(+), 18 deletions(-)
arch/x86/events/intel/core.c +1 -1
@@ -6167,7 +6167,7 @@ __init int intel_pmu_init(void) name ="Tremont" ;break ; -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT : x86_pmu.mid_ack = true;memcpy (hw_cache_event_ids, glp_hw_cache_event_ids,sizeof (hw_cache_event_ids));
arch/x86/events/intel/cstate.c +1 -1
@@ -669,6 +669,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_D , &glm_cstates),X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT , &glm_cstates),X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_L , &glm_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_L , &icl_cstates), X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_cstates),
@@ -684,7 +685,6 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_cstates), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_cstates), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_cstates),
arch/x86/events/intel/uncore.c +1 -1
@@ -1858,7 +1858,6 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_uncore_init),
@@ -1867,6 +1866,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &spr_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_D , &snr_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &adl_uncore_init), {}, };MODULE_DEVICE_TABLE (x86cpu, intel_uncore_match);
arch/x86/events/msr.c +1 -1
@@ -106,7 +106,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_ROCKETLAKE :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT :case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S :
arch/x86/events/rapl.c +1 -1
@@ -804,7 +804,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &model_skl), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &model_skl), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &model_spr),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &model_spr), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &model_skl),
arch/x86/include/asm/intel-family.h +2 -1
@@ -114,7 +114,6 @@#define INTEL_FAM6_ALDERLAKE 0x97/* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A/* Golden Cove / Gracemont */ -#define INTEL_FAM6_ALDERLAKE_N 0xBE#define INTEL_FAM6_RAPTORLAKE 0xB7#define INTEL_FAM6_RAPTORLAKE_P 0xBA
@@ -154,6 +153,8 @@#define INTEL_FAM6_ATOM_TREMONT 0x96/* Elkhart Lake */ #define INTEL_FAM6_ATOM_TREMONT_L 0x9C/* Jasper Lake */ +#define INTEL_FAM6_ATOM_GRACEMONT 0xBE/* Alderlake N */ +#define INTEL_FAM6_SIERRAFOREST_X 0xAF#define INTEL_FAM6_GRANDRIDGE 0xB6
arch/x86/kernel/cpu/intel_epb.c +1 -1
@@ -206,7 +206,7 @@ static int intel_epb_offline(unsigned int cpu)static const struct x86_cpu_id intel_epb_normal[] = {X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L ,ENERGY_PERF_BIAS_NORMAL_POWERSAVE ), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT ,ENERGY_PERF_BIAS_NORMAL_POWERSAVE ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P ,ENERGY_PERF_BIAS_NORMAL_POWERSAVE ),
arch/x86/mm/init.c +1 -1
@@ -273,7 +273,7 @@ static void __init probe_page_size_mask(void)static const struct x86_cpu_id invlpg_miss_ids[] = {INTEL_MATCH (INTEL_FAM6_ALDERLAKE ),INTEL_MATCH (INTEL_FAM6_ALDERLAKE_L ), -INTEL_MATCH (INTEL_FAM6_ALDERLAKE_N ), +INTEL_MATCH (INTEL_FAM6_ATOM_GRACEMONT ),INTEL_MATCH (INTEL_FAM6_RAPTORLAKE ),INTEL_MATCH (INTEL_FAM6_RAPTORLAKE_P ),INTEL_MATCH (INTEL_FAM6_RAPTORLAKE_S ),
drivers/idle/intel_idle.c +5 -5
@@ -960,7 +960,7 @@ static struct cpuidle_state adl_l_cstates[] __initdata = { .enter = NULL } }; -static struct cpuidle_state adl_n_cstates[]__initdata = { +static struct cpuidle_state gmt_cstates[]__initdata = { { .name ="C1" , .desc ="MWAIT 0x00" ,
@@ -1405,8 +1405,8 @@ static const struct idle_cpu idle_cpu_adl_l __initconst = { .state_table = adl_l_cstates, }; -static const struct idle_cpu idle_cpu_adl_n__initconst = { - .state_table = adl_n_cstates, +static const struct idle_cpu idle_cpu_gmt__initconst = { + .state_table = gmt_cstates, };static const struct idle_cpu idle_cpu_spr__initconst = {
@@ -1479,7 +1479,7 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_D , &idle_cpu_icx),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &idle_cpu_adl),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &idle_cpu_adl_l), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &idle_cpu_adl_n), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &idle_cpu_gmt),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &idle_cpu_spr),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &idle_cpu_spr), X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &idle_cpu_knl),
@@ -1979,7 +1979,7 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)break ;case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT :adl_idle_state_table_update ();break ; }
drivers/platform/x86/intel/pmc/core.c +1 -1
@@ -1123,7 +1123,7 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {X86_MATCH_INTEL_FAM6_MODEL (ATOM_TREMONT_L , icl_core_init),X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , tgl_core_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , tgl_core_init), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , tgl_core_init), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , tgl_core_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , adl_core_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , tgl_core_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, adl_core_init),
drivers/powercap/intel_rapl_common.c +1 -1
@@ -1250,7 +1250,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &rapl_defaults_core), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &rapl_defaults_core), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &rapl_defaults_core),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &rapl_defaults_core),
drivers/powercap/intel_rapl_msr.c +1 -1
@@ -141,7 +141,7 @@ static const struct x86_cpu_id pl4_support_ids[] = {X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L ,NULL ), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N ,NULL ), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P ,NULL ), X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, NULL),
drivers/thermal/intel/intel_tcc_cooling.c +1 -1
@@ -60,7 +60,7 @@ static const struct x86_cpu_id tcc_ids[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (COMETLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L ,NULL ), -X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N ,NULL ), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_GRACEMONT ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE ,NULL ),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P ,NULL ), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL),
tools/power/x86/turbostat/turbostat.c +1 -1
@@ -5447,7 +5447,7 @@ unsigned int intel_model_duplicates(unsigned int model)case INTEL_FAM6_LAKEFIELD :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : -case INTEL_FAM6_ALDERLAKE_N : +case INTEL_FAM6_ATOM_GRACEMONT :case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S :
Peter Zijlstra
maintainerPATCH 2/3 x86/cpu: Fix Crestmont uarch
In reply to Peter ZijlstraSierra Forest and Grand Ridge are both E-core only using Crestmont micro-architecture, They fit the pre-existing naming scheme prefectly fine, adhere to it.
--- arch/x86/include/asm/intel-family.h | 5 ++--- drivers/edac/i10nm_base.c | 2 +- drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/include/asm/intel-family.h +2 -3
@@ -155,9 +155,8 @@#define INTEL_FAM6_ATOM_GRACEMONT 0xBE/* Alderlake N */ -#define INTEL_FAM6_SIERRAFOREST_X 0xAF - -#define INTEL_FAM6_GRANDRIDGE 0xB6 +#define INTEL_FAM6_ATOM_CRESTMONT_X 0xAF/* Sierra Forest */ +#define INTEL_FAM6_ATOM_CRESTMONT 0xB6/* Grand Ridge */ /* Xeon Phi */
drivers/edac/i10nm_base.c +1 -1
@@ -906,7 +906,7 @@ static const struct x86_cpu_id i10nm_cpuX86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (SAPPHIRERAPIDS_X ,X86_STEPPINGS (0x0 ,0xf ), &spr_cfg),X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (EMERALDRAPIDS_X ,X86_STEPPINGS (0x0 ,0xf ), &spr_cfg),X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (GRANITERAPIDS_X ,X86_STEPPINGS (0x0 ,0xf ), &gnr_cfg), -X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (SIERRAFOREST_X ,X86_STEPPINGS (0x0 ,0xf ), &gnr_cfg), +X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (ATOM_CRESTMONT_X ,X86_STEPPINGS (0x0 ,0xf ), &gnr_cfg), {} };MODULE_DEVICE_TABLE (x86cpu, i10nm_cpuids);
drivers/platform/x86/intel/speed_select_if/isst_if_common.c +1 -1
@@ -720,7 +720,7 @@ static struct miscdevice isst_if_char_drstatic const struct x86_cpu_id hpm_cpu_ids[] = {X86_MATCH_INTEL_FAM6_MODEL (GRANITERAPIDS_X ,NULL ), -X86_MATCH_INTEL_FAM6_MODEL (SIERRAFOREST_X ,NULL ), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_CRESTMONT_X ,NULL ), {} };
[tip: perf/core] x86/cpu: Fix Crestmont uarch
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 0cfd8fbadd6833d243c9a9d8649ba4a9f4361c93 Gitweb: https://git.kernel.org/tip/0cfd8fbadd6833d243c9a9d8649ba4a9f4361c93 Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 07 Aug 2023 14:38:08 +02:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 09 Aug 2023 21:51:06 +02:00
x86/cpu: Fix Crestmont uarch
Sierra Forest and Grand Ridge are both E-core only using Crestmont micro-architecture, They fit the pre-existing naming scheme prefectly fine, adhere to it.
--- arch/x86/include/asm/intel-family.h | 5 ++--- drivers/edac/i10nm_base.c | 2 +- drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/include/asm/intel-family.h +2 -3
@@ -155,9 +155,8 @@#define INTEL_FAM6_ATOM_GRACEMONT 0xBE/* Alderlake N */ -#define INTEL_FAM6_SIERRAFOREST_X 0xAF - -#define INTEL_FAM6_GRANDRIDGE 0xB6 +#define INTEL_FAM6_ATOM_CRESTMONT_X 0xAF/* Sierra Forest */ +#define INTEL_FAM6_ATOM_CRESTMONT 0xB6/* Grand Ridge */ /* Xeon Phi */
drivers/edac/i10nm_base.c +1 -1
@@ -906,7 +906,7 @@ static const struct x86_cpu_id i10nm_cpuids[] = {X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (SAPPHIRERAPIDS_X ,X86_STEPPINGS (0x0 ,0xf ), &spr_cfg),X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (EMERALDRAPIDS_X ,X86_STEPPINGS (0x0 ,0xf ), &spr_cfg),X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (GRANITERAPIDS_X ,X86_STEPPINGS (0x0 ,0xf ), &gnr_cfg), -X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (SIERRAFOREST_X ,X86_STEPPINGS (0x0 ,0xf ), &gnr_cfg), +X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS (ATOM_CRESTMONT_X ,X86_STEPPINGS (0x0 ,0xf ), &gnr_cfg), {} };MODULE_DEVICE_TABLE (x86cpu, i10nm_cpuids);
drivers/platform/x86/intel/speed_select_if/isst_if_common.c +1 -1
@@ -720,7 +720,7 @@ static struct miscdevice isst_if_char_driver = {static const struct x86_cpu_id hpm_cpu_ids[] = {X86_MATCH_INTEL_FAM6_MODEL (GRANITERAPIDS_X ,NULL ), -X86_MATCH_INTEL_FAM6_MODEL (SIERRAFOREST_X ,NULL ), +X86_MATCH_INTEL_FAM6_MODEL (ATOM_CRESTMONT_X ,NULL ), {} };
Peter Zijlstra
maintainerPATCH 3/3 x86/cpu: Update Hybrids
In reply to Peter ZijlstraGive the hybrid thingies their own section, appropriately between Core and Atom.
Add the Raptor Lake uarch names.
Put Lunar Lake after Arrow Lake per interweb guidance.
--- arch/x86/include/asm/intel-family.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/include/asm/intel-family.h +7 -5
@@ -98,8 +98,6 @@#define INTEL_FAM6_ICELAKE_L 0x7E/* Sunny Cove */ #define INTEL_FAM6_ICELAKE_NNPI 0x9D/* Sunny Cove */ -#define INTEL_FAM6_LAKEFIELD 0x8A/* Sunny Cove / Tremont */ -#define INTEL_FAM6_ROCKETLAKE 0xA7/* Cypress Cove */ #define INTEL_FAM6_TIGERLAKE_L 0x8C/* Willow Cove */
@@ -112,20 +110,24 @@#define INTEL_FAM6_GRANITERAPIDS_X 0xAD#define INTEL_FAM6_GRANITERAPIDS_D 0xAE +/* "Hybrid" Processors (P-Core/E-Core) */ + +#define INTEL_FAM6_LAKEFIELD 0x8A/* Sunny Cove / Tremont */ +#define INTEL_FAM6_ALDERLAKE 0x97/* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A/* Golden Cove / Gracemont */ -#define INTEL_FAM6_RAPTORLAKE 0xB7 +#define INTEL_FAM6_RAPTORLAKE 0xB7/* Raptor Cove / Enhanced Gracemont */ #define INTEL_FAM6_RAPTORLAKE_P 0xBA#define INTEL_FAM6_RAPTORLAKE_S 0xBF#define INTEL_FAM6_METEORLAKE 0xAC#define INTEL_FAM6_METEORLAKE_L 0xAA -#define INTEL_FAM6_LUNARLAKE_M 0xBD -#define INTEL_FAM6_ARROWLAKE 0xC6 +#define INTEL_FAM6_LUNARLAKE_M 0xBD +/* "Small Core" Processors (Atom/E-Core) */ #define INTEL_FAM6_ATOM_BONNELL 0x1C/* Diamondville, Pineview */
[tip: perf/core] x86/cpu: Update Hybrids
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 535445621a66faa7050c21d9d668595116285648 Gitweb: https://git.kernel.org/tip/535445621a66faa7050c21d9d668595116285648 Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 07 Aug 2023 14:38:09 +02:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 09 Aug 2023 21:51:07 +02:00
x86/cpu: Update Hybrids
Give the hybrid thingies their own section, appropriately between Core and Atom.
Add the Raptor Lake uarch names.
Put Lunar Lake after Arrow Lake per interweb guidance.
--- arch/x86/include/asm/intel-family.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/include/asm/intel-family.h +7 -5
@@ -98,8 +98,6 @@#define INTEL_FAM6_ICELAKE_L 0x7E/* Sunny Cove */ #define INTEL_FAM6_ICELAKE_NNPI 0x9D/* Sunny Cove */ -#define INTEL_FAM6_LAKEFIELD 0x8A/* Sunny Cove / Tremont */ -#define INTEL_FAM6_ROCKETLAKE 0xA7/* Cypress Cove */ #define INTEL_FAM6_TIGERLAKE_L 0x8C/* Willow Cove */
@@ -112,20 +110,24 @@#define INTEL_FAM6_GRANITERAPIDS_X 0xAD#define INTEL_FAM6_GRANITERAPIDS_D 0xAE +/* "Hybrid" Processors (P-Core/E-Core) */ + +#define INTEL_FAM6_LAKEFIELD 0x8A/* Sunny Cove / Tremont */ +#define INTEL_FAM6_ALDERLAKE 0x97/* Golden Cove / Gracemont */ #define INTEL_FAM6_ALDERLAKE_L 0x9A/* Golden Cove / Gracemont */ -#define INTEL_FAM6_RAPTORLAKE 0xB7 +#define INTEL_FAM6_RAPTORLAKE 0xB7/* Raptor Cove / Enhanced Gracemont */ #define INTEL_FAM6_RAPTORLAKE_P 0xBA#define INTEL_FAM6_RAPTORLAKE_S 0xBF#define INTEL_FAM6_METEORLAKE 0xAC#define INTEL_FAM6_METEORLAKE_L 0xAA -#define INTEL_FAM6_LUNARLAKE_M 0xBD -#define INTEL_FAM6_ARROWLAKE 0xC6 +#define INTEL_FAM6_LUNARLAKE_M 0xBD +/* "Small Core" Processors (Atom/E-Core) */ #define INTEL_FAM6_ATOM_BONNELL 0x1C/* Diamondville, Pineview */
Quoted 4 lines · Peter Zijlstra
Hi,
I seem to have missed 'spring' but here goes...
FWIW
Hi,
Quoted 3 lines · Peter Zijlstra
Hi,
I seem to have missed 'spring' but here goes...
Thanks, series looks good to me:
For the few small drivers/platform/x86 changes.
Feel free to merge this through whatever tree is convenient.
Regards,
Hans