cpufreq: Convert to new X86 CPU match macros

The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

Get rid the of most local macro wrappers for consistency. The ones which
make sense for readability are renamed to X86_MATCH*.

In the centrino driver this also removes the two extra duplicates of family
6 model 13 which have no value at all.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lkml.kernel.org/r/87eetheu88.fsf@nanos.tec.linutronix.de

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 7ff6595255870a27ac762f33270ec5ba3ec03ac8..289e8ce3fd13d254d7f16a6353868196d404b326 100644 (file)
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -992,8 +992,8 @@ late_initcall(acpi_cpufreq_init);
 module_exit(acpi_cpufreq_exit);
 
 static const struct x86_cpu_id acpi_cpufreq_ids[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_ACPI),
-       X86_FEATURE_MATCH(X86_FEATURE_HW_PSTATE),
+       X86_MATCH_FEATURE(X86_FEATURE_ACPI, NULL),
+       X86_MATCH_FEATURE(X86_FEATURE_HW_PSTATE, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);

diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c
index 5107cbe2d64dd2aeabb06d8b0e1d63e2c9dccb1a..f7c4206d4c90b1d50821929b045daa4649e3338b 100644 (file)
--- a/drivers/cpufreq/amd_freq_sensitivity.c
+++ b/drivers/cpufreq/amd_freq_sensitivity.c
@@ -145,7 +145,7 @@ static void __exit amd_freq_sensitivity_exit(void)
 module_exit(amd_freq_sensitivity_exit);
 
 static const struct x86_cpu_id amd_freq_sensitivity_ids[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_PROC_FEEDBACK),
+       X86_MATCH_FEATURE(X86_FEATURE_PROC_FEEDBACK, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, amd_freq_sensitivity_ids);

diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c
index 45c18c6b8081c2a3c11ad291a7095f47f02b4c1b..776a58bab0ffd5f67266fe8ef703b6a867d0ef57 100644 (file)
--- a/drivers/cpufreq/e_powersaver.c
+++ b/drivers/cpufreq/e_powersaver.c
@@ -385,7 +385,7 @@ static struct cpufreq_driver eps_driver = {
 /* This driver will work only on Centaur C7 processors with
  * Enhanced SpeedStep/PowerSaver registers */
 static const struct x86_cpu_id eps_cpu_id[] = {
-       { X86_VENDOR_CENTAUR, 6, X86_MODEL_ANY, X86_FEATURE_EST },
+       X86_MATCH_VENDOR_FAM_FEATURE(CENTAUR, 6, X86_FEATURE_EST, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, eps_cpu_id);

diff --git a/drivers/cpufreq/elanfreq.c b/drivers/cpufreq/elanfreq.c
index 2242541f7ae3d6d4dc3da021e592d12c8ee1f27a..4ce5eb35dc46bf4ab8a5e67610295790b4f737a7 100644 (file)
--- a/drivers/cpufreq/elanfreq.c
+++ b/drivers/cpufreq/elanfreq.c
@@ -198,7 +198,7 @@ static struct cpufreq_driver elanfreq_driver = {
 };
 
 static const struct x86_cpu_id elan_id[] = {
-       { X86_VENDOR_AMD, 4, 10, },
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 4, 10, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, elan_id);

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index c81e1ff2906973f9729225d1cd0319638a72b4c8..780c387f05c0465e33e7a37db741bf102d0bae6b 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1908,51 +1908,51 @@ static const struct pstate_funcs knl_funcs = {
        .get_val = core_get_val,
 };
 
-#define ICPU(model, policy) \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF,\
-                       (unsigned long)&policy }
+#define X86_MATCH(model, policy)                                        \
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
+                                          X86_FEATURE_APERFMPERF, &policy)
 
 static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
