Commit b11d77fa authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lkml.kernel.org/r/87eetheu88.fsf@nanos.tec.linutronix.de
parent e36cf2f7

drivers/cpufreq/acpi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/cpufreq/amd_freq_sensitivity.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/cpufreq/e_powersaver.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/cpufreq/elanfreq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/cpufreq/intel_pstate.c

+36 −35
Original line number Diff line number Diff line
@@ -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),

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE