Further sanitize INTEL_FAM6 naming
Subsystems (14)
Peter Zijlstra
maintainercover Further sanitize INTEL_FAM6 naming
Lots of variation has crept in; time to collapse the lot again.
Peter Zijlstra
maintainerPATCH 1/5 x86/intel: Aggregate big core client naming
Currently the big core client models either have:
- no OPTDIFF
- _CORE
- _DESKTOP
Make it uniformly: 'no OPTDIFF'.
for i in git grep -l "INTEL_FAM6_.*_\(CORE\|DESKTOP\)" do
sed -i -e 's/\(INTEL_FAM6_.*\)_\(CORE\|DESKTOP\)/\1/g' ${i}done
--- arch/x86/events/intel/core.c | 26 +++++++++++++------------- arch/x86/events/intel/cstate.c | 22 +++++++++++----------- arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 10 +++++----- arch/x86/events/intel/uncore.c | 12 ++++++------ arch/x86/events/msr.c | 8 ++++---- arch/x86/include/asm/intel-family.h | 10 +++++----- arch/x86/kernel/apic/apic.c | 8 ++++---- arch/x86/kernel/cpu/bugs.c | 8 ++++---- arch/x86/kernel/cpu/intel.c | 10 +++++----- drivers/cpufreq/intel_pstate.c | 12 ++++++------ drivers/idle/intel_idle.c | 2 +- tools/power/x86/turbostat/turbostat.c | 28 ++++++++++++++-------------- 13 files changed, 79 insertions(+), 79 deletions(-)
arch/x86/events/intel/core.c +13 -13
@@ -3964,12 +3964,12 @@ static __init void intel_clovertown_quirk(void) }static const struct x86_cpu_desc isolation_ucodes[] = { -INTEL_CPU_DESC (INTEL_FAM6_HASWELL_CORE ,3 ,0x0000001f ), +INTEL_CPU_DESC (INTEL_FAM6_HASWELL ,3 ,0x0000001f ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_ULT ,1 ,0x0000001e ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_GT3E ,1 ,0x00000015 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,2 ,0x00000037 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_CORE ,4 ,0x00000023 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL ,4 ,0x00000023 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_GT3E ,1 ,0x00000014 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,2 ,0x00000010 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,3 ,0x07000009 ),
@@ -3979,16 +3979,16 @@ static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,4 ,0x00000000 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_MOBILE ,3 ,0x0000007c ), -INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_DESKTOP ,3 ,0x0000007c ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,9 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE ,3 ,0x0000007c ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,9 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,9 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,10 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,11 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,12 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,10 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,11 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,12 ,0x0000004e ), - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 13, 0x0000004e), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,10 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,11 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,12 ,0x0000004e ), + INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 13, 0x0000004e), {} };
@@ -4857,7 +4857,7 @@ __init int intel_pmu_init(void)break ; -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E :
@@ -4890,7 +4890,7 @@ __init int intel_pmu_init(void) name ="haswell" ;break ; -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
@@ -4956,9 +4956,9 @@ __init int intel_pmu_init(void) pmem = true;/* fall through */ case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));
@@ -5006,7 +5006,7 @@ __init int intel_pmu_init(void) pmem = true;/* fall through */ case INTEL_FAM6_ICELAKE_MOBILE : -case INTEL_FAM6_ICELAKE_DESKTOP : +case INTEL_FAM6_ICELAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));memcpy (hw_cache_extra_regs, skl_hw_cache_extra_regs,sizeof (hw_cache_extra_regs));
arch/x86/events/intel/cstate.c +11 -11
@@ -593,40 +593,40 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_CORE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_ULT , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT_X , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_CORE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_XEON_D , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_DESKTOP , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_DESKTOP , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_MOBILE , cnl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNL , knl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNM , knl_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_X , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), - X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_DESKTOP, snb_cstates), + X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE, snb_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
arch/x86/events/intel/pt.c +1 -1
@@ -204,7 +204,7 @@ static int __init pt_pmu_hw_init(void)/* model-specific quirks */ switch (boot_cpu_data.x86_model) { -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
arch/x86/events/intel/rapl.c +5 -5
@@ -720,27 +720,27 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , model_snbep),X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , model_snb),X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , model_snbep), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_CORE , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_CORE , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_DESKTOP , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_MOBILE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , model_skl), - X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_DESKTOP, model_skl), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl), {}, };
arch/x86/events/intel/uncore.c +6 -6
@@ -1451,10 +1451,10 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_WESTMERE_EP , nhm_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE , snb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , ivb_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_CORE , hsw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_CORE , bdw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , snbep_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EX, nhmex_uncore_init),
@@ -1465,14 +1465,14 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , bdx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_DESKTOP ,skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , skx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_DESKTOP , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init), {}, };
arch/x86/events/msr.c +4 -4
@@ -59,12 +59,12 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_IVYBRIDGE_X : -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E : -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
@@ -85,10 +85,10 @@ static bool test_intel(int idx, void *data)break ;case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_SKYLAKE_X :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :case INTEL_FAM6_ICELAKE_MOBILE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;
arch/x86/include/asm/intel-family.h +5 -5
@@ -49,27 +49,27 @@#define INTEL_FAM6_IVYBRIDGE 0x3A#define INTEL_FAM6_IVYBRIDGE_X 0x3E -#define INTEL_FAM6_HASWELL_CORE 0x3C +#define INTEL_FAM6_HASWELL 0x3C#define INTEL_FAM6_HASWELL_X 0x3F#define INTEL_FAM6_HASWELL_ULT 0x45#define INTEL_FAM6_HASWELL_GT3E 0x46 -#define INTEL_FAM6_BROADWELL_CORE 0x3D +#define INTEL_FAM6_BROADWELL 0x3D#define INTEL_FAM6_BROADWELL_GT3E 0x47#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E -#define INTEL_FAM6_SKYLAKE_DESKTOP 0x5E +#define INTEL_FAM6_SKYLAKE 0x5E#define INTEL_FAM6_SKYLAKE_X 0x55#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E -#define INTEL_FAM6_KABYLAKE_DESKTOP 0x9E +#define INTEL_FAM6_KABYLAKE 0x9E#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66#define INTEL_FAM6_ICELAKE_X 0x6A#define INTEL_FAM6_ICELAKE_XEON_D 0x6C -#define INTEL_FAM6_ICELAKE_DESKTOP 0x7D +#define INTEL_FAM6_ICELAKE 0x7D#define INTEL_FAM6_ICELAKE_MOBILE 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D
arch/x86/kernel/apic/apic.c +4 -4
@@ -593,18 +593,18 @@ static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_XEON_D , bdx_deadline_rev),DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_SKYLAKE_X , skx_deadline_rev), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_CORE ,0x22 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_ULT ,0x20 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_GT3E ,0x17 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_CORE ,0x25 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_MOBILE ,0xb2 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_DESKTOP ,0xb2 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE ,0xb2 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_MOBILE ,0x52 ), - DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE_DESKTOP, 0x52), + DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE, 0x52), {}, };
arch/x86/kernel/cpu/bugs.c +4 -4
@@ -1184,15 +1184,15 @@ static void override_cache_bits(struct cpuinfo_x86 *c)case INTEL_FAM6_WESTMERE :case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE : -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E : -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :if (c->x86_cache_bits <44 ) c->x86_cache_bits =44 ;break ;
arch/x86/kernel/cpu/intel.c +5 -5
@@ -142,21 +142,21 @@ struct sku_microcode {u32 microcode; };static const struct sku_microcode spectre_bad_microcodes[] = { - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x0B ,0x80 }, - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x0A ,0x80 }, - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x09 ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x0B ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x0A ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x09 ,0x80 }, {INTEL_FAM6_KABYLAKE_MOBILE ,0x0A ,0x80 }, {INTEL_FAM6_KABYLAKE_MOBILE ,0x09 ,0x80 }, {INTEL_FAM6_SKYLAKE_X ,0x03 ,0x0100013e }, {INTEL_FAM6_SKYLAKE_X ,0x04 ,0x0200003c }, - {INTEL_FAM6_BROADWELL_CORE ,0x04 ,0x28 }, + {INTEL_FAM6_BROADWELL ,0x04 ,0x28 }, {INTEL_FAM6_BROADWELL_GT3E ,0x01 ,0x1b }, {INTEL_FAM6_BROADWELL_XEON_D ,0x02 ,0x14 }, {INTEL_FAM6_BROADWELL_XEON_D ,0x03 ,0x07000011 }, {INTEL_FAM6_BROADWELL_X ,0x01 ,0x0b000025 }, {INTEL_FAM6_HASWELL_ULT ,0x01 ,0x21 }, {INTEL_FAM6_HASWELL_GT3E ,0x01 ,0x18 }, - {INTEL_FAM6_HASWELL_CORE ,0x03 ,0x23 }, + {INTEL_FAM6_HASWELL ,0x03 ,0x23 }, {INTEL_FAM6_HASWELL_X ,0x02 ,0x3b }, {INTEL_FAM6_HASWELL_X ,0x04 ,0x10 }, {INTEL_FAM6_IVYBRIDGE_X ,0x04 ,0x42a },
drivers/cpufreq/intel_pstate.c +6 -6
@@ -1867,12 +1867,12 @@ static const struct pstate_funcs knl_funcs = { (unsigned long)&policy }static const struct x86_cpu_id intel_pstate_cpu_ids[] = { -ICPU (INTEL_FAM6_SANDYBRIDGE , core_funcs), +ICPU (INTEL_FAM6_SANDYBRIDGE , core_funcs),ICPU (INTEL_FAM6_SANDYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_ATOM_SILVERMONT , silvermont_funcs),ICPU (INTEL_FAM6_IVYBRIDGE , core_funcs), -ICPU (INTEL_FAM6_HASWELL_CORE , core_funcs), -ICPU (INTEL_FAM6_BROADWELL_CORE , core_funcs), +ICPU (INTEL_FAM6_HASWELL , core_funcs), +ICPU (INTEL_FAM6_BROADWELL , core_funcs),ICPU (INTEL_FAM6_IVYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_ULT , core_funcs),
@@ -1881,7 +1881,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs),ICPU (INTEL_FAM6_SKYLAKE_MOBILE , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs), -ICPU (INTEL_FAM6_SKYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE , core_funcs),ICPU (INTEL_FAM6_BROADWELL_XEON_D , core_funcs),ICPU (INTEL_FAM6_XEON_PHI_KNL , knl_funcs), ICPU(INTEL_FAM6_XEON_PHI_KNM, knl_funcs),
@@ -1900,13 +1900,13 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { };static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = { -ICPU (INTEL_FAM6_KABYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_KABYLAKE , core_funcs), {} };static const struct x86_cpu_id intel_pstate_hwp_boost_ids[] = {ICPU (INTEL_FAM6_SKYLAKE_X , core_funcs), -ICPU (INTEL_FAM6_SKYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE , core_funcs), {} };
drivers/idle/intel_idle.c +1 -1
@@ -1311,7 +1311,7 @@ static void intel_idle_state_table_update(void)case INTEL_FAM6_ATOM_GOLDMONT_PLUS :bxt_idle_state_table_update ();break ; -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :sklh_idle_state_table_update ();break ; }
tools/power/x86/turbostat/turbostat.c +14 -14
@@ -3207,10 +3207,10 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) pkg_cstate_limits = snb_pkg_cstate_limits; has_misc_feature_control =1 ;break ; -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -3403,10 +3403,10 @@ int has_config_tdp(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_IVYBRIDGE :/* IVB */ -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -3840,9 +3840,9 @@ void rapl_probe_intel(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE : -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_GFX |RAPL_PKG_POWER_INFO ;if (rapl_joules) {
@@ -4031,7 +4031,7 @@ void perf_limit_reasons_probe(unsigned int family, unsigned int model)return ;switch (model) { -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ do_gfx_perf_limit_reasons =1 ;case INTEL_FAM6_HASWELL_X :/* HSX */
@@ -4249,10 +4249,10 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_SANDYBRIDGE_X :case INTEL_FAM6_IVYBRIDGE :/* IVB */ case INTEL_FAM6_IVYBRIDGE_X :/* IVB Xeon */ -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -4284,8 +4284,8 @@ int has_hsw_msrs(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_HASWELL_CORE : -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_HASWELL : +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */
@@ -4569,16 +4569,16 @@ unsigned int intel_model_duplicates(unsigned int model)return INTEL_FAM6_XEON_PHI_KNL ;case INTEL_FAM6_HASWELL_ULT : -return INTEL_FAM6_HASWELL_CORE ; +return INTEL_FAM6_HASWELL ;case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ;case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :return INTEL_FAM6_SKYLAKE_MOBILE ;case INTEL_FAM6_ICELAKE_MOBILE :
[tip: x86/cpu] x86/cpu/intel: Aggregate big core client naming
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 33b154d766de704c11a098f3528debbcfb74326f Gitweb: https://git.kernel.org/tip/33b154d766de704c11a098f3528debbcfb74326f Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 22 Aug 2019 12:23:07 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 26 Aug 2019 11:21:11 +02:00
x86/cpu/intel: Aggregate big core client naming
Currently the big core client models either have:
- no OPTDIFF
- _CORE
- _DESKTOP
Make it uniformly: 'no OPTDIFF'.
for i in git grep -l "INTEL_FAM6_.*_\(CORE\|DESKTOP\)" do
sed -i -e 's/\(INTEL_FAM6_.*\)_\(CORE\|DESKTOP\)/\1/g' ${i}done
--- arch/x86/events/intel/core.c | 26 ++++++++++++------------ arch/x86/events/intel/cstate.c | 22 ++++++++++---------- arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 10 ++++----- arch/x86/events/intel/uncore.c | 12 +++++------ arch/x86/events/msr.c | 8 +++---- arch/x86/include/asm/intel-family.h | 10 ++++----- arch/x86/kernel/apic/apic.c | 8 +++---- arch/x86/kernel/cpu/bugs.c | 8 +++---- arch/x86/kernel/cpu/intel.c | 10 ++++----- drivers/cpufreq/intel_pstate.c | 12 +++++------ drivers/idle/intel_idle.c | 2 +- tools/power/x86/turbostat/turbostat.c | 28 +++++++++++++------------- 13 files changed, 79 insertions(+), 79 deletions(-)
arch/x86/events/intel/core.c +13 -13
@@ -3964,12 +3964,12 @@ static __init void intel_clovertown_quirk(void) }static const struct x86_cpu_desc isolation_ucodes[] = { -INTEL_CPU_DESC (INTEL_FAM6_HASWELL_CORE ,3 ,0x0000001f ), +INTEL_CPU_DESC (INTEL_FAM6_HASWELL ,3 ,0x0000001f ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_ULT ,1 ,0x0000001e ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_GT3E ,1 ,0x00000015 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,2 ,0x00000037 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_CORE ,4 ,0x00000023 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL ,4 ,0x00000023 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_GT3E ,1 ,0x00000014 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,2 ,0x00000010 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,3 ,0x07000009 ),
@@ -3979,16 +3979,16 @@ static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,4 ,0x00000000 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_MOBILE ,3 ,0x0000007c ), -INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_DESKTOP ,3 ,0x0000007c ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,9 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE ,3 ,0x0000007c ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,9 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,9 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,10 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,11 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,12 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,10 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,11 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,12 ,0x0000004e ), - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 13, 0x0000004e), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,10 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,11 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,12 ,0x0000004e ), + INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 13, 0x0000004e), {} };
@@ -4857,7 +4857,7 @@ __init int intel_pmu_init(void)break ; -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E :
@@ -4890,7 +4890,7 @@ __init int intel_pmu_init(void) name ="haswell" ;break ; -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
@@ -4956,9 +4956,9 @@ __init int intel_pmu_init(void) pmem = true;/* fall through */ case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));
@@ -5006,7 +5006,7 @@ __init int intel_pmu_init(void) pmem = true;/* fall through */ case INTEL_FAM6_ICELAKE_MOBILE : -case INTEL_FAM6_ICELAKE_DESKTOP : +case INTEL_FAM6_ICELAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));memcpy (hw_cache_extra_regs, skl_hw_cache_extra_regs,sizeof (hw_cache_extra_regs));
arch/x86/events/intel/cstate.c +11 -11
@@ -593,40 +593,40 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_CORE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_ULT , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT_X , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_CORE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_XEON_D , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_DESKTOP , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_DESKTOP , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_MOBILE , cnl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNL , knl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNM , knl_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_X , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), - X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_DESKTOP, snb_cstates), + X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE, snb_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
arch/x86/events/intel/pt.c +1 -1
@@ -204,7 +204,7 @@ static int __init pt_pmu_hw_init(void)/* model-specific quirks */ switch (boot_cpu_data.x86_model) { -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
arch/x86/events/intel/rapl.c +5 -5
@@ -720,27 +720,27 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , model_snbep),X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , model_snb),X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , model_snbep), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_CORE , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_CORE , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_DESKTOP , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_MOBILE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , model_skl), - X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_DESKTOP, model_skl), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl), {}, };
arch/x86/events/intel/uncore.c +6 -6
@@ -1451,10 +1451,10 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_WESTMERE_EP , nhm_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE , snb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , ivb_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_CORE , hsw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_CORE , bdw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , snbep_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EX, nhmex_uncore_init),
@@ -1465,14 +1465,14 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , bdx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_DESKTOP ,skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , skx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_DESKTOP , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init), {}, };
arch/x86/events/msr.c +4 -4
@@ -59,12 +59,12 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_IVYBRIDGE_X : -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E : -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
@@ -85,10 +85,10 @@ static bool test_intel(int idx, void *data)break ;case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_SKYLAKE_X :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :case INTEL_FAM6_ICELAKE_MOBILE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;
arch/x86/include/asm/intel-family.h +5 -5
@@ -49,27 +49,27 @@#define INTEL_FAM6_IVYBRIDGE 0x3A#define INTEL_FAM6_IVYBRIDGE_X 0x3E -#define INTEL_FAM6_HASWELL_CORE 0x3C +#define INTEL_FAM6_HASWELL 0x3C#define INTEL_FAM6_HASWELL_X 0x3F#define INTEL_FAM6_HASWELL_ULT 0x45#define INTEL_FAM6_HASWELL_GT3E 0x46 -#define INTEL_FAM6_BROADWELL_CORE 0x3D +#define INTEL_FAM6_BROADWELL 0x3D#define INTEL_FAM6_BROADWELL_GT3E 0x47#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E -#define INTEL_FAM6_SKYLAKE_DESKTOP 0x5E +#define INTEL_FAM6_SKYLAKE 0x5E#define INTEL_FAM6_SKYLAKE_X 0x55#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E -#define INTEL_FAM6_KABYLAKE_DESKTOP 0x9E +#define INTEL_FAM6_KABYLAKE 0x9E#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66#define INTEL_FAM6_ICELAKE_X 0x6A#define INTEL_FAM6_ICELAKE_XEON_D 0x6C -#define INTEL_FAM6_ICELAKE_DESKTOP 0x7D +#define INTEL_FAM6_ICELAKE 0x7D#define INTEL_FAM6_ICELAKE_MOBILE 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D
arch/x86/kernel/apic/apic.c +4 -4
@@ -593,18 +593,18 @@ static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_XEON_D , bdx_deadline_rev),DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_SKYLAKE_X , skx_deadline_rev), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_CORE ,0x22 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_ULT ,0x20 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_GT3E ,0x17 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_CORE ,0x25 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_MOBILE ,0xb2 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_DESKTOP ,0xb2 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE ,0xb2 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_MOBILE ,0x52 ), - DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE_DESKTOP, 0x52), + DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE, 0x52), {}, };
arch/x86/kernel/cpu/bugs.c +4 -4
@@ -1184,15 +1184,15 @@ static void override_cache_bits(struct cpuinfo_x86 *c)case INTEL_FAM6_WESTMERE :case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE : -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E : -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :if (c->x86_cache_bits <44 ) c->x86_cache_bits =44 ;break ;
arch/x86/kernel/cpu/intel.c +5 -5
@@ -142,21 +142,21 @@ struct sku_microcode {u32 microcode; };static const struct sku_microcode spectre_bad_microcodes[] = { - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x0B ,0x80 }, - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x0A ,0x80 }, - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x09 ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x0B ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x0A ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x09 ,0x80 }, {INTEL_FAM6_KABYLAKE_MOBILE ,0x0A ,0x80 }, {INTEL_FAM6_KABYLAKE_MOBILE ,0x09 ,0x80 }, {INTEL_FAM6_SKYLAKE_X ,0x03 ,0x0100013e }, {INTEL_FAM6_SKYLAKE_X ,0x04 ,0x0200003c }, - {INTEL_FAM6_BROADWELL_CORE ,0x04 ,0x28 }, + {INTEL_FAM6_BROADWELL ,0x04 ,0x28 }, {INTEL_FAM6_BROADWELL_GT3E ,0x01 ,0x1b }, {INTEL_FAM6_BROADWELL_XEON_D ,0x02 ,0x14 }, {INTEL_FAM6_BROADWELL_XEON_D ,0x03 ,0x07000011 }, {INTEL_FAM6_BROADWELL_X ,0x01 ,0x0b000025 }, {INTEL_FAM6_HASWELL_ULT ,0x01 ,0x21 }, {INTEL_FAM6_HASWELL_GT3E ,0x01 ,0x18 }, - {INTEL_FAM6_HASWELL_CORE ,0x03 ,0x23 }, + {INTEL_FAM6_HASWELL ,0x03 ,0x23 }, {INTEL_FAM6_HASWELL_X ,0x02 ,0x3b }, {INTEL_FAM6_HASWELL_X ,0x04 ,0x10 }, {INTEL_FAM6_IVYBRIDGE_X ,0x04 ,0x42a },
drivers/cpufreq/intel_pstate.c +6 -6
@@ -1867,12 +1867,12 @@ static const struct pstate_funcs knl_funcs = { (unsigned long)&policy }static const struct x86_cpu_id intel_pstate_cpu_ids[] = { -ICPU (INTEL_FAM6_SANDYBRIDGE , core_funcs), +ICPU (INTEL_FAM6_SANDYBRIDGE , core_funcs),ICPU (INTEL_FAM6_SANDYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_ATOM_SILVERMONT , silvermont_funcs),ICPU (INTEL_FAM6_IVYBRIDGE , core_funcs), -ICPU (INTEL_FAM6_HASWELL_CORE , core_funcs), -ICPU (INTEL_FAM6_BROADWELL_CORE , core_funcs), +ICPU (INTEL_FAM6_HASWELL , core_funcs), +ICPU (INTEL_FAM6_BROADWELL , core_funcs),ICPU (INTEL_FAM6_IVYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_ULT , core_funcs),
@@ -1881,7 +1881,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs),ICPU (INTEL_FAM6_SKYLAKE_MOBILE , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs), -ICPU (INTEL_FAM6_SKYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE , core_funcs),ICPU (INTEL_FAM6_BROADWELL_XEON_D , core_funcs),ICPU (INTEL_FAM6_XEON_PHI_KNL , knl_funcs), ICPU(INTEL_FAM6_XEON_PHI_KNM, knl_funcs),
@@ -1900,13 +1900,13 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { };static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = { -ICPU (INTEL_FAM6_KABYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_KABYLAKE , core_funcs), {} };static const struct x86_cpu_id intel_pstate_hwp_boost_ids[] = {ICPU (INTEL_FAM6_SKYLAKE_X , core_funcs), -ICPU (INTEL_FAM6_SKYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE , core_funcs), {} };
drivers/idle/intel_idle.c +1 -1
@@ -1311,7 +1311,7 @@ static void intel_idle_state_table_update(void)case INTEL_FAM6_ATOM_GOLDMONT_PLUS :bxt_idle_state_table_update ();break ; -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :sklh_idle_state_table_update ();break ; }
tools/power/x86/turbostat/turbostat.c +14 -14
@@ -3207,10 +3207,10 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) pkg_cstate_limits = snb_pkg_cstate_limits; has_misc_feature_control =1 ;break ; -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -3403,10 +3403,10 @@ int has_config_tdp(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_IVYBRIDGE :/* IVB */ -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -3840,9 +3840,9 @@ void rapl_probe_intel(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE : -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_GFX |RAPL_PKG_POWER_INFO ;if (rapl_joules) {
@@ -4031,7 +4031,7 @@ void perf_limit_reasons_probe(unsigned int family, unsigned int model)return ;switch (model) { -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ do_gfx_perf_limit_reasons =1 ;case INTEL_FAM6_HASWELL_X :/* HSX */
@@ -4249,10 +4249,10 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_SANDYBRIDGE_X :case INTEL_FAM6_IVYBRIDGE :/* IVB */ case INTEL_FAM6_IVYBRIDGE_X :/* IVB Xeon */ -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -4284,8 +4284,8 @@ int has_hsw_msrs(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_HASWELL_CORE : -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_HASWELL : +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */
@@ -4569,16 +4569,16 @@ unsigned int intel_model_duplicates(unsigned int model)return INTEL_FAM6_XEON_PHI_KNL ;case INTEL_FAM6_HASWELL_ULT : -return INTEL_FAM6_HASWELL_CORE ; +return INTEL_FAM6_HASWELL ;case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ;case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :return INTEL_FAM6_SKYLAKE_MOBILE ;case INTEL_FAM6_ICELAKE_MOBILE :
kbuild test robot
build botRe: [tip: x86/cpu] x86/cpu/intel: Aggregate big core client naming
Thank you for the patch! Yet something to improve:
Hi tip-bot2,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc6 next-20190826]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/tip-bot2-for-Peter-Zijlstra/x86-cpu-intel-Aggregate-big-core-client-naming/20190827-055636
config: x86_64-allyesconfig (attached as .config)
compiler: gcc-7 (Debian 7.4.0-10) 7.4.0 reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
In file included from drivers/powercap/intel_rapl_common.c:27:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_CORE' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_GT3E'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/powercap/intel_rapl_common.c:960:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_CORE, rapl_defaults_core),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_CORE' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_GT3E'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/powercap/intel_rapl_common.c:965:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_CORE, rapl_defaults_core),
^~~~~~~~~~~~~~
arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_DESKTOP' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/powercap/intel_rapl_common.c:970:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_DESKTOP, rapl_defaults_core),
^~~~~~~~~~~~~~
arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_DESKTOP' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_DESKTOP'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/powercap/intel_rapl_common.c:974:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_DESKTOP, rapl_defaults_core),
^~~~~~~~~~~~~~
arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_DESKTOP' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_DESKTOP'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/powercap/intel_rapl_common.c:977:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_DESKTOP, rapl_defaults_core),
^~~~~~~~~~~~~~
--
In file included from drivers/idle/intel_idle.c:53:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_CORE' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_GT3E'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1075:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_CORE, idle_cpu_hsw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_CORE' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_GT3E'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1080:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_CORE, idle_cpu_bdw),
^~~~~~~~~~~~~~
arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_DESKTOP' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_MOBILE'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1085:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_DESKTOP, idle_cpu_skl),
^~~~~~~~~~~~~~
arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_DESKTOP' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_DESKTOP'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1087:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_DESKTOP, idle_cpu_skl),
^~~~~~~~~~~~~~vim +114 arch/x86/include/asm/intel-family.h
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 112e2ce67b2b34b6e Andy Shevchenko 2018-06-29 113 #define INTEL_CPU_FAM6(_model, _driver_data) \e2ce67b2b34b6e Andy Shevchenko 2018-06-29 @114 INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)e2ce67b2b34b6e Andy Shevchenko 2018-06-29 115
:::::: The code at line 114 was first introduced by commit
:::::: e2ce67b2b34b6e9d77da2f375dba5b525508f7df x86/cpu: Introduce INTEL_CPU_FAM*() helper macros
:::::: TO: Andy Shevchenko <[email protected]> :::::: CC: Thomas Gleixner <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Peter Zijlstra
maintainerPATCH 2/5 x86/intel: Aggregate big core modile naming
In reply to Peter ZijlstraCurrently big core mobile chips have either:
- _L
- _ULT
- _MOBILE
Make it uniformly: _L.
for i in git grep -l "INTEL_FAM6_.*_\(MOBILE\|ULT\)" do
sed -i -e 's/\(INTEL_FAM6_.*\)_\(MOBILE\|ULT\)/\1_L/g' ${i}done
---
--- arch/x86/events/intel/core.c | 20 ++++++++--------- arch/x86/events/intel/cstate.c | 18 +++++++-------- arch/x86/events/intel/rapl.c | 10 ++++---- arch/x86/events/intel/uncore.c | 8 +++--- arch/x86/events/msr.c | 8 +++--- arch/x86/include/asm/intel-family.h | 10 ++++---- arch/x86/kernel/apic/apic.c | 6 ++--- arch/x86/kernel/cpu/bugs.c | 6 ++--- arch/x86/kernel/cpu/intel.c | 6 ++--- drivers/acpi/x86/utils.c | 4 +-- drivers/cpufreq/intel_pstate.c | 4 +-- tools/power/x86/turbostat/turbostat.c | 40 +++++++++++++++++----------------- 12 files changed, 70 insertions(+), 70 deletions(-)
arch/x86/events/intel/core.c +10 -10
@@ -3965,7 +3965,7 @@ static __init void intel_clovertown_quirstatic const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_HASWELL ,3 ,0x0000001f ), -INTEL_CPU_DESC (INTEL_FAM6_HASWELL_ULT ,1 ,0x0000001e ), +INTEL_CPU_DESC (INTEL_FAM6_HASWELL_L ,1 ,0x0000001e ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_GT3E ,1 ,0x00000015 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,2 ,0x00000037 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ),
@@ -3978,13 +3978,13 @@ static const struct x86_cpu_desc isolatiINTEL_CPU_DESC (INTEL_FAM6_BROADWELL_X ,2 ,0x0b000014 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,4 ,0x00000000 ), -INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_MOBILE ,3 ,0x0000007c ), +INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_L ,3 ,0x0000007c ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE ,3 ,0x0000007c ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,9 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,9 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,10 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,11 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,12 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,9 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,10 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,11 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,12 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,10 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,11 ,0x0000004e ), INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 12, 0x0000004e),
@@ -4859,7 +4859,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X : -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :case INTEL_FAM6_HASWELL_GT3E :x86_add_quirk (intel_ht_bug);x86_add_quirk (intel_pebs_isolation_quirk);
@@ -4955,9 +4955,9 @@ __init int intel_pmu_init(void)case INTEL_FAM6_SKYLAKE_X : pmem = true;/* fall through */ -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;
@@ -5005,7 +5005,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ICELAKE_XEON_D : pmem = true;/* fall through */ -case INTEL_FAM6_ICELAKE_MOBILE : +case INTEL_FAM6_ICELAKE_L :case INTEL_FAM6_ICELAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));
arch/x86/events/intel/cstate.c +9 -9
@@ -597,7 +597,7 @@ static const struct x86_cpu_id intel_cstX86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_GT3E , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_ULT , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_L , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates), X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT_X, slm_cstates),
@@ -608,14 +608,14 @@ static const struct x86_cpu_id intel_cstX86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_L , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_L , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_MOBILE , cnl_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_L , cnl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNL , knl_cstates), X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
@@ -625,8 +625,8 @@ static const struct x86_cpu_id intel_cstX86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_L , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE , snb_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
arch/x86/events/intel/rapl.c +5 -5
@@ -722,7 +722,7 @@ static const struct x86_cpu_id rapl_modeX86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , model_snbep),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , model_hsx), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_L , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw), X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, model_hsw),
@@ -730,16 +730,16 @@ static const struct x86_cpu_id rapl_modeX86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , model_hsx), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , model_skl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl), {}, };
arch/x86/events/intel/uncore.c +4 -4
@@ -1452,7 +1452,7 @@ static const struct x86_cpu_id intel_uncX86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE , snb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , ivb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL , hsw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , hsw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_L , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL , bdw_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, bdw_uncore_init),
@@ -1466,11 +1466,11 @@ static const struct x86_cpu_id intel_uncX86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_L , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , skx_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_L , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init),
arch/x86/events/msr.c +4 -4
@@ -61,7 +61,7 @@ static bool test_intel(int idx, void *dacase INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X : -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :case INTEL_FAM6_HASWELL_GT3E :case INTEL_FAM6_BROADWELL :
@@ -84,12 +84,12 @@ static bool test_intel(int idx, void *dareturn true;break ; -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_SKYLAKE_X : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE : -case INTEL_FAM6_ICELAKE_MOBILE : +case INTEL_FAM6_ICELAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
arch/x86/include/asm/intel-family.h +5 -5
@@ -51,7 +51,7 @@#define INTEL_FAM6_HASWELL 0x3C#define INTEL_FAM6_HASWELL_X 0x3F -#define INTEL_FAM6_HASWELL_ULT 0x45 +#define INTEL_FAM6_HASWELL_L 0x45#define INTEL_FAM6_HASWELL_GT3E 0x46#define INTEL_FAM6_BROADWELL 0x3D
@@ -59,18 +59,18 @@#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56 -#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E +#define INTEL_FAM6_SKYLAKE_L 0x4E#define INTEL_FAM6_SKYLAKE 0x5E#define INTEL_FAM6_SKYLAKE_X 0x55 -#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E +#define INTEL_FAM6_KABYLAKE_L 0x8E#define INTEL_FAM6_KABYLAKE 0x9E -#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66 +#define INTEL_FAM6_CANNONLAKE_L 0x66#define INTEL_FAM6_ICELAKE_X 0x6A#define INTEL_FAM6_ICELAKE_XEON_D 0x6C#define INTEL_FAM6_ICELAKE 0x7D -#define INTEL_FAM6_ICELAKE_MOBILE 0x7E +#define INTEL_FAM6_ICELAKE_L 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D/* "Small Core" Processors (Atom) */
arch/x86/kernel/apic/apic.c +3 -3
@@ -594,16 +594,16 @@ static const struct x86_cpu_id deadline_DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_SKYLAKE_X , skx_deadline_rev),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_ULT ,0x20 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_L ,0x20 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_GT3E ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_MOBILE ,0xb2 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_L ,0xb2 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE ,0xb2 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_MOBILE ,0x52 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_L ,0x52 ), DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE, 0x52), {},
arch/x86/kernel/cpu/bugs.c +3 -3
@@ -1185,13 +1185,13 @@ static void override_cache_bits(struct ccase INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_HASWELL : -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :case INTEL_FAM6_HASWELL_GT3E :case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_GT3E : -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE :if (c->x86_cache_bits <44 ) c->x86_cache_bits =44 ;
arch/x86/kernel/cpu/intel.c +3 -3
@@ -145,8 +145,8 @@ static const struct sku_microcode spectr { INTEL_FAM6_KABYLAKE, 0x0B, 0x80 }, { INTEL_FAM6_KABYLAKE, 0x0A, 0x80 }, { INTEL_FAM6_KABYLAKE, 0x09, 0x80 }, - { INTEL_FAM6_KABYLAKE_MOBILE, 0x0A, 0x80 }, - { INTEL_FAM6_KABYLAKE_MOBILE, 0x09, 0x80 }, + { INTEL_FAM6_KABYLAKE_L, 0x0A, 0x80 }, + { INTEL_FAM6_KABYLAKE_L, 0x09, 0x80 }, { INTEL_FAM6_SKYLAKE_X, 0x03, 0x0100013e }, { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, { INTEL_FAM6_BROADWELL, 0x04, 0x28 },
@@ -154,7 +154,7 @@ static const struct sku_microcode spectr { INTEL_FAM6_BROADWELL_XEON_D, 0x02, 0x14 }, { INTEL_FAM6_BROADWELL_XEON_D, 0x03, 0x07000011 }, { INTEL_FAM6_BROADWELL_X, 0x01, 0x0b000025 }, - { INTEL_FAM6_HASWELL_ULT, 0x01, 0x21 }, + { INTEL_FAM6_HASWELL_L, 0x01, 0x21 }, { INTEL_FAM6_HASWELL_GT3E, 0x01, 0x18 }, { INTEL_FAM6_HASWELL, 0x03, 0x23 }, { INTEL_FAM6_HASWELL_X, 0x02, 0x3b },
drivers/acpi/x86/utils.c +2 -2
@@ -69,11 +69,11 @@ static const struct always_present_id al * after _SB.PCI0.GFX0.LCD.LCD1._ON gets called has passed * *and* _STA has been called at least 3 times since. */ - ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_ULT), { + ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7130"), }), - ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_ULT), { + ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7139"), }),
drivers/cpufreq/intel_pstate.c +2 -2
@@ -1875,11 +1875,11 @@ static const struct x86_cpu_id intel_pstICPU (INTEL_FAM6_BROADWELL , core_funcs),ICPU (INTEL_FAM6_IVYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_X , core_funcs), -ICPU (INTEL_FAM6_HASWELL_ULT , core_funcs), +ICPU (INTEL_FAM6_HASWELL_L , core_funcs),ICPU (INTEL_FAM6_HASWELL_GT3E , core_funcs),ICPU (INTEL_FAM6_BROADWELL_GT3E , core_funcs),ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs), -ICPU (INTEL_FAM6_SKYLAKE_MOBILE , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE_L , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs),ICPU (INTEL_FAM6_SKYLAKE , core_funcs), ICPU(INTEL_FAM6_BROADWELL_XEON_D, core_funcs),
tools/power/x86/turbostat/turbostat.c +20 -20
@@ -3213,8 +3213,8 @@ int probe_nhm_msrs(unsigned int family,case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ pkg_cstate_limits = hsw_pkg_cstate_limits; has_misc_feature_control =1 ;break ;
@@ -3409,8 +3409,8 @@ int has_config_tdp(unsigned int family,case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ case INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_XEON_PHI_KNL :/* Knights Landing */
@@ -3863,8 +3863,8 @@ void rapl_probe_intel(unsigned int familelse BIC_PRESENT (BIC_PkgWatt);break ; -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_DRAM |RAPL_DRAM_PERF_STATUS |RAPL_PKG_PERF_STATUS |RAPL_GFX |RAPL_PKG_POWER_INFO ;BIC_PRESENT (BIC_PKG__ );BIC_PRESENT (BIC_RAM__ );
@@ -4255,8 +4255,8 @@ int has_snb_msrs(unsigned int family, uncase INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ case INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS :
@@ -4286,8 +4286,8 @@ int has_hsw_msrs(unsigned int family, unswitch (model) {case INTEL_FAM6_HASWELL :case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS :return 1 ;
@@ -4309,8 +4309,8 @@ int has_skl_msrs(unsigned int family, unreturn 0 ;switch (model) { -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ return 1 ; }return 0 ;
@@ -4345,7 +4345,7 @@ int is_cnl(unsigned int family, unsignedreturn 0 ;switch (model) { -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ return 1 ; }
@@ -4568,21 +4568,21 @@ unsigned int intel_model_duplicates(unsicase INTEL_FAM6_XEON_PHI_KNM :return INTEL_FAM6_XEON_PHI_KNL ; -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :return INTEL_FAM6_HASWELL ;case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ; -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE : -return INTEL_FAM6_SKYLAKE_MOBILE ; +return INTEL_FAM6_SKYLAKE_L ; -case INTEL_FAM6_ICELAKE_MOBILE : -return INTEL_FAM6_CANNONLAKE_MOBILE ; +case INTEL_FAM6_ICELAKE_L : +return INTEL_FAM6_CANNONLAKE_L ; }return model; }
@@ -4731,7 +4731,7 @@ void process_cpuid()if (crystal_hz ==0 )switch (model) { -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ crystal_hz =24000000 ;/* 24.0 MHz */ break ;case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */
[tip: x86/cpu] x86/cpu/intel: Aggregate big core mobile naming
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 2c1ce2da5925a725fa6a4b9561304fb61ed1f31f Gitweb: https://git.kernel.org/tip/2c1ce2da5925a725fa6a4b9561304fb61ed1f31f Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 22 Aug 2019 12:23:08 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 26 Aug 2019 11:21:11 +02:00
x86/cpu/intel: Aggregate big core mobile naming
Currently big core mobile chips have either:
- _L
- _ULT
- _MOBILE
Make it uniformly: _L.
for i in git grep -l "INTEL_FAM6_.*_\(MOBILE\|ULT\)" do
sed -i -e 's/\(INTEL_FAM6_.*\)_\(MOBILE\|ULT\)/\1_L/g' ${i}done
--- arch/x86/events/intel/core.c | 20 ++++++------- arch/x86/events/intel/cstate.c | 18 ++++++------ arch/x86/events/intel/rapl.c | 10 +++---- arch/x86/events/intel/uncore.c | 8 ++--- arch/x86/events/msr.c | 8 ++--- arch/x86/include/asm/intel-family.h | 10 +++---- arch/x86/kernel/apic/apic.c | 6 ++-- arch/x86/kernel/cpu/bugs.c | 6 ++-- arch/x86/kernel/cpu/intel.c | 6 ++-- drivers/acpi/x86/utils.c | 4 +-- drivers/cpufreq/intel_pstate.c | 4 +-- tools/power/x86/turbostat/turbostat.c | 40 +++++++++++++------------- 12 files changed, 70 insertions(+), 70 deletions(-)
arch/x86/events/intel/core.c +10 -10
@@ -3965,7 +3965,7 @@ static __init void intel_clovertown_quirk(void)static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_HASWELL ,3 ,0x0000001f ), -INTEL_CPU_DESC (INTEL_FAM6_HASWELL_ULT ,1 ,0x0000001e ), +INTEL_CPU_DESC (INTEL_FAM6_HASWELL_L ,1 ,0x0000001e ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_GT3E ,1 ,0x00000015 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,2 ,0x00000037 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ),
@@ -3978,13 +3978,13 @@ static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_X ,2 ,0x0b000014 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,4 ,0x00000000 ), -INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_MOBILE ,3 ,0x0000007c ), +INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_L ,3 ,0x0000007c ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE ,3 ,0x0000007c ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,9 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,9 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,10 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,11 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,12 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,9 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,10 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,11 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_L ,12 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,10 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,11 ,0x0000004e ), INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 12, 0x0000004e),
@@ -4859,7 +4859,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X : -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :case INTEL_FAM6_HASWELL_GT3E :x86_add_quirk (intel_ht_bug);x86_add_quirk (intel_pebs_isolation_quirk);
@@ -4955,9 +4955,9 @@ __init int intel_pmu_init(void)case INTEL_FAM6_SKYLAKE_X : pmem = true;/* fall through */ -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;
@@ -5005,7 +5005,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ICELAKE_XEON_D : pmem = true;/* fall through */ -case INTEL_FAM6_ICELAKE_MOBILE : +case INTEL_FAM6_ICELAKE_L :case INTEL_FAM6_ICELAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));
arch/x86/events/intel/cstate.c +9 -9
@@ -597,7 +597,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_GT3E , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_ULT , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_L , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates), X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT_X, slm_cstates),
@@ -608,14 +608,14 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_L , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_L , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_MOBILE , cnl_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_L , cnl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNL , knl_cstates), X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
@@ -625,8 +625,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_L , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE , snb_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
arch/x86/events/intel/rapl.c +5 -5
@@ -722,7 +722,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , model_snbep),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , model_hsx), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_L , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw), X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, model_hsw),
@@ -730,16 +730,16 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , model_hsx), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , model_skl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl), {}, };
arch/x86/events/intel/uncore.c +4 -4
@@ -1452,7 +1452,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE , snb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , ivb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL , hsw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , hsw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_L , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL , bdw_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, bdw_uncore_init),
@@ -1466,11 +1466,11 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_L , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , skx_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_L , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init),
arch/x86/events/msr.c +4 -4
@@ -61,7 +61,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X : -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :case INTEL_FAM6_HASWELL_GT3E :case INTEL_FAM6_BROADWELL :
@@ -84,12 +84,12 @@ static bool test_intel(int idx, void *data)return true;break ; -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_SKYLAKE_X : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE : -case INTEL_FAM6_ICELAKE_MOBILE : +case INTEL_FAM6_ICELAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
arch/x86/include/asm/intel-family.h +5 -5
@@ -51,7 +51,7 @@#define INTEL_FAM6_HASWELL 0x3C#define INTEL_FAM6_HASWELL_X 0x3F -#define INTEL_FAM6_HASWELL_ULT 0x45 +#define INTEL_FAM6_HASWELL_L 0x45#define INTEL_FAM6_HASWELL_GT3E 0x46#define INTEL_FAM6_BROADWELL 0x3D
@@ -59,18 +59,18 @@#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56 -#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E +#define INTEL_FAM6_SKYLAKE_L 0x4E#define INTEL_FAM6_SKYLAKE 0x5E#define INTEL_FAM6_SKYLAKE_X 0x55 -#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E +#define INTEL_FAM6_KABYLAKE_L 0x8E#define INTEL_FAM6_KABYLAKE 0x9E -#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66 +#define INTEL_FAM6_CANNONLAKE_L 0x66#define INTEL_FAM6_ICELAKE_X 0x6A#define INTEL_FAM6_ICELAKE_XEON_D 0x6C#define INTEL_FAM6_ICELAKE 0x7D -#define INTEL_FAM6_ICELAKE_MOBILE 0x7E +#define INTEL_FAM6_ICELAKE_L 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D/* "Small Core" Processors (Atom) */
arch/x86/kernel/apic/apic.c +3 -3
@@ -594,16 +594,16 @@ static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_SKYLAKE_X , skx_deadline_rev),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_ULT ,0x20 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_L ,0x20 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_GT3E ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_MOBILE ,0xb2 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_L ,0xb2 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE ,0xb2 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_MOBILE ,0x52 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_L ,0x52 ), DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE, 0x52), {},
arch/x86/kernel/cpu/bugs.c +3 -3
@@ -1185,13 +1185,13 @@ static void override_cache_bits(struct cpuinfo_x86 *c)case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_HASWELL : -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :case INTEL_FAM6_HASWELL_GT3E :case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_GT3E : -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE :if (c->x86_cache_bits <44 ) c->x86_cache_bits =44 ;
arch/x86/kernel/cpu/intel.c +3 -3
@@ -145,8 +145,8 @@ static const struct sku_microcode spectre_bad_microcodes[] = { { INTEL_FAM6_KABYLAKE, 0x0B, 0x80 }, { INTEL_FAM6_KABYLAKE, 0x0A, 0x80 }, { INTEL_FAM6_KABYLAKE, 0x09, 0x80 }, - { INTEL_FAM6_KABYLAKE_MOBILE, 0x0A, 0x80 }, - { INTEL_FAM6_KABYLAKE_MOBILE, 0x09, 0x80 }, + { INTEL_FAM6_KABYLAKE_L, 0x0A, 0x80 }, + { INTEL_FAM6_KABYLAKE_L, 0x09, 0x80 }, { INTEL_FAM6_SKYLAKE_X, 0x03, 0x0100013e }, { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, { INTEL_FAM6_BROADWELL, 0x04, 0x28 },
@@ -154,7 +154,7 @@ static const struct sku_microcode spectre_bad_microcodes[] = { { INTEL_FAM6_BROADWELL_XEON_D, 0x02, 0x14 }, { INTEL_FAM6_BROADWELL_XEON_D, 0x03, 0x07000011 }, { INTEL_FAM6_BROADWELL_X, 0x01, 0x0b000025 }, - { INTEL_FAM6_HASWELL_ULT, 0x01, 0x21 }, + { INTEL_FAM6_HASWELL_L, 0x01, 0x21 }, { INTEL_FAM6_HASWELL_GT3E, 0x01, 0x18 }, { INTEL_FAM6_HASWELL, 0x03, 0x23 }, { INTEL_FAM6_HASWELL_X, 0x02, 0x3b },
drivers/acpi/x86/utils.c +2 -2
@@ -69,11 +69,11 @@ static const struct always_present_id always_present_ids[] = { * after _SB.PCI0.GFX0.LCD.LCD1._ON gets called has passed * *and* _STA has been called at least 3 times since. */ - ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_ULT), { + ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7130"), }), - ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_ULT), { + ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7139"), }),
drivers/cpufreq/intel_pstate.c +2 -2
@@ -1875,11 +1875,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {ICPU (INTEL_FAM6_BROADWELL , core_funcs),ICPU (INTEL_FAM6_IVYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_X , core_funcs), -ICPU (INTEL_FAM6_HASWELL_ULT , core_funcs), +ICPU (INTEL_FAM6_HASWELL_L , core_funcs),ICPU (INTEL_FAM6_HASWELL_GT3E , core_funcs),ICPU (INTEL_FAM6_BROADWELL_GT3E , core_funcs),ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs), -ICPU (INTEL_FAM6_SKYLAKE_MOBILE , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE_L , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs),ICPU (INTEL_FAM6_SKYLAKE , core_funcs), ICPU(INTEL_FAM6_BROADWELL_XEON_D, core_funcs),
tools/power/x86/turbostat/turbostat.c +20 -20
@@ -3213,8 +3213,8 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ pkg_cstate_limits = hsw_pkg_cstate_limits; has_misc_feature_control =1 ;break ;
@@ -3409,8 +3409,8 @@ int has_config_tdp(unsigned int family, unsigned int model)case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ case INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_XEON_PHI_KNL :/* Knights Landing */
@@ -3863,8 +3863,8 @@ void rapl_probe_intel(unsigned int family, unsigned int model)else BIC_PRESENT (BIC_PkgWatt);break ; -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_DRAM |RAPL_DRAM_PERF_STATUS |RAPL_PKG_PERF_STATUS |RAPL_GFX |RAPL_PKG_POWER_INFO ;BIC_PRESENT (BIC_PKG__ );BIC_PRESENT (BIC_RAM__ );
@@ -4255,8 +4255,8 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ case INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS :
@@ -4286,8 +4286,8 @@ int has_hsw_msrs(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_HASWELL :case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS :return 1 ;
@@ -4309,8 +4309,8 @@ int has_skl_msrs(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ return 1 ; }return 0 ;
@@ -4345,7 +4345,7 @@ int is_cnl(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_CANNONLAKE_L :/* CNL */ return 1 ; }
@@ -4568,21 +4568,21 @@ unsigned int intel_model_duplicates(unsigned int model)case INTEL_FAM6_XEON_PHI_KNM :return INTEL_FAM6_XEON_PHI_KNL ; -case INTEL_FAM6_HASWELL_ULT : +case INTEL_FAM6_HASWELL_L :return INTEL_FAM6_HASWELL ;case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ; -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_L :case INTEL_FAM6_KABYLAKE : -return INTEL_FAM6_SKYLAKE_MOBILE ; +return INTEL_FAM6_SKYLAKE_L ; -case INTEL_FAM6_ICELAKE_MOBILE : -return INTEL_FAM6_CANNONLAKE_MOBILE ; +case INTEL_FAM6_ICELAKE_L : +return INTEL_FAM6_CANNONLAKE_L ; }return model; }
@@ -4731,7 +4731,7 @@ void process_cpuid()if (crystal_hz ==0 )switch (model) { -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ +case INTEL_FAM6_SKYLAKE_L :/* SKL */ crystal_hz =24000000 ;/* 24.0 MHz */ break ;case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */
Peter Zijlstra
maintainerPATCH 3/5 x86/intel: Aggregate big core graphics naming
In reply to Peter ZijlstraCurrently big core clients with extra graphics on have:
- _G
- _GT3E
Make it uniformly: _G
for i in git grep -l "INTEL_FAM6_.*_GT3E" do
sed -i -e 's/\(INTEL_FAM6_.*\)_GT3E/\1_G/g' ${i}done
--- arch/x86/events/intel/core.c | 8 ++++---- arch/x86/events/intel/cstate.c | 8 ++++---- arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 4 ++-- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/msr.c | 4 ++-- arch/x86/include/asm/intel-family.h | 4 ++-- arch/x86/kernel/apic/apic.c | 4 ++-- arch/x86/kernel/cpu/bugs.c | 4 ++-- arch/x86/kernel/cpu/intel.c | 4 ++-- drivers/cpufreq/intel_pstate.c | 4 ++-- tools/power/x86/turbostat/turbostat.c | 14 +++++++------- 12 files changed, 32 insertions(+), 32 deletions(-)
arch/x86/events/intel/core.c +4 -4
@@ -3966,11 +3966,11 @@ static __init void intel_clovertown_quirstatic const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_HASWELL ,3 ,0x0000001f ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_L ,1 ,0x0000001e ), -INTEL_CPU_DESC (INTEL_FAM6_HASWELL_GT3E ,1 ,0x00000015 ), +INTEL_CPU_DESC (INTEL_FAM6_HASWELL_G ,1 ,0x00000015 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,2 ,0x00000037 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL ,4 ,0x00000023 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_GT3E ,1 ,0x00000014 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_G ,1 ,0x00000014 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,2 ,0x00000010 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,3 ,0x07000009 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,4 ,0x0f000009 ),
@@ -4860,7 +4860,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_L : -case INTEL_FAM6_HASWELL_GT3E : +case INTEL_FAM6_HASWELL_G :x86_add_quirk (intel_ht_bug);x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;
@@ -4892,7 +4892,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;
arch/x86/events/intel/cstate.c +4 -4
@@ -593,9 +593,9 @@ static const struct x86_cpu_id intel_cstX86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_GT3E , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_G , snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_L, hswult_cstates),
@@ -605,7 +605,7 @@ static const struct x86_cpu_id intel_cstX86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_XEON_D , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_G , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_L, snb_cstates),
arch/x86/events/intel/pt.c +1 -1
@@ -206,7 +206,7 @@ static int __init pt_pmu_hw_init(void)switch (boot_cpu_data.x86_model) {case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :/* not setting BRANCH_EN will #GP, erratum BDM106 */ pt_pmu.branch_en_always_on = true;
arch/x86/events/intel/rapl.c +2 -2
@@ -723,9 +723,9 @@ static const struct x86_cpu_id rapl_modeX86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_L , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_G , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_G , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx), X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, model_knl),
arch/x86/events/intel/uncore.c +2 -2
@@ -1453,9 +1453,9 @@ static const struct x86_cpu_id intel_uncX86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , ivb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_L , hsw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_G , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL , bdw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , bdw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_G , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , snbep_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_NEHALEM_EX , nhmex_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EX, nhmex_uncore_init),
arch/x86/events/msr.c +2 -2
@@ -62,11 +62,11 @@ static bool test_intel(int idx, void *dacase INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_L : -case INTEL_FAM6_HASWELL_GT3E : +case INTEL_FAM6_HASWELL_G :case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_ATOM_SILVERMONT :
arch/x86/include/asm/intel-family.h +2 -2
@@ -52,10 +52,10 @@#define INTEL_FAM6_HASWELL 0x3C#define INTEL_FAM6_HASWELL_X 0x3F#define INTEL_FAM6_HASWELL_L 0x45 -#define INTEL_FAM6_HASWELL_GT3E 0x46 +#define INTEL_FAM6_HASWELL_G 0x46#define INTEL_FAM6_BROADWELL 0x3D -#define INTEL_FAM6_BROADWELL_GT3E 0x47 +#define INTEL_FAM6_BROADWELL_G 0x47#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56
arch/x86/kernel/apic/apic.c +2 -2
@@ -595,10 +595,10 @@ static const struct x86_cpu_id deadline_DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_L ,0x20 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_GT3E ,0x17 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_G ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_G ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_L ,0xb2 ), DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_SKYLAKE, 0xb2),
arch/x86/kernel/cpu/bugs.c +2 -2
@@ -1186,9 +1186,9 @@ static void override_cache_bits(struct ccase INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_L : -case INTEL_FAM6_HASWELL_GT3E : +case INTEL_FAM6_HASWELL_G :case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_L :
arch/x86/kernel/cpu/intel.c +2 -2
@@ -150,12 +150,12 @@ static const struct sku_microcode spectr { INTEL_FAM6_SKYLAKE_X, 0x03, 0x0100013e }, { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, { INTEL_FAM6_BROADWELL, 0x04, 0x28 }, - { INTEL_FAM6_BROADWELL_GT3E, 0x01, 0x1b }, + { INTEL_FAM6_BROADWELL_G, 0x01, 0x1b }, { INTEL_FAM6_BROADWELL_XEON_D, 0x02, 0x14 }, { INTEL_FAM6_BROADWELL_XEON_D, 0x03, 0x07000011 }, { INTEL_FAM6_BROADWELL_X, 0x01, 0x0b000025 }, { INTEL_FAM6_HASWELL_L, 0x01, 0x21 }, - { INTEL_FAM6_HASWELL_GT3E, 0x01, 0x18 }, + { INTEL_FAM6_HASWELL_G, 0x01, 0x18 }, { INTEL_FAM6_HASWELL, 0x03, 0x23 }, { INTEL_FAM6_HASWELL_X, 0x02, 0x3b }, { INTEL_FAM6_HASWELL_X, 0x04, 0x10 },
drivers/cpufreq/intel_pstate.c +2 -2
@@ -1876,8 +1876,8 @@ static const struct x86_cpu_id intel_pstICPU (INTEL_FAM6_IVYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_L , core_funcs), -ICPU (INTEL_FAM6_HASWELL_GT3E , core_funcs), -ICPU (INTEL_FAM6_BROADWELL_GT3E , core_funcs), +ICPU (INTEL_FAM6_HASWELL_G , core_funcs), +ICPU (INTEL_FAM6_BROADWELL_G , core_funcs),ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs),ICPU (INTEL_FAM6_SKYLAKE_L , core_funcs), ICPU(INTEL_FAM6_BROADWELL_X, core_funcs),
tools/power/x86/turbostat/turbostat.c +7 -7
@@ -3209,9 +3209,9 @@ int probe_nhm_msrs(unsigned int family,break ;case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_L :/* SKL */ case INTEL_FAM6_CANNONLAKE_L :/* CNL */
@@ -3841,9 +3841,9 @@ void rapl_probe_intel(unsigned int familcase INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_HASWELL :/* HSW */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_GFX |RAPL_PKG_POWER_INFO ;if (rapl_joules) {BIC_PRESENT (BIC_Pkg_J);
@@ -4032,7 +4032,7 @@ void perf_limit_reasons_probe(unsigned iswitch (model) {case INTEL_FAM6_HASWELL :/* HSW */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ do_gfx_perf_limit_reasons =1 ;case INTEL_FAM6_HASWELL_X :/* HSX */ do_core_perf_limit_reasons =1 ;
@@ -4251,9 +4251,9 @@ int has_snb_msrs(unsigned int family, uncase INTEL_FAM6_IVYBRIDGE_X :/* IVB Xeon */ case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSW */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_L :/* SKL */ case INTEL_FAM6_CANNONLAKE_L :/* CNL */
[tip: x86/cpu] x86/cpu/intel: Aggregate big core graphics naming
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 7d54f81be6a3acea9e7289f25aba83a9ab5adc6e Gitweb: https://git.kernel.org/tip/7d54f81be6a3acea9e7289f25aba83a9ab5adc6e Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 22 Aug 2019 12:23:09 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 26 Aug 2019 11:49:00 +02:00
x86/cpu/intel: Aggregate big core graphics naming
Currently big core clients with extra graphics on have:
- _G
- _GT3E
Make it uniformly: _G
for i in git grep -l "INTEL_FAM6_.*_GT3E"
do
sed -i -e 's/\(INTEL_FAM6_.*\)_GT3E/\1_G/g' ${i}done
--- arch/x86/events/intel/core.c | 8 ++++---- arch/x86/events/intel/cstate.c | 8 ++++---- arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 4 ++-- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/msr.c | 4 ++-- arch/x86/include/asm/intel-family.h | 4 ++-- arch/x86/kernel/apic/apic.c | 4 ++-- arch/x86/kernel/cpu/bugs.c | 4 ++-- arch/x86/kernel/cpu/intel.c | 4 ++-- drivers/cpufreq/intel_pstate.c | 4 ++-- tools/power/x86/turbostat/turbostat.c | 18 +++++++++--------- 12 files changed, 34 insertions(+), 34 deletions(-)
arch/x86/events/intel/core.c +4 -4
@@ -3966,11 +3966,11 @@ static __init void intel_clovertown_quirk(void)static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_HASWELL ,3 ,0x0000001f ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_L ,1 ,0x0000001e ), -INTEL_CPU_DESC (INTEL_FAM6_HASWELL_GT3E ,1 ,0x00000015 ), +INTEL_CPU_DESC (INTEL_FAM6_HASWELL_G ,1 ,0x00000015 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,2 ,0x00000037 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL ,4 ,0x00000023 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_GT3E ,1 ,0x00000014 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_G ,1 ,0x00000014 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,2 ,0x00000010 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,3 ,0x07000009 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,4 ,0x0f000009 ),
@@ -4860,7 +4860,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_L : -case INTEL_FAM6_HASWELL_GT3E : +case INTEL_FAM6_HASWELL_G :x86_add_quirk (intel_ht_bug);x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;
@@ -4892,7 +4892,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;
arch/x86/events/intel/cstate.c +4 -4
@@ -593,9 +593,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_GT3E , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_G , snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_L, hswult_cstates),
@@ -605,7 +605,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_XEON_D , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_G , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_L, snb_cstates),
arch/x86/events/intel/pt.c +1 -1
@@ -206,7 +206,7 @@ static int __init pt_pmu_hw_init(void)switch (boot_cpu_data.x86_model) {case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :/* not setting BRANCH_EN will #GP, erratum BDM106 */ pt_pmu.branch_en_always_on = true;
arch/x86/events/intel/rapl.c +2 -2
@@ -723,9 +723,9 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_L , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_G , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_G , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx), X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, model_knl),
arch/x86/events/intel/uncore.c +2 -2
@@ -1453,9 +1453,9 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , ivb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_L , hsw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_G , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL , bdw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , bdw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_G , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , snbep_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_NEHALEM_EX , nhmex_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EX, nhmex_uncore_init),
arch/x86/events/msr.c +2 -2
@@ -62,11 +62,11 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_L : -case INTEL_FAM6_HASWELL_GT3E : +case INTEL_FAM6_HASWELL_G :case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_ATOM_SILVERMONT :
arch/x86/include/asm/intel-family.h +2 -2
@@ -52,10 +52,10 @@#define INTEL_FAM6_HASWELL 0x3C#define INTEL_FAM6_HASWELL_X 0x3F#define INTEL_FAM6_HASWELL_L 0x45 -#define INTEL_FAM6_HASWELL_GT3E 0x46 +#define INTEL_FAM6_HASWELL_G 0x46#define INTEL_FAM6_BROADWELL 0x3D -#define INTEL_FAM6_BROADWELL_GT3E 0x47 +#define INTEL_FAM6_BROADWELL_G 0x47#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56
arch/x86/kernel/apic/apic.c +2 -2
@@ -595,10 +595,10 @@ static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_L ,0x20 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_GT3E ,0x17 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_G ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_G ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_L ,0xb2 ), DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_SKYLAKE, 0xb2),
arch/x86/kernel/cpu/bugs.c +2 -2
@@ -1186,9 +1186,9 @@ static void override_cache_bits(struct cpuinfo_x86 *c)case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_L : -case INTEL_FAM6_HASWELL_GT3E : +case INTEL_FAM6_HASWELL_G :case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_GT3E : +case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_SKYLAKE_L :case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_L :
arch/x86/kernel/cpu/intel.c +2 -2
@@ -150,12 +150,12 @@ static const struct sku_microcode spectre_bad_microcodes[] = { { INTEL_FAM6_SKYLAKE_X, 0x03, 0x0100013e }, { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, { INTEL_FAM6_BROADWELL, 0x04, 0x28 }, - { INTEL_FAM6_BROADWELL_GT3E, 0x01, 0x1b }, + { INTEL_FAM6_BROADWELL_G, 0x01, 0x1b }, { INTEL_FAM6_BROADWELL_XEON_D, 0x02, 0x14 }, { INTEL_FAM6_BROADWELL_XEON_D, 0x03, 0x07000011 }, { INTEL_FAM6_BROADWELL_X, 0x01, 0x0b000025 }, { INTEL_FAM6_HASWELL_L, 0x01, 0x21 }, - { INTEL_FAM6_HASWELL_GT3E, 0x01, 0x18 }, + { INTEL_FAM6_HASWELL_G, 0x01, 0x18 }, { INTEL_FAM6_HASWELL, 0x03, 0x23 }, { INTEL_FAM6_HASWELL_X, 0x02, 0x3b }, { INTEL_FAM6_HASWELL_X, 0x04, 0x10 },
drivers/cpufreq/intel_pstate.c +2 -2
@@ -1876,8 +1876,8 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {ICPU (INTEL_FAM6_IVYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_L , core_funcs), -ICPU (INTEL_FAM6_HASWELL_GT3E , core_funcs), -ICPU (INTEL_FAM6_BROADWELL_GT3E , core_funcs), +ICPU (INTEL_FAM6_HASWELL_G , core_funcs), +ICPU (INTEL_FAM6_BROADWELL_G , core_funcs),ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs),ICPU (INTEL_FAM6_SKYLAKE_L , core_funcs), ICPU(INTEL_FAM6_BROADWELL_X, core_funcs),
tools/power/x86/turbostat/turbostat.c +9 -9
@@ -3209,9 +3209,9 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)break ;case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_L :/* SKL */ case INTEL_FAM6_CANNONLAKE_L :/* CNL */
@@ -3405,9 +3405,9 @@ int has_config_tdp(unsigned int family, unsigned int model)case INTEL_FAM6_IVYBRIDGE :/* IVB */ case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_L :/* SKL */ case INTEL_FAM6_CANNONLAKE_L :/* CNL */
@@ -3841,9 +3841,9 @@ void rapl_probe_intel(unsigned int family, unsigned int model)case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_HASWELL :/* HSW */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_GFX |RAPL_PKG_POWER_INFO ;if (rapl_joules) {BIC_PRESENT (BIC_Pkg_J);
@@ -4032,7 +4032,7 @@ void perf_limit_reasons_probe(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_HASWELL :/* HSW */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ do_gfx_perf_limit_reasons =1 ;case INTEL_FAM6_HASWELL_X :/* HSX */ do_core_perf_limit_reasons =1 ;
@@ -4251,9 +4251,9 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_IVYBRIDGE_X :/* IVB Xeon */ case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSW */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_L :/* SKL */ case INTEL_FAM6_CANNONLAKE_L :/* CNL */
Peter Zijlstra
maintainerPATCH 4/5 x86/intel: Aggregate microserver naming
In reply to Peter ZijlstraCurrently big microservers have _XEON_D while small microservers have _X, Make it uniformly: _D.
for i in git grep -l "INTEL_FAM6_.*_\(X\|XEON_D\)" do
sed -i -e 's/\(INTEL_FAM6_ATOM_.*\)_X/\1_D/g' \
-e 's/\(INTEL_FAM6_.*\)_XEON_D/\1_D/g' ${i}done
--- arch/x86/events/intel/core.c | 20 ++++++++++---------- arch/x86/events/intel/cstate.c | 12 ++++++------ arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 4 ++-- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/msr.c | 6 +++--- arch/x86/include/asm/intel-family.h | 10 +++++----- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/cpu/intel.c | 4 ++-- arch/x86/kernel/cpu/mce/intel.c | 2 +- arch/x86/kernel/tsc.c | 2 +- drivers/cpufreq/intel_pstate.c | 6 +++--- drivers/edac/i10nm_base.c | 4 ++-- drivers/edac/pnd2_edac.c | 2 +- tools/power/x86/turbostat/turbostat.c | 22 +++++++++++----------- 15 files changed, 51 insertions(+), 51 deletions(-)
arch/x86/events/intel/core.c +10 -10
@@ -3971,10 +3971,10 @@ static const struct x86_cpu_desc isolatiINTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL ,4 ,0x00000023 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_G ,1 ,0x00000014 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,2 ,0x00000010 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,3 ,0x07000009 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,4 ,0x0f000009 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,5 ,0x0e000002 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,2 ,0x00000010 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,3 ,0x07000009 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,4 ,0x0f000009 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,5 ,0x0e000002 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_X ,2 ,0x0b000014 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ), INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 4, 0x00000000),
@@ -4146,7 +4146,7 @@ static const struct x86_cpu_desc counterINTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT ,2 ,0x0000000e ),INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT ,9 ,0x0000002e ),INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT ,10 ,0x00000008 ), -INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT_X ,1 ,0x00000028 ), +INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT_D ,1 ,0x00000028 ),INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT_PLUS ,1 ,0x00000028 ), INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_PLUS, 8, 0x00000006), {}
@@ -4643,7 +4643,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_ATOM_SILVERMONT : -case INTEL_FAM6_ATOM_SILVERMONT_X : +case INTEL_FAM6_ATOM_SILVERMONT_D :case INTEL_FAM6_ATOM_SILVERMONT_MID :case INTEL_FAM6_ATOM_AIRMONT :case INTEL_FAM6_ATOM_AIRMONT_MID :
@@ -4665,7 +4665,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_ATOM_GOLDMONT : -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :x86_add_quirk (intel_counter_freezing_quirk);memcpy (hw_cache_event_ids, glm_hw_cache_event_ids,sizeof (hw_cache_event_ids));
@@ -4721,7 +4721,7 @@ __init int intel_pmu_init(void) name ="goldmont_plus" ;break ; -case INTEL_FAM6_ATOM_TREMONT_X : +case INTEL_FAM6_ATOM_TREMONT_D : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, glp_hw_cache_event_ids,sizeof (hw_cache_event_ids));
@@ -4891,7 +4891,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :x86_add_quirk (intel_pebs_isolation_quirk);
@@ -5002,7 +5002,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_ICELAKE_X : -case INTEL_FAM6_ICELAKE_XEON_D : +case INTEL_FAM6_ICELAKE_D : pmem = true;/* fall through */ case INTEL_FAM6_ICELAKE_L :
arch/x86/events/intel/cstate.c +6 -6
@@ -600,13 +600,13 @@ static const struct x86_cpu_id intel_cstX86_CSTATES_MODEL (INTEL_FAM6_HASWELL_L , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT_X , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT_D , slm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_XEON_D , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_G , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_D , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_G , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_L , snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE, snb_cstates),
@@ -621,7 +621,7 @@ static const struct x86_cpu_id intel_cstX86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNM , knl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_X , glm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_D , glm_cstates), X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
arch/x86/events/intel/pt.c +1 -1
@@ -205,7 +205,7 @@ static int __init pt_pmu_hw_init(void)/* model-specific quirks */ switch (boot_cpu_data.x86_model) {case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :/* not setting BRANCH_EN will #GP, erratum BDM106 */
arch/x86/events/intel/rapl.c +2 -2
@@ -727,7 +727,7 @@ static const struct x86_cpu_id rapl_modeX86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_G , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , model_hsx), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L, model_skl),
@@ -737,7 +737,7 @@ static const struct x86_cpu_id rapl_modeX86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_D , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , model_skl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl),
arch/x86/events/intel/uncore.c +2 -2
@@ -1462,7 +1462,7 @@ static const struct x86_cpu_id intel_uncX86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , ivbep_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_X , hswep_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , bdx_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , bdx_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_D , bdx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE, skl_uncore_init),
@@ -1473,7 +1473,7 @@ static const struct x86_cpu_id intel_uncX86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), - X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init), + X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_D, snr_uncore_init), {}, };
arch/x86/events/msr.c +3 -3
@@ -65,16 +65,16 @@ static bool test_intel(int idx, void *dacase INTEL_FAM6_HASWELL_G :case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_ATOM_SILVERMONT : -case INTEL_FAM6_ATOM_SILVERMONT_X : +case INTEL_FAM6_ATOM_SILVERMONT_D :case INTEL_FAM6_ATOM_AIRMONT :case INTEL_FAM6_ATOM_GOLDMONT : -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :case INTEL_FAM6_ATOM_GOLDMONT_PLUS :
arch/x86/include/asm/intel-family.h +5 -5
@@ -57,7 +57,7 @@#define INTEL_FAM6_BROADWELL 0x3D#define INTEL_FAM6_BROADWELL_G 0x47#define INTEL_FAM6_BROADWELL_X 0x4F -#define INTEL_FAM6_BROADWELL_XEON_D 0x56 +#define INTEL_FAM6_BROADWELL_D 0x56#define INTEL_FAM6_SKYLAKE_L 0x4E#define INTEL_FAM6_SKYLAKE 0x5E
@@ -68,7 +68,7 @@#define INTEL_FAM6_CANNONLAKE_L 0x66#define INTEL_FAM6_ICELAKE_X 0x6A -#define INTEL_FAM6_ICELAKE_XEON_D 0x6C +#define INTEL_FAM6_ICELAKE_D 0x6C#define INTEL_FAM6_ICELAKE 0x7D#define INTEL_FAM6_ICELAKE_L 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D
@@ -83,17 +83,17 @@#define INTEL_FAM6_ATOM_SALTWELL_TABLET 0x35/* Cloverview */ #define INTEL_FAM6_ATOM_SILVERMONT 0x37/* Bay Trail, Valleyview */ -#define INTEL_FAM6_ATOM_SILVERMONT_X 0x4D/* Avaton, Rangely */ +#define INTEL_FAM6_ATOM_SILVERMONT_D 0x4D/* Avaton, Rangely */ #define INTEL_FAM6_ATOM_SILVERMONT_MID 0x4A/* Merriefield */ #define INTEL_FAM6_ATOM_AIRMONT 0x4C/* Cherry Trail, Braswell */ #define INTEL_FAM6_ATOM_AIRMONT_MID 0x5A/* Moorefield */ #define INTEL_FAM6_ATOM_GOLDMONT 0x5C/* Apollo Lake */ -#define INTEL_FAM6_ATOM_GOLDMONT_X 0x5F/* Denverton */ +#define INTEL_FAM6_ATOM_GOLDMONT_D 0x5F/* Denverton */ #define INTEL_FAM6_ATOM_GOLDMONT_PLUS 0x7A/* Gemini Lake */ -#define INTEL_FAM6_ATOM_TREMONT_X 0x86/* Jacobsville */ +#define INTEL_FAM6_ATOM_TREMONT_D 0x86/* Jacobsville */ /* Xeon Phi */
arch/x86/kernel/apic/apic.c +1 -1
@@ -590,7 +590,7 @@ static u32 skx_deadline_rev(void)static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_HASWELL_X , hsx_deadline_rev),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_X ,0x0b000020 ), -DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_XEON_D , bdx_deadline_rev), +DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_D , bdx_deadline_rev),DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_SKYLAKE_X , skx_deadline_rev),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ),
arch/x86/kernel/cpu/intel.c +2 -2
@@ -151,8 +151,8 @@ static const struct sku_microcode spectr { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, { INTEL_FAM6_BROADWELL, 0x04, 0x28 }, { INTEL_FAM6_BROADWELL_G, 0x01, 0x1b }, - { INTEL_FAM6_BROADWELL_XEON_D, 0x02, 0x14 }, - { INTEL_FAM6_BROADWELL_XEON_D, 0x03, 0x07000011 }, + { INTEL_FAM6_BROADWELL_D, 0x02, 0x14 }, + { INTEL_FAM6_BROADWELL_D, 0x03, 0x07000011 }, { INTEL_FAM6_BROADWELL_X, 0x01, 0x0b000025 }, { INTEL_FAM6_HASWELL_L, 0x01, 0x21 }, { INTEL_FAM6_HASWELL_G, 0x01, 0x18 },
arch/x86/kernel/cpu/mce/intel.c +1 -1
@@ -479,7 +479,7 @@ static void intel_ppin_init(struct cpuinswitch (c->x86_model) {case INTEL_FAM6_IVYBRIDGE_X :case INTEL_FAM6_HASWELL_X : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_SKYLAKE_X :case INTEL_FAM6_XEON_PHI_KNL :
arch/x86/kernel/tsc.c +1 -1
@@ -638,7 +638,7 @@ unsigned long native_calibrate_tsc(void)* clock. */ if (crystal_khz ==0 && - boot_cpu_data.x86_model ==INTEL_FAM6_ATOM_GOLDMONT_X ) + boot_cpu_data.x86_model ==INTEL_FAM6_ATOM_GOLDMONT_D ) crystal_khz =25000 ;/*
drivers/cpufreq/intel_pstate.c +3 -3
@@ -1882,7 +1882,7 @@ static const struct x86_cpu_id intel_pstICPU (INTEL_FAM6_SKYLAKE_L , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs),ICPU (INTEL_FAM6_SKYLAKE , core_funcs), -ICPU (INTEL_FAM6_BROADWELL_XEON_D , core_funcs), +ICPU (INTEL_FAM6_BROADWELL_D , core_funcs),ICPU (INTEL_FAM6_XEON_PHI_KNL , knl_funcs),ICPU (INTEL_FAM6_XEON_PHI_KNM , knl_funcs), ICPU(INTEL_FAM6_ATOM_GOLDMONT, core_funcs),
@@ -1893,7 +1893,7 @@ static const struct x86_cpu_id intel_pstMODULE_DEVICE_TABLE (x86cpu, intel_pstate_cpu_ids);static const struct x86_cpu_id intel_pstate_cpu_oob_ids[]__initconst = { -ICPU (INTEL_FAM6_BROADWELL_XEON_D , core_funcs), +ICPU (INTEL_FAM6_BROADWELL_D , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs),ICPU (INTEL_FAM6_SKYLAKE_X , core_funcs), {}
@@ -2624,7 +2624,7 @@ static inline void intel_pstate_request_static const struct x86_cpu_id hwp_support_ids[]__initconst = {ICPU_HWP (INTEL_FAM6_BROADWELL_X ,INTEL_PSTATE_HWP_BROADWELL ), -ICPU_HWP (INTEL_FAM6_BROADWELL_XEON_D ,INTEL_PSTATE_HWP_BROADWELL ), +ICPU_HWP (INTEL_FAM6_BROADWELL_D ,INTEL_PSTATE_HWP_BROADWELL ),ICPU_HWP (X86_MODEL_ANY ,0 ), {} };
drivers/edac/i10nm_base.c +2 -2
@@ -123,9 +123,9 @@ static int i10nm_get_all_munits(void) }static const struct x86_cpu_id i10nm_cpuids[] = { - {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_TREMONT_X ,0 ,0 }, + {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_TREMONT_D ,0 ,0 }, {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ICELAKE_X ,0 ,0 }, - {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ICELAKE_XEON_D ,0 ,0 }, + {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ICELAKE_D ,0 ,0 }, { } };MODULE_DEVICE_TABLE (x86cpu, i10nm_cpuids);
drivers/edac/pnd2_edac.c +1 -1
@@ -1533,7 +1533,7 @@ static struct dunit_ops dnv_ops = {static const struct x86_cpu_id pnd2_cpuids[] = { {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_GOLDMONT ,0 , (kernel_ulong_t)&apl_ops }, - {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_GOLDMONT_X ,0 , (kernel_ulong_t)&dnv_ops }, + {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_GOLDMONT_D ,0 , (kernel_ulong_t)&dnv_ops }, { } };MODULE_DEVICE_TABLE (x86cpu, pnd2_cpuids);
tools/power/x86/turbostat/turbostat.c +11 -11
@@ -2150,7 +2150,7 @@ int has_turbo_ratio_group_limits(int famswitch (model) {case INTEL_FAM6_ATOM_GOLDMONT :case INTEL_FAM6_SKYLAKE_X : -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :return 1 ; }return 0 ;
@@ -3224,7 +3224,7 @@ int probe_nhm_msrs(unsigned int family,break ;case INTEL_FAM6_ATOM_SILVERMONT :/* BYT */ no_MSR_MISC_PWR_MGMT =1 ; -case INTEL_FAM6_ATOM_SILVERMONT_X :/* AVN */ +case INTEL_FAM6_ATOM_SILVERMONT_D :/* AVN */ pkg_cstate_limits = slv_pkg_cstate_limits;break ;case INTEL_FAM6_ATOM_AIRMONT :/* AMT */
@@ -3236,7 +3236,7 @@ int probe_nhm_msrs(unsigned int family,break ;case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS : -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ pkg_cstate_limits = glm_pkg_cstate_limits;break ;default :
@@ -3279,7 +3279,7 @@ int is_dnv(unsigned int family, unsignedreturn 0 ;switch (model) { -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :return 1 ; }return 0 ;
@@ -3792,7 +3792,7 @@ double get_tdp_intel(unsigned int model)switch (model) {case INTEL_FAM6_ATOM_SILVERMONT : -case INTEL_FAM6_ATOM_SILVERMONT_X : +case INTEL_FAM6_ATOM_SILVERMONT_D :return 30.0 ;default :return 135.0 ;
@@ -3911,7 +3911,7 @@ void rapl_probe_intel(unsigned int famil }break ;case INTEL_FAM6_ATOM_SILVERMONT :/* BYT */ -case INTEL_FAM6_ATOM_SILVERMONT_X :/* AVN */ +case INTEL_FAM6_ATOM_SILVERMONT_D :/* AVN */ do_rapl =RAPL_PKG |RAPL_CORES ;if (rapl_joules) {BIC_PRESENT (BIC_Pkg_J);
@@ -3921,7 +3921,7 @@ void rapl_probe_intel(unsigned int familBIC_PRESENT (BIC_CorWatt); }break ; -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ do_rapl =RAPL_PKG |RAPL_DRAM |RAPL_DRAM_POWER_INFO |RAPL_DRAM_PERF_STATUS |RAPL_PKG_PERF_STATUS |RAPL_PKG_POWER_INFO |RAPL_CORES_ENERGY_STATUS ;BIC_PRESENT (BIC_PKG__ );BIC_PRESENT (BIC_RAM__ );
@@ -4260,7 +4260,7 @@ int has_snb_msrs(unsigned int family, uncase INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS : -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ return 1 ; }return 0 ;
@@ -4322,7 +4322,7 @@ int is_slm(unsigned int family, unsignedreturn 0 ;switch (model) {case INTEL_FAM6_ATOM_SILVERMONT :/* BYT */ -case INTEL_FAM6_ATOM_SILVERMONT_X :/* AVN */ +case INTEL_FAM6_ATOM_SILVERMONT_D :/* AVN */ return 1 ; }return 0 ;
@@ -4572,7 +4572,7 @@ unsigned int intel_model_duplicates(unsireturn INTEL_FAM6_HASWELL ;case INTEL_FAM6_BROADWELL_X : -case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ +case INTEL_FAM6_BROADWELL_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ;case INTEL_FAM6_SKYLAKE_L :
@@ -4734,7 +4734,7 @@ void process_cpuid()case INTEL_FAM6_SKYLAKE_L :/* SKL */ crystal_hz =24000000 ;/* 24.0 MHz */ break ; -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ crystal_hz =25000000 ;/* 25.0 MHz */ break ;case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */
Re: [PATCH 4/5] x86/intel: Aggregate microserver naming
Quoted 24 lines · Peter Zijlstra
Currently big microservers have
_XEON_Dwhile small microservers have _X, Make it uniformly: _D.for i in
git grep -l "INTEL_FAM6_.*_\(X\|XEON_D\)"dosed -i -e 's/\(INTEL_FAM6_ATOM_.*\)_X/\1_D/g' \ -e 's/\(INTEL_FAM6_.*\)_XEON_D/\1_D/g' ${i}done
Signed-off-by Peter Zijlstra (Intel) <[email protected]>Cc Dave Hansen <[email protected]>Cc Borislav Petkov <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Tony Luck <[email protected]>--- arch/x86/events/intel/core.c | 20 ++++++++++---------- arch/x86/events/intel/cstate.c | 12 ++++++------ arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 4 ++-- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/msr.c | 6 +++--- arch/x86/include/asm/intel-family.h | 10 +++++----- arch/x86/kernel/apic/apic.c | 2 +-
Quoted 8 lines
arch/x86/kernel/cpu/intel.c | 4 ++-- arch/x86/kernel/cpu/mce/intel.c | 2 +- arch/x86/kernel/tsc.c | 2 +- drivers/cpufreq/intel_pstate.c | 6 +++--- drivers/edac/i10nm_base.c | 4 ++-- drivers/edac/pnd2_edac.c | 2 +- tools/power/x86/turbostat/turbostat.c | 22 +++++++++++----------- 15 files changed, 51 insertions(+), 51 deletions(-)
I've added the additional renames below, accounting for recent changes in cpu/common.c.
Thanks,
Ingo
--- arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/common.c +2 -2
@@ -1050,7 +1050,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {VULNWL_INTEL (ATOM_BONNELL_MID ,NO_SPECULATION ),VULNWL_INTEL (ATOM_SILVERMONT ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ), -VULNWL_INTEL (ATOM_SILVERMONT_X ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ), +VULNWL_INTEL (ATOM_SILVERMONT_D ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ),VULNWL_INTEL (ATOM_SILVERMONT_MID ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ),VULNWL_INTEL (ATOM_AIRMONT ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ), VULNWL_INTEL(XEON_PHI_KNL, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
@@ -1061,7 +1061,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {VULNWL_INTEL (ATOM_AIRMONT_MID ,NO_L1TF |MSBDS_ONLY |NO_SWAPGS ),VULNWL_INTEL (ATOM_GOLDMONT ,NO_MDS |NO_L1TF |NO_SWAPGS ), -VULNWL_INTEL (ATOM_GOLDMONT_X ,NO_MDS |NO_L1TF |NO_SWAPGS ), +VULNWL_INTEL (ATOM_GOLDMONT_D ,NO_MDS |NO_L1TF |NO_SWAPGS ), VULNWL_INTEL(ATOM_GOLDMONT_PLUS, NO_MDS | NO_L1TF | NO_SWAPGS),/*
Peter Zijlstra
maintainerRe: [PATCH 4/5] x86/intel: Aggregate microserver naming
Quoted 36 lines · Ingo Molnar
Quoted 24 lines · Peter Zijlstra
Currently big microservers have
_XEON_Dwhile small microservers have _X, Make it uniformly: _D.for i in
git grep -l "INTEL_FAM6_.*_\(X\|XEON_D\)"dosed -i -e 's/\(INTEL_FAM6_ATOM_.*\)_X/\1_D/g' \ -e 's/\(INTEL_FAM6_.*\)_XEON_D/\1_D/g' ${i}done
Signed-off-by Peter Zijlstra (Intel) <[email protected]>Cc Dave Hansen <[email protected]>Cc Borislav Petkov <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Tony Luck <[email protected]>--- arch/x86/events/intel/core.c | 20 ++++++++++---------- arch/x86/events/intel/cstate.c | 12 ++++++------ arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 4 ++-- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/msr.c | 6 +++--- arch/x86/include/asm/intel-family.h | 10 +++++----- arch/x86/kernel/apic/apic.c | 2 +-Quoted 8 lines
arch/x86/kernel/cpu/intel.c | 4 ++-- arch/x86/kernel/cpu/mce/intel.c | 2 +- arch/x86/kernel/tsc.c | 2 +- drivers/cpufreq/intel_pstate.c | 6 +++--- drivers/edac/i10nm_base.c | 4 ++-- drivers/edac/pnd2_edac.c | 2 +- tools/power/x86/turbostat/turbostat.c | 22 +++++++++++----------- 15 files changed, 51 insertions(+), 51 deletions(-)
Quoted 2 lines
I've added the additional renames below, accounting for recent changes in
cpu/common.c.
Thanks, I've respun these patches (they didn't actually build), and I'll make sure to include that one when I repost.
Re: [PATCH 4/5] x86/intel: Aggregate microserver naming
Quoted 37 lines · Peter Zijlstra
Quoted 36 lines · Ingo Molnar
Quoted 32 lines · Peter Zijlstra
Currently big microservers have
_XEON_Dwhile small microservers have _X, Make it uniformly: _D.for i in
git grep -l "INTEL_FAM6_.*_\(X\|XEON_D\)"dosed -i -e 's/\(INTEL_FAM6_ATOM_.*\)_X/\1_D/g' \ -e 's/\(INTEL_FAM6_.*\)_XEON_D/\1_D/g' ${i}done
Signed-off-by Peter Zijlstra (Intel) <[email protected]>Cc Dave Hansen <[email protected]>Cc Borislav Petkov <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Tony Luck <[email protected]>--- arch/x86/events/intel/core.c | 20 ++++++++++---------- arch/x86/events/intel/cstate.c | 12 ++++++------ arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 4 ++-- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/msr.c | 6 +++--- arch/x86/include/asm/intel-family.h | 10 +++++----- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/cpu/intel.c | 4 ++-- arch/x86/kernel/cpu/mce/intel.c | 2 +- arch/x86/kernel/tsc.c | 2 +- drivers/cpufreq/intel_pstate.c | 6 +++--- drivers/edac/i10nm_base.c | 4 ++-- drivers/edac/pnd2_edac.c | 2 +- tools/power/x86/turbostat/turbostat.c | 22 +++++++++++----------- 15 files changed, 51 insertions(+), 51 deletions(-)
Quoted 5 lines
Quoted 2 lines
I've added the additional renames below, accounting for recent changes in
cpu/common.c.Thanks, I've respun these patches (they didn't actually build), and I'll make sure to include that one when I repost.
I've already respun them myself and committed them to tip:x86/cpu :-)
Thanks,
Ingo
Re: [PATCH 4/5] x86/intel: Aggregate microserver naming
In reply to Ingo MolnarQuoted 2 lines · Ingo Molnar
arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Plus this too:
--- drivers/edac/sb_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/sb_edac.c +1 -1
@@ -3429,7 +3429,7 @@ static const struct x86_cpu_id sbridge_cpuids[] = {INTEL_CPU_FAM6 (IVYBRIDGE_X , pci_dev_descr_ibridge_table),INTEL_CPU_FAM6 (HASWELL_X , pci_dev_descr_haswell_table),INTEL_CPU_FAM6 (BROADWELL_X , pci_dev_descr_broadwell_table), -INTEL_CPU_FAM6 (BROADWELL_XEON_D , pci_dev_descr_broadwell_table), +INTEL_CPU_FAM6 (BROADWELL_D , pci_dev_descr_broadwell_table),INTEL_CPU_FAM6 (XEON_PHI_KNL , pci_dev_descr_knl_table), INTEL_CPU_FAM6(XEON_PHI_KNM, pci_dev_descr_knl_table), { }
Re: [PATCH 4/5] x86/intel: Aggregate microserver naming
In reply to Ingo MolnarPlus re-running your scripts gave the final missing piece:
--- tools/power/x86/turbostat/turbostat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/power/x86/turbostat/turbostat.c +2 -2
@@ -3405,9 +3405,9 @@ int has_config_tdp(unsigned int family, unsigned int model)case INTEL_FAM6_IVYBRIDGE :/* IVB */ case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ -case INTEL_FAM6_HASWELL_GT3E :/* HSW */ +case INTEL_FAM6_HASWELL_G :/* HSW */ case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ +case INTEL_FAM6_BROADWELL_G :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_L :/* SKL */ case INTEL_FAM6_CANNONLAKE_L :/* CNL */
[tip: x86/cpu] x86/cpu/intel: Aggregate microserver naming
In reply to Peter ZijlstraThe following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: d5e4ef22e053072ce03951a5beed0ce5244bee81 Gitweb: https://git.kernel.org/tip/d5e4ef22e053072ce03951a5beed0ce5244bee81 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 22 Aug 2019 12:23:10 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 26 Aug 2019 11:49:04 +02:00
x86/cpu/intel: Aggregate microserver naming
Currently big microservers have _XEON_D while small microservers have _X, Make it uniformly: _D.
for i in git grep -l "INTEL_FAM6_.*_\(X\|XEON_D\)" do
sed -i -e 's/\(INTEL_FAM6_ATOM_.*\)_X/\1_D/g' \
-e 's/\(INTEL_FAM6_.*\)_XEON_D/\1_D/g' ${i}done
--- arch/x86/events/intel/core.c | 20 ++++++++++---------- arch/x86/events/intel/cstate.c | 12 ++++++------ arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 4 ++-- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/msr.c | 6 +++--- arch/x86/include/asm/intel-family.h | 10 +++++----- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/cpu/common.c | 4 ++-- arch/x86/kernel/cpu/intel.c | 4 ++-- arch/x86/kernel/cpu/mce/intel.c | 2 +- arch/x86/kernel/tsc.c | 2 +- drivers/cpufreq/intel_pstate.c | 6 +++--- drivers/edac/i10nm_base.c | 4 ++-- drivers/edac/pnd2_edac.c | 2 +- drivers/edac/sb_edac.c | 2 +- tools/power/x86/turbostat/turbostat.c | 22 +++++++++++----------- 17 files changed, 54 insertions(+), 54 deletions(-)
arch/x86/events/intel/core.c +10 -10
@@ -3971,10 +3971,10 @@ static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL ,4 ,0x00000023 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_G ,1 ,0x00000014 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,2 ,0x00000010 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,3 ,0x07000009 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,4 ,0x0f000009 ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,5 ,0x0e000002 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,2 ,0x00000010 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,3 ,0x07000009 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,4 ,0x0f000009 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_D ,5 ,0x0e000002 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_X ,2 ,0x0b000014 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ), INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 4, 0x00000000),
@@ -4146,7 +4146,7 @@ static const struct x86_cpu_desc counter_freezing_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT ,2 ,0x0000000e ),INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT ,9 ,0x0000002e ),INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT ,10 ,0x00000008 ), -INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT_X ,1 ,0x00000028 ), +INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT_D ,1 ,0x00000028 ),INTEL_CPU_DESC (INTEL_FAM6_ATOM_GOLDMONT_PLUS ,1 ,0x00000028 ), INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_PLUS, 8, 0x00000006), {}
@@ -4643,7 +4643,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_ATOM_SILVERMONT : -case INTEL_FAM6_ATOM_SILVERMONT_X : +case INTEL_FAM6_ATOM_SILVERMONT_D :case INTEL_FAM6_ATOM_SILVERMONT_MID :case INTEL_FAM6_ATOM_AIRMONT :case INTEL_FAM6_ATOM_AIRMONT_MID :
@@ -4665,7 +4665,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_ATOM_GOLDMONT : -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :x86_add_quirk (intel_counter_freezing_quirk);memcpy (hw_cache_event_ids, glm_hw_cache_event_ids,sizeof (hw_cache_event_ids));
@@ -4721,7 +4721,7 @@ __init int intel_pmu_init(void) name ="goldmont_plus" ;break ; -case INTEL_FAM6_ATOM_TREMONT_X : +case INTEL_FAM6_ATOM_TREMONT_D : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, glp_hw_cache_event_ids,sizeof (hw_cache_event_ids));
@@ -4891,7 +4891,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :x86_add_quirk (intel_pebs_isolation_quirk);
@@ -5002,7 +5002,7 @@ __init int intel_pmu_init(void)break ;case INTEL_FAM6_ICELAKE_X : -case INTEL_FAM6_ICELAKE_XEON_D : +case INTEL_FAM6_ICELAKE_D : pmem = true;/* fall through */ case INTEL_FAM6_ICELAKE_L :
arch/x86/events/intel/cstate.c +6 -6
@@ -600,13 +600,13 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_L , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT_X , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT_D , slm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_XEON_D , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_G , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_D , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_G , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_L , snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE, snb_cstates),
@@ -621,7 +621,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNM , knl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_X , glm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_D , glm_cstates), X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
arch/x86/events/intel/pt.c +1 -1
@@ -205,7 +205,7 @@ static int __init pt_pmu_hw_init(void)/* model-specific quirks */ switch (boot_cpu_data.x86_model) {case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :/* not setting BRANCH_EN will #GP, erratum BDM106 */
arch/x86/events/intel/rapl.c +2 -2
@@ -727,7 +727,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_G , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , model_hsx), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L, model_skl),
@@ -737,7 +737,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_L , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_D , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , model_skl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl),
arch/x86/events/intel/uncore.c +2 -2
@@ -1462,7 +1462,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , ivbep_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_X , hswep_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , bdx_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , bdx_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_D , bdx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE, skl_uncore_init),
@@ -1473,7 +1473,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_L , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), - X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init), + X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_D, snr_uncore_init), {}, };
arch/x86/events/msr.c +3 -3
@@ -65,16 +65,16 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_HASWELL_G :case INTEL_FAM6_BROADWELL : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_ATOM_SILVERMONT : -case INTEL_FAM6_ATOM_SILVERMONT_X : +case INTEL_FAM6_ATOM_SILVERMONT_D :case INTEL_FAM6_ATOM_AIRMONT :case INTEL_FAM6_ATOM_GOLDMONT : -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :case INTEL_FAM6_ATOM_GOLDMONT_PLUS :
arch/x86/include/asm/intel-family.h +5 -5
@@ -57,7 +57,7 @@#define INTEL_FAM6_BROADWELL 0x3D#define INTEL_FAM6_BROADWELL_G 0x47#define INTEL_FAM6_BROADWELL_X 0x4F -#define INTEL_FAM6_BROADWELL_XEON_D 0x56 +#define INTEL_FAM6_BROADWELL_D 0x56#define INTEL_FAM6_SKYLAKE_L 0x4E#define INTEL_FAM6_SKYLAKE 0x5E
@@ -68,7 +68,7 @@#define INTEL_FAM6_CANNONLAKE_L 0x66#define INTEL_FAM6_ICELAKE_X 0x6A -#define INTEL_FAM6_ICELAKE_XEON_D 0x6C +#define INTEL_FAM6_ICELAKE_D 0x6C#define INTEL_FAM6_ICELAKE 0x7D#define INTEL_FAM6_ICELAKE_L 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D
@@ -83,17 +83,17 @@#define INTEL_FAM6_ATOM_SALTWELL_TABLET 0x35/* Cloverview */ #define INTEL_FAM6_ATOM_SILVERMONT 0x37/* Bay Trail, Valleyview */ -#define INTEL_FAM6_ATOM_SILVERMONT_X 0x4D/* Avaton, Rangely */ +#define INTEL_FAM6_ATOM_SILVERMONT_D 0x4D/* Avaton, Rangely */ #define INTEL_FAM6_ATOM_SILVERMONT_MID 0x4A/* Merriefield */ #define INTEL_FAM6_ATOM_AIRMONT 0x4C/* Cherry Trail, Braswell */ #define INTEL_FAM6_ATOM_AIRMONT_MID 0x5A/* Moorefield */ #define INTEL_FAM6_ATOM_GOLDMONT 0x5C/* Apollo Lake */ -#define INTEL_FAM6_ATOM_GOLDMONT_X 0x5F/* Denverton */ +#define INTEL_FAM6_ATOM_GOLDMONT_D 0x5F/* Denverton */ #define INTEL_FAM6_ATOM_GOLDMONT_PLUS 0x7A/* Gemini Lake */ -#define INTEL_FAM6_ATOM_TREMONT_X 0x86/* Jacobsville */ +#define INTEL_FAM6_ATOM_TREMONT_D 0x86/* Jacobsville */ /* Xeon Phi */
arch/x86/kernel/apic/apic.c +1 -1
@@ -590,7 +590,7 @@ static u32 skx_deadline_rev(void)static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_HASWELL_X , hsx_deadline_rev),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_X ,0x0b000020 ), -DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_XEON_D , bdx_deadline_rev), +DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_D , bdx_deadline_rev),DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_SKYLAKE_X , skx_deadline_rev),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ),
arch/x86/kernel/cpu/common.c +2 -2
@@ -1050,7 +1050,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {VULNWL_INTEL (ATOM_BONNELL_MID ,NO_SPECULATION ),VULNWL_INTEL (ATOM_SILVERMONT ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ), -VULNWL_INTEL (ATOM_SILVERMONT_X ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ), +VULNWL_INTEL (ATOM_SILVERMONT_D ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ),VULNWL_INTEL (ATOM_SILVERMONT_MID ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ),VULNWL_INTEL (ATOM_AIRMONT ,NO_SSB |NO_L1TF |MSBDS_ONLY |NO_SWAPGS ), VULNWL_INTEL(XEON_PHI_KNL, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
@@ -1061,7 +1061,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {VULNWL_INTEL (ATOM_AIRMONT_MID ,NO_L1TF |MSBDS_ONLY |NO_SWAPGS ),VULNWL_INTEL (ATOM_GOLDMONT ,NO_MDS |NO_L1TF |NO_SWAPGS ), -VULNWL_INTEL (ATOM_GOLDMONT_X ,NO_MDS |NO_L1TF |NO_SWAPGS ), +VULNWL_INTEL (ATOM_GOLDMONT_D ,NO_MDS |NO_L1TF |NO_SWAPGS ), VULNWL_INTEL(ATOM_GOLDMONT_PLUS, NO_MDS | NO_L1TF | NO_SWAPGS),/*
arch/x86/kernel/cpu/intel.c +2 -2
@@ -151,8 +151,8 @@ static const struct sku_microcode spectre_bad_microcodes[] = { { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, { INTEL_FAM6_BROADWELL, 0x04, 0x28 }, { INTEL_FAM6_BROADWELL_G, 0x01, 0x1b }, - { INTEL_FAM6_BROADWELL_XEON_D, 0x02, 0x14 }, - { INTEL_FAM6_BROADWELL_XEON_D, 0x03, 0x07000011 }, + { INTEL_FAM6_BROADWELL_D, 0x02, 0x14 }, + { INTEL_FAM6_BROADWELL_D, 0x03, 0x07000011 }, { INTEL_FAM6_BROADWELL_X, 0x01, 0x0b000025 }, { INTEL_FAM6_HASWELL_L, 0x01, 0x21 }, { INTEL_FAM6_HASWELL_G, 0x01, 0x18 },
arch/x86/kernel/cpu/mce/intel.c +1 -1
@@ -479,7 +479,7 @@ static void intel_ppin_init(struct cpuinfo_x86 *c)switch (c->x86_model) {case INTEL_FAM6_IVYBRIDGE_X :case INTEL_FAM6_HASWELL_X : -case INTEL_FAM6_BROADWELL_XEON_D : +case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_SKYLAKE_X :case INTEL_FAM6_XEON_PHI_KNL :
arch/x86/kernel/tsc.c +1 -1
@@ -638,7 +638,7 @@ unsigned long native_calibrate_tsc(void)* clock. */ if (crystal_khz ==0 && - boot_cpu_data.x86_model ==INTEL_FAM6_ATOM_GOLDMONT_X ) + boot_cpu_data.x86_model ==INTEL_FAM6_ATOM_GOLDMONT_D ) crystal_khz =25000 ;/*
drivers/cpufreq/intel_pstate.c +3 -3
@@ -1882,7 +1882,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {ICPU (INTEL_FAM6_SKYLAKE_L , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs),ICPU (INTEL_FAM6_SKYLAKE , core_funcs), -ICPU (INTEL_FAM6_BROADWELL_XEON_D , core_funcs), +ICPU (INTEL_FAM6_BROADWELL_D , core_funcs),ICPU (INTEL_FAM6_XEON_PHI_KNL , knl_funcs),ICPU (INTEL_FAM6_XEON_PHI_KNM , knl_funcs), ICPU(INTEL_FAM6_ATOM_GOLDMONT, core_funcs),
@@ -1893,7 +1893,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {MODULE_DEVICE_TABLE (x86cpu, intel_pstate_cpu_ids);static const struct x86_cpu_id intel_pstate_cpu_oob_ids[]__initconst = { -ICPU (INTEL_FAM6_BROADWELL_XEON_D , core_funcs), +ICPU (INTEL_FAM6_BROADWELL_D , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs),ICPU (INTEL_FAM6_SKYLAKE_X , core_funcs), {}
@@ -2624,7 +2624,7 @@ static inline void intel_pstate_request_control_from_smm(void) {}static const struct x86_cpu_id hwp_support_ids[]__initconst = {ICPU_HWP (INTEL_FAM6_BROADWELL_X ,INTEL_PSTATE_HWP_BROADWELL ), -ICPU_HWP (INTEL_FAM6_BROADWELL_XEON_D ,INTEL_PSTATE_HWP_BROADWELL ), +ICPU_HWP (INTEL_FAM6_BROADWELL_D ,INTEL_PSTATE_HWP_BROADWELL ),ICPU_HWP (X86_MODEL_ANY ,0 ), {} };
drivers/edac/i10nm_base.c +2 -2
@@ -123,9 +123,9 @@ static int i10nm_get_all_munits(void) }static const struct x86_cpu_id i10nm_cpuids[] = { - {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_TREMONT_X ,0 ,0 }, + {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_TREMONT_D ,0 ,0 }, {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ICELAKE_X ,0 ,0 }, - {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ICELAKE_XEON_D ,0 ,0 }, + {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ICELAKE_D ,0 ,0 }, { } };MODULE_DEVICE_TABLE (x86cpu, i10nm_cpuids);
drivers/edac/pnd2_edac.c +1 -1
@@ -1533,7 +1533,7 @@ static struct dunit_ops dnv_ops = {static const struct x86_cpu_id pnd2_cpuids[] = { {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_GOLDMONT ,0 , (kernel_ulong_t)&apl_ops }, - {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_GOLDMONT_X ,0 , (kernel_ulong_t)&dnv_ops }, + {X86_VENDOR_INTEL ,6 ,INTEL_FAM6_ATOM_GOLDMONT_D ,0 , (kernel_ulong_t)&dnv_ops }, { } };MODULE_DEVICE_TABLE (x86cpu, pnd2_cpuids);
drivers/edac/sb_edac.c +1 -1
@@ -3429,7 +3429,7 @@ static const struct x86_cpu_id sbridge_cpuids[] = {INTEL_CPU_FAM6 (IVYBRIDGE_X , pci_dev_descr_ibridge_table),INTEL_CPU_FAM6 (HASWELL_X , pci_dev_descr_haswell_table),INTEL_CPU_FAM6 (BROADWELL_X , pci_dev_descr_broadwell_table), -INTEL_CPU_FAM6 (BROADWELL_XEON_D , pci_dev_descr_broadwell_table), +INTEL_CPU_FAM6 (BROADWELL_D , pci_dev_descr_broadwell_table),INTEL_CPU_FAM6 (XEON_PHI_KNL , pci_dev_descr_knl_table), INTEL_CPU_FAM6(XEON_PHI_KNM, pci_dev_descr_knl_table), { }
tools/power/x86/turbostat/turbostat.c +11 -11
@@ -2150,7 +2150,7 @@ int has_turbo_ratio_group_limits(int family, int model)switch (model) {case INTEL_FAM6_ATOM_GOLDMONT :case INTEL_FAM6_SKYLAKE_X : -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :return 1 ; }return 0 ;
@@ -3224,7 +3224,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)break ;case INTEL_FAM6_ATOM_SILVERMONT :/* BYT */ no_MSR_MISC_PWR_MGMT =1 ; -case INTEL_FAM6_ATOM_SILVERMONT_X :/* AVN */ +case INTEL_FAM6_ATOM_SILVERMONT_D :/* AVN */ pkg_cstate_limits = slv_pkg_cstate_limits;break ;case INTEL_FAM6_ATOM_AIRMONT :/* AMT */
@@ -3236,7 +3236,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)break ;case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS : -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ pkg_cstate_limits = glm_pkg_cstate_limits;break ;default :
@@ -3279,7 +3279,7 @@ int is_dnv(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_ATOM_GOLDMONT_X : +case INTEL_FAM6_ATOM_GOLDMONT_D :return 1 ; }return 0 ;
@@ -3792,7 +3792,7 @@ double get_tdp_intel(unsigned int model)switch (model) {case INTEL_FAM6_ATOM_SILVERMONT : -case INTEL_FAM6_ATOM_SILVERMONT_X : +case INTEL_FAM6_ATOM_SILVERMONT_D :return 30.0 ;default :return 135.0 ;
@@ -3911,7 +3911,7 @@ void rapl_probe_intel(unsigned int family, unsigned int model) }break ;case INTEL_FAM6_ATOM_SILVERMONT :/* BYT */ -case INTEL_FAM6_ATOM_SILVERMONT_X :/* AVN */ +case INTEL_FAM6_ATOM_SILVERMONT_D :/* AVN */ do_rapl =RAPL_PKG |RAPL_CORES ;if (rapl_joules) {BIC_PRESENT (BIC_Pkg_J);
@@ -3921,7 +3921,7 @@ void rapl_probe_intel(unsigned int family, unsigned int model)BIC_PRESENT (BIC_CorWatt); }break ; -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ do_rapl =RAPL_PKG |RAPL_DRAM |RAPL_DRAM_POWER_INFO |RAPL_DRAM_PERF_STATUS |RAPL_PKG_PERF_STATUS |RAPL_PKG_POWER_INFO |RAPL_CORES_ENERGY_STATUS ;BIC_PRESENT (BIC_PKG__ );BIC_PRESENT (BIC_RAM__ );
@@ -4260,7 +4260,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS : -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ return 1 ; }return 0 ;
@@ -4322,7 +4322,7 @@ int is_slm(unsigned int family, unsigned int model)return 0 ;switch (model) {case INTEL_FAM6_ATOM_SILVERMONT :/* BYT */ -case INTEL_FAM6_ATOM_SILVERMONT_X :/* AVN */ +case INTEL_FAM6_ATOM_SILVERMONT_D :/* AVN */ return 1 ; }return 0 ;
@@ -4572,7 +4572,7 @@ unsigned int intel_model_duplicates(unsigned int model)return INTEL_FAM6_HASWELL ;case INTEL_FAM6_BROADWELL_X : -case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ +case INTEL_FAM6_BROADWELL_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ;case INTEL_FAM6_SKYLAKE_L :
@@ -4734,7 +4734,7 @@ void process_cpuid()case INTEL_FAM6_SKYLAKE_L :/* SKL */ crystal_hz =24000000 ;/* 24.0 MHz */ break ; -case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */ +case INTEL_FAM6_ATOM_GOLDMONT_D :/* DNV */ crystal_hz =25000000 ;/* 25.0 MHz */ break ;case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */
Peter Zijlstra
maintainerPATCH 5/5 x86/intel: Add common OPTDIFFs
In reply to Peter Zijlstra--- arch/x86/include/asm/intel-family.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
arch/x86/include/asm/intel-family.h +15 -6
@@ -5,9 +5,6 @@/* * "Big Core" Processors (Branded as Core, Xeon, etc...) * -* The "_X" parts are generally the EP and EX Xeons, or the -* "Extreme" ones, like Broadwell-E, or Atom microserver. -* * While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number.
@@ -21,9 +18,19 @@* MICROARCH Is the code name for the micro-architecture for this core. * N.B. Not the platform name. * OPTDIFF If needed, a short string to differentiate by market segment. -* Exact strings here will vary over time. _DESKTOP, _MOBILE, and -* _X (short for Xeon server) should be used when they are -* appropriate. +* +* Common OPTDIFFs: +* +* - regular client parts +* _L - regular mobile parts +* _G - parts with extra graphics on +* _X - regular server parts +* _D - micro server parts +* +* Historical OPTDIFFs: +* +* _EP - 2 socket server parts +* _EX - 4+ socket server parts * * The #define line may optionally include a comment including platform names. */
@@ -91,6 +98,8 @@#define INTEL_FAM6_ATOM_GOLDMONT 0x5C/* Apollo Lake */ #define INTEL_FAM6_ATOM_GOLDMONT_D 0x5F/* Denverton */ + +/* Note: the micro-architecture is "Goldmont Plus" */ #define INTEL_FAM6_ATOM_GOLDMONT_PLUS 0x7A/* Gemini Lake */ #define INTEL_FAM6_ATOM_TREMONT_D 0x86/* Jacobsville */
[tip: x86/cpu] x86/cpu/intel: Add common OPTDIFFs
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: b95a1e89f1007dd552d9756c077bedc74183d8ac Gitweb: https://git.kernel.org/tip/b95a1e89f1007dd552d9756c077bedc74183d8ac Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 22 Aug 2019 12:23:11 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 26 Aug 2019 11:49:04 +02:00
x86/cpu/intel: Add common OPTDIFFs
--- arch/x86/include/asm/intel-family.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
arch/x86/include/asm/intel-family.h +15 -6
@@ -5,9 +5,6 @@/* * "Big Core" Processors (Branded as Core, Xeon, etc...) * -* The "_X" parts are generally the EP and EX Xeons, or the -* "Extreme" ones, like Broadwell-E, or Atom microserver. -* * While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number.
@@ -21,9 +18,19 @@* MICROARCH Is the code name for the micro-architecture for this core. * N.B. Not the platform name. * OPTDIFF If needed, a short string to differentiate by market segment. -* Exact strings here will vary over time. _DESKTOP, _MOBILE, and -* _X (short for Xeon server) should be used when they are -* appropriate. +* +* Common OPTDIFFs: +* +* - regular client parts +* _L - regular mobile parts +* _G - parts with extra graphics on +* _X - regular server parts +* _D - micro server parts +* +* Historical OPTDIFFs: +* +* _EP - 2 socket server parts +* _EX - 4+ socket server parts * * The #define line may optionally include a comment including platform names. */
@@ -91,6 +98,8 @@#define INTEL_FAM6_ATOM_GOLDMONT 0x5C/* Apollo Lake */ #define INTEL_FAM6_ATOM_GOLDMONT_D 0x5F/* Denverton */ + +/* Note: the micro-architecture is "Goldmont Plus" */ #define INTEL_FAM6_ATOM_GOLDMONT_PLUS 0x7A/* Gemini Lake */ #define INTEL_FAM6_ATOM_TREMONT_D 0x86/* Jacobsville */
Luck, Tony
maintainerQuoted 1 line · Peter Zijlstra
Lots of variation has crept in; time to collapse the lot again.
Conceptually good. But I applied the series on top of tip/master and got a build error:
CC arch/x86/kernel/cpu/common.oarch/x86/kernel/cpu/common.c:1031:19: error: ‘INTEL_FAM6_ATOM_SILVERMONT_X’ undeclared here (not in a function); did you mean ‘INTEL_FAM6_ATOM_SILVERMONT_D’?
VULNWL(INTEL, 6, INTEL_FAM6_##model, whitelist)
^~~~~~~~~~~
arch/x86/kernel/cpu/common.c:1028:35: note: in definition of macro ‘VULNWL’
{ X86_VENDOR_##_vendor, _family, _model, X86_FEATURE_ANY, _whitelist }
^~~~~~arch/x86/kernel/cpu/common.c:1053:2: note: in expansion of macro ‘VULNWL_INTEL’
VULNWL_INTEL(ATOM_SILVERMONT_X, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
^~~~~~~~~~~~arch/x86/kernel/cpu/common.c:1031:19: error: ‘INTEL_FAM6_ATOM_GOLDMONT_X’ undeclared here (not in a function); did you mean ‘INTEL_FAM6_ATOM_GOLDMONT_D’?
VULNWL(INTEL, 6, INTEL_FAM6_##model, whitelist)
^~~~~~~~~~~
arch/x86/kernel/cpu/common.c:1028:35: note: in definition of macro ‘VULNWL’
{ X86_VENDOR_##_vendor, _family, _model, X86_FEATURE_ANY, _whitelist }
^~~~~~arch/x86/kernel/cpu/common.c:1064:2: note: in expansion of macro ‘VULNWL_INTEL’
VULNWL_INTEL(ATOM_GOLDMONT_X, NO_MDS | NO_L1TF | NO_SWAPGS), ^~~~~~~~~~~~
make[3]: *** [scripts/Makefile.build:281: arch/x86/kernel/cpu/common.o] Error 1
Looks like your scripts didn't anticipate the CPP gymnastics like:
#define VULNWL_INTEL(model, whitelist) \
VULNWL(INTEL, 6, INTEL_FAM6_##model, whitelist)
-Tony
Luck, Tony
maintainerQuoted 4 lines
Looks like your scripts didn't anticipate the CPP gymnastics like:
#define
VULNWL_INTEL(model, whitelist)\
VULNWL(INTEL, 6, INTEL_FAM6_##model, whitelist)
Also INTEL_CPU_FAM6() macro
-Tony
Peter Zijlstra
maintainerQuoted 11 lines · Tony
Quoted 1 line · Peter Zijlstra
Lots of variation has crept in; time to collapse the lot again.
Conceptually good. But I applied the series on top of tip/master and got a build error:
Looks like your scripts didn't anticipate the CPP gymnastics like:
#define
VULNWL_INTEL(model, whitelist)\
VULNWL(INTEL, 6, INTEL_FAM6_##model, whitelist)
Bah.. I'll go fix.