-       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_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_L,              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),
-       ICPU(INTEL_FAM6_SKYLAKE,                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),
-       ICPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS,     core_funcs),
-       ICPU(INTEL_FAM6_SKYLAKE_X,              core_funcs),
+       X86_MATCH(SANDYBRIDGE,          core_funcs),
+       X86_MATCH(SANDYBRIDGE_X,        core_funcs),
+       X86_MATCH(ATOM_SILVERMONT,      silvermont_funcs),
+       X86_MATCH(IVYBRIDGE,            core_funcs),
+       X86_MATCH(HASWELL,              core_funcs),
+       X86_MATCH(BROADWELL,            core_funcs),
+       X86_MATCH(IVYBRIDGE_X,          core_funcs),
+       X86_MATCH(HASWELL_X,            core_funcs),
+       X86_MATCH(HASWELL_L,            core_funcs),
+       X86_MATCH(HASWELL_G,            core_funcs),
+       X86_MATCH(BROADWELL_G,          core_funcs),
+       X86_MATCH(ATOM_AIRMONT,         airmont_funcs),
+       X86_MATCH(SKYLAKE_L,            core_funcs),
+       X86_MATCH(BROADWELL_X,          core_funcs),
+       X86_MATCH(SKYLAKE,              core_funcs),
+       X86_MATCH(BROADWELL_D,          core_funcs),
+       X86_MATCH(XEON_PHI_KNL,         knl_funcs),
+       X86_MATCH(XEON_PHI_KNM,         knl_funcs),
+       X86_MATCH(ATOM_GOLDMONT,        core_funcs),
+       X86_MATCH(ATOM_GOLDMONT_PLUS,   core_funcs),
+       X86_MATCH(SKYLAKE_X,            core_funcs),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
 
 static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {
-       ICPU(INTEL_FAM6_BROADWELL_D, core_funcs),
-       ICPU(INTEL_FAM6_BROADWELL_X, core_funcs),
-       ICPU(INTEL_FAM6_SKYLAKE_X, core_funcs),
+       X86_MATCH(BROADWELL_D,          core_funcs),
+       X86_MATCH(BROADWELL_X,          core_funcs),
+       X86_MATCH(SKYLAKE_X,            core_funcs),
        {}
 };
 
 static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = {
-       ICPU(INTEL_FAM6_KABYLAKE, core_funcs),
+       X86_MATCH(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, core_funcs),
+       X86_MATCH(SKYLAKE_X,            core_funcs),
+       X86_MATCH(SKYLAKE,              core_funcs),
        {}
 };
 
@@ -2725,13 +2725,14 @@ static inline void intel_pstate_request_control_from_smm(void) {}
 
 #define INTEL_PSTATE_HWP_BROADWELL     0x01
 
-#define ICPU_HWP(model, hwp_mode) \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_HWP, hwp_mode }
+#define X86_MATCH_HWP(model, hwp_mode)                                 \
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
+                                          X86_FEATURE_APERFMPERF, hwp_mode)
 
 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_D, INTEL_PSTATE_HWP_BROADWELL),
-       ICPU_HWP(X86_MODEL_ANY, 0),
+       X86_MATCH_HWP(BROADWELL_X,      INTEL_PSTATE_HWP_BROADWELL),
+       X86_MATCH_HWP(BROADWELL_D,      INTEL_PSTATE_HWP_BROADWELL),
+       X86_MATCH_HWP(ANY,              0),
        {}
 };
 

diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index 92d92e67ae0a14d0d4ec7af3b3fc475b52783cfd..123fb006810d5da028c926b3a68da2b324095500 100644 (file)
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -910,7 +910,7 @@ static struct cpufreq_driver longhaul_driver = {
 };
 
 static const struct x86_cpu_id longhaul_id[] = {
-       { X86_VENDOR_CENTAUR, 6 },
+       X86_MATCH_VENDOR_FAM(CENTAUR, 6, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, longhaul_id);

diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c
index 0b08be8bff76e040fd5080ca7a8779095ed92b42..1caaec7c280baba537f72a5e92a60fc4b0b219d5 100644 (file)
--- a/drivers/cpufreq/longrun.c
+++ b/drivers/cpufreq/longrun.c
@@ -281,8 +281,7 @@ static struct cpufreq_driver longrun_driver = {
 };
 
 static const struct x86_cpu_id longrun_ids[] = {
-       { X86_VENDOR_TRANSMETA, X86_FAMILY_ANY, X86_MODEL_ANY,
-         X86_FEATURE_LONGRUN },
+       X86_MATCH_VENDOR_FEATURE(TRANSMETA, X86_FEATURE_LONGRUN, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, longrun_ids);

diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
index efc0b46efada96190f92ed8684fd15d4205951c8..bb61677c11c7142c1d5b41d8a1855846fb1b007d 100644 (file)
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
@@ -231,7 +231,7 @@ static struct cpufreq_driver p4clockmod_driver = {
 };
 
 static const struct x86_cpu_id cpufreq_p4_id[] = {
-       { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_ACC },
+       X86_MATCH_VENDOR_FEATURE(INTEL, X86_FEATURE_ACC, NULL),
        {}
 };
 

diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index 0196f8129597fe3e13fe9b349389f235f726649f..41eefef95d873f6e5f8b5a183db2b6d1e5373c8a 100644 (file)
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -258,8 +258,8 @@ static struct cpufreq_driver powernow_k6_driver = {
 };
 
 static const struct x86_cpu_id powernow_k6_ids[] = {
-       { X86_VENDOR_AMD, 5, 12 },
-       { X86_VENDOR_AMD, 5, 13 },
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 5, 12, NULL),
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 5, 13, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, powernow_k6_ids);

diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 5e5171d3eece0722fc2c8608bc59a6efed24af70..5d515fc348364c36f24b15ef02630730480e0fca 100644 (file)
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -109,7 +109,7 @@ static int check_fsb(unsigned int fsbspeed)
 }
 
 static const struct x86_cpu_id powernow_k7_cpuids[] = {
-       { X86_VENDOR_AMD, 6, },
+       X86_MATCH_VENDOR_FAM(AMD, 6, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, powernow_k7_cpuids);

diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 2db2f1739e09267f4b1ee7daaf8185c9a669c08e..3984959eed1d514bcd73febe29cb95d20c8c001d 100644 (file)
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -452,7 +452,7 @@ static int core_voltage_post_transition(struct powernow_k8_data *data,
 
 static const struct x86_cpu_id powernow_k8_ids[] = {
        /* IO based frequency switching */
-       { X86_VENDOR_AMD, 0xf },
+       X86_MATCH_VENDOR_FAM(AMD, 0xf, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, powernow_k8_ids);

diff --git a/drivers/cpufreq/sc520_freq.c b/drivers/cpufreq/sc520_freq.c
index c6f647babaadbcc65e7c6e4a287532fc0a36bf67..73a208559fe2832640581fa724e947f6e6d6f338 100644 (file)
--- a/drivers/cpufreq/sc520_freq.c
+++ b/drivers/cpufreq/sc520_freq.c
@@ -95,7 +95,7 @@ static struct cpufreq_driver sc520_freq_driver = {
 };
 
 static const struct x86_cpu_id sc520_ids[] = {
-       { X86_VENDOR_AMD, 4, 9 },
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 4, 9, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, sc520_ids);

diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index b49f494e0285beb65ddcac71bfd482b5929b8057..75b10ecdb60f28b15786a0e677553ec147785b1e 100644 (file)
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -520,18 +520,12 @@ static struct cpufreq_driver centrino_driver = {
  * or ASCII model IDs.
  */
 static const struct x86_cpu_id centrino_ids[] = {
-       { X86_VENDOR_INTEL, 6, 9, X86_FEATURE_EST },
-       { X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
-       { X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
-       { X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
-       { X86_VENDOR_INTEL, 15, 3, X86_FEATURE_EST },
-       { X86_VENDOR_INTEL, 15, 4, X86_FEATURE_EST },
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL,  6,  9, X86_FEATURE_EST, NULL),
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL,  6, 13, X86_FEATURE_EST, NULL),
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15,  3, X86_FEATURE_EST, NULL),
+       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15,  4, X86_FEATURE_EST, NULL),
        {}
 };
-#if 0
-/* Autoload or not? Do not for now. */
-MODULE_DEVICE_TABLE(x86cpu, centrino_ids);
-#endif
 
 /**
  * centrino_init - initializes the Enhanced SpeedStep CPUFreq driver

diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c
index 547fd7af5bf51993e17ec75c67cee45d4ae06107..f2076d72bf39966b7ceff580f663ede1fda4f70a 100644 (file)
--- a/drivers/cpufreq/speedstep-ich.c
+++ b/drivers/cpufreq/speedstep-ich.c
@@ -319,15 +319,11 @@ static struct cpufreq_driver speedstep_driver = {
 };
 
 static const struct x86_cpu_id ss_smi_ids[] = {
-       { X86_VENDOR_INTEL, 6, 0xb, },
-       { X86_VENDOR_INTEL, 6, 0x8, },
-       { X86_VENDOR_INTEL, 15, 2 },
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL,  6, 0x8, 0),
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL,  6, 0xb, 0),
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 15, 0x2, 0),
        {}
 };
-#if 0
-/* Autoload or not? Do not for now. */
-MODULE_DEVICE_TABLE(x86cpu, ss_smi_ids);
-#endif
 
 /**
  * speedstep_init - initializes the SpeedStep CPUFreq driver

diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index eeb31bc21cc955b5bc2ea406e0cd8cda424f862e..0ce9d4b6dfcc0f3a9fb2bb7033576a4a81a2a82e 100644 (file)
--- a/drivers/cpufreq/speedstep-smi.c
+++ b/drivers/cpufreq/speedstep-smi.c
@@ -299,15 +299,11 @@ static struct cpufreq_driver speedstep_driver = {
 };
 
 static const struct x86_cpu_id ss_smi_ids[] = {
-       { X86_VENDOR_INTEL, 6, 0xb, },
-       { X86_VENDOR_INTEL, 6, 0x8, },
-       { X86_VENDOR_INTEL, 15, 2 },
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL,  6, 0x8, 0),
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL,  6, 0xb, 0),
+       X86_MATCH_VENDOR_FAM_MODEL(INTEL, 15, 0x2, 0),
        {}
 };
-#if 0
-/* Not auto loaded currently */
-MODULE_DEVICE_TABLE(x86cpu, ss_smi_ids);
-#endif
 
 /**
  * speedstep_init - initializes the SpeedStep CPUFreq driver