Commit d32bc211 authored by Tony Luck's avatar Tony Luck Committed by Borislav Petkov (AMD)
Browse files

x86/aperfmperf: Switch to new Intel CPU model defines 



New CPU #defines encode vendor and family as well as model.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/all/20240424181505.41654-1-tony.luck%40intel.com
parent 8fb5f44e

arch/x86/kernel/cpu/aperfmperf.c

+8 −9
Original line number Diff line number Diff line
@@ -124,25 +124,24 @@ static bool __init slv_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq) 
	return true;

}



#define X86_MATCH(model)					\

	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6,		\

		INTEL_FAM6_##model, X86_FEATURE_APERFMPERF, NULL)

#define X86_MATCH(vfm)						\

	X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_APERFMPERF, NULL)



static const struct x86_cpu_id has_knl_turbo_ratio_limits[] __initconst = {

	X86_MATCH(XEON_PHI_KNL),

	X86_MATCH(XEON_PHI_KNM),

	X86_MATCH(INTEL_XEON_PHI_KNL),

	X86_MATCH(INTEL_XEON_PHI_KNM),

	{}

};



static const struct x86_cpu_id has_skx_turbo_ratio_limits[] __initconst = {

	X86_MATCH(SKYLAKE_X),

	X86_MATCH(INTEL_SKYLAKE_X),

	{}

};



static const struct x86_cpu_id has_glm_turbo_ratio_limits[] __initconst = {

	X86_MATCH(ATOM_GOLDMONT),

	X86_MATCH(ATOM_GOLDMONT_D),

	X86_MATCH(ATOM_GOLDMONT_PLUS),

	X86_MATCH(INTEL_ATOM_GOLDMONT),

	X86_MATCH(INTEL_ATOM_GOLDMONT_D),

	X86_MATCH(INTEL_ATOM_GOLDMONT_PLUS),

	{}

};