Unverified Commit 490d573b authored by Tony Luck's avatar Tony Luck Committed by Ilpo Järvinen
Browse files

platform/x86/intel/ifs: 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>
Reviewed-by: default avatarJithu Joseph <jithu.joseph@intel.com>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240611171455.352536-1-tony.luck@intel.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent dd637f5c

drivers/platform/x86/intel/ifs/core.c

+7 −8
Original line number Diff line number Diff line
@@ -11,16 +11,15 @@ 


#include "ifs.h"



#define X86_MATCH(model, array_gen)				\

	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6,	\

		INTEL_FAM6_##model, X86_FEATURE_CORE_CAPABILITIES, array_gen)

#define X86_MATCH(vfm, array_gen)				\

	X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_CORE_CAPABILITIES, array_gen)



static const struct x86_cpu_id ifs_cpu_ids[] __initconst = {

	X86_MATCH(SAPPHIRERAPIDS_X, ARRAY_GEN0),

	X86_MATCH(EMERALDRAPIDS_X, ARRAY_GEN0),

	X86_MATCH(GRANITERAPIDS_X, ARRAY_GEN0),

	X86_MATCH(GRANITERAPIDS_D, ARRAY_GEN0),

	X86_MATCH(ATOM_CRESTMONT_X, ARRAY_GEN1),

	X86_MATCH(INTEL_SAPPHIRERAPIDS_X, ARRAY_GEN0),

	X86_MATCH(INTEL_EMERALDRAPIDS_X, ARRAY_GEN0),

	X86_MATCH(INTEL_GRANITERAPIDS_X, ARRAY_GEN0),

	X86_MATCH(INTEL_GRANITERAPIDS_D, ARRAY_GEN0),

	X86_MATCH(INTEL_ATOM_CRESTMONT_X, ARRAY_GEN1),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids);