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

cpufreq/intel_pstate: Fix wrong macro conversion 



The feature flag hwp_support_ids are supposed to match on is
X86_FEATURE_HWP, not X86_FEATURE_APERFMPERF. Fix it.

 [ bp: Write commit message. ]

Fixes: b11d77fa ("cpufreq: Convert to new X86 CPU match macros")
Reported-by: default avatarkernel test robot <rong.a.chen@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200324060124.GC11705@shao2-debian
parent 1826d56b

drivers/cpufreq/intel_pstate.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2727,7 +2727,7 @@ static inline void intel_pstate_request_control_from_smm(void) {} 




#define X86_MATCH_HWP(model, hwp_mode)					\

#define X86_MATCH_HWP(model, hwp_mode)					\

	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \

	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \

					   X86_FEATURE_APERFMPERF, hwp_mode)

					   X86_FEATURE_HWP, hwp_mode)





static const struct x86_cpu_id hwp_support_ids[] __initconst = {

static const struct x86_cpu_id hwp_support_ids[] __initconst = {

	X86_MATCH_HWP(BROADWELL_X,	INTEL_PSTATE_HWP_BROADWELL),

	X86_MATCH_HWP(BROADWELL_X,	INTEL_PSTATE_HWP_BROADWELL),

CRA Git | Maintained and supported by SUSTech CRA and CCSE