x86/platform/atom: Switch to new Intel CPU model defines

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

Signed-off-by: Tony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20240531203706.233365-4-tony.luck@intel.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c
index 6b9c6deca8ba894c0243e50b21aad573e603f969..44c30ce6360aab20bce9b8f2edc0daed25853d5e 100644 (file)
--- a/arch/x86/platform/atom/punit_atom_debug.c
+++ b/arch/x86/platform/atom/punit_atom_debug.c
@@ -165,14 +165,13 @@ static void punit_s2idle_check_register(struct punit_device *punit_device) {}
 static void punit_s2idle_check_unregister(void) {}
 #endif
 
-#define X86_MATCH(model, data)                                          \
-       X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
-                                          X86_FEATURE_MWAIT, data)
+#define X86_MATCH(vfm, data)                                    \
+       X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_MWAIT, data)
 
 static const struct x86_cpu_id intel_punit_cpu_ids[] = {
-       X86_MATCH(ATOM_SILVERMONT,              &punit_device_byt),
-       X86_MATCH(ATOM_SILVERMONT_MID,          &punit_device_tng),
-       X86_MATCH(ATOM_AIRMONT,                 &punit_device_cht),
+       X86_MATCH(INTEL_ATOM_SILVERMONT,        &punit_device_byt),
+       X86_MATCH(INTEL_ATOM_SILVERMONT_MID,    &punit_device_tng),
+       X86_MATCH(INTEL_ATOM_AIRMONT,           &punit_device_cht),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids);