platform/x86/intel/ifs: Switch to new Intel CPU model defines
Subsystems (2)
Tony Luck
maintainerPATCH RESEND v6 4/49 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 Tony Luck <[email protected]>
Reviewed-by Jithu Joseph <[email protected]>
Reviewed-by Kuppuswamy Sathyanarayanan <[email protected]>
Acked-by Hans de Goede <[email protected]>
---
Ilpo: I missed this one from the set of new CPU family patches that I sent to you earlier. Can you apply it please.
drivers/platform/x86/intel/ifs/core.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/platform/x86/intel/ifs/core.c +7 -8
@@ -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);
Signature · 1 line
2.45.0
Ilpo Järvinen
maintainerQuoted 3 lines · Tony Luck
New CPU #defines encode vendor and family as well as model.
Thank you for your contribution, it has been applied to my local review-ilpo branch. Note it will show up in the public platform-drivers-x86/review-ilpo branch only once I've pushed my local branch there, which might take a while.
The list of commits applied:
[04/49] platform/x86/intel/ifs: Switch to new Intel CPU model defines
commit: 490d573b5a8579178beb648a69a2cbab91495a7b
--
i.