Merge tag 'timers-nohz-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / arch / x86 / events / intel / cstate.c

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 4814c96..e4aa20c 100644 (file)
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -594,63 +594,60 @@ static const struct cstate_model glm_cstates __initconst = {
 };
 
 
-#define X86_CSTATES_MODEL(model, states)                               \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long) &(states) }
-
 static const struct x86_cpu_id intel_cstates_match[] __initconst = {
-       X86_CSTATES_MODEL(INTEL_FAM6_NEHALEM,    nhm_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_NEHALEM_EP, nhm_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_NEHALEM_EX, nhm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(NEHALEM,             &nhm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP,          &nhm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX,          &nhm_cstates),
 
-       X86_CSTATES_MODEL(INTEL_FAM6_WESTMERE,    nhm_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_WESTMERE_EP, nhm_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_WESTMERE_EX, nhm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(WESTMERE,            &nhm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP,         &nhm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX,         &nhm_cstates),
 
-       X86_CSTATES_MODEL(INTEL_FAM6_SANDYBRIDGE,   snb_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_SANDYBRIDGE_X, snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE,         &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X,       &snb_cstates),
 
-       X86_CSTATES_MODEL(INTEL_FAM6_IVYBRIDGE,   snb_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_IVYBRIDGE_X, snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE,           &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(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_G, snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL,             &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X,           &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G,           &snb_cstates),
 
-       X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_L, hswult_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L,           &hswult_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_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,     &slm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D,   &slm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,        &slm_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_MATCH_INTEL_FAM6_MODEL(BROADWELL,           &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,         &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G,         &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_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_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,           &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,             &snb_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,           &snb_cstates),
 
-       X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_L, hswult_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE,   hswult_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_COMETLAKE_L, hswult_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_COMETLAKE, hswult_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,          &hswult_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,            &hswult_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,         &hswult_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,           &hswult_cstates),
 
-       X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_L, cnl_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(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_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,        &knl_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,        &knl_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_ATOM_TREMONT_D, glm_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_ATOM_TREMONT, glm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT,       &glm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D,     &glm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS,  &glm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,      &glm_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,        &glm_cstates),
 
-       X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_L, icl_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE,   icl_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_TIGERLAKE_L, icl_cstates),
-       X86_CSTATES_MODEL(INTEL_FAM6_TIGERLAKE, icl_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,           &icl_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE,             &icl_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,         &icl_cstates),
+       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,           &icl_cstates),
        { },
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);