Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / events / intel / cstate.c

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index db498b5d4aae67802beb2811eac36f3dbad624ad..9f2f39003d96eb2a9ae3a9917627536fe2cda4e8 100644 (file)
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -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_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_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),
-       X86_CSTATES_MODEL(INTEL_FAM6_ATOM_AIRMONT,     slm_cstates),
+       X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT,   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_CORE,   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_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_MOBILE,  snb_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, 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_DESKTOP, 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),
 
-       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,   glm_cstates),
+       X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_D, 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_L, snb_cstates),
+       X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE,   snb_cstates),
        { },
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);