x86/tsc_msr: 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>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/all/20240424181518.41927-1-tony.luck%40intel.com

diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
index 6555a857a1e6eade008266329497d9ce48ec651a..deeb028256709a579eaf9a3ce1a020dcbfb40679 100644 (file)
--- a/arch/x86/kernel/tsc_msr.c
+++ b/arch/x86/kernel/tsc_msr.c
@@ -147,13 +147,13 @@ static const struct freq_desc freq_desc_lgm = {
 };
 
 static const struct x86_cpu_id tsc_msr_cpu_ids[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID,   &freq_desc_pnw),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_TABLET,&freq_desc_clv),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,     &freq_desc_byt),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &freq_desc_tng),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,        &freq_desc_cht),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT_MID,    &freq_desc_ann),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT_NP,     &freq_desc_lgm),
+       X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID,  &freq_desc_pnw),
+       X86_MATCH_VFM(INTEL_ATOM_SALTWELL_TABLET, &freq_desc_clv),
+       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT,    &freq_desc_byt),
+       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID,        &freq_desc_tng),
+       X86_MATCH_VFM(INTEL_ATOM_AIRMONT,       &freq_desc_cht),
+       X86_MATCH_VFM(INTEL_ATOM_AIRMONT_MID,   &freq_desc_ann),
+       X86_MATCH_VFM(INTEL_ATOM_AIRMONT_NP,    &freq_desc_lgm),
        {}
 };