x86/cpu/intel_epb: 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/20240424181510.41733-1-tony.luck%40intel.com

diff --git a/arch/x86/kernel/cpu/intel_epb.c b/arch/x86/kernel/cpu/intel_epb.c
index f18d35fe27a928690ed1d6c6d96a2468002c5690..30b1d63b97f3a1b3463cd16f1dc90286f6d24cc4 100644 (file)
--- a/arch/x86/kernel/cpu/intel_epb.c
+++ b/arch/x86/kernel/cpu/intel_epb.c
@@ -204,12 +204,12 @@ static int intel_epb_offline(unsigned int cpu)
 }
 
 static const struct x86_cpu_id intel_epb_normal[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,
-                                  ENERGY_PERF_BIAS_NORMAL_POWERSAVE),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT,
-                                  ENERGY_PERF_BIAS_NORMAL_POWERSAVE),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,
-                                  ENERGY_PERF_BIAS_NORMAL_POWERSAVE),
+       X86_MATCH_VFM(INTEL_ALDERLAKE_L,
+                     ENERGY_PERF_BIAS_NORMAL_POWERSAVE),
+       X86_MATCH_VFM(INTEL_ATOM_GRACEMONT,
+                     ENERGY_PERF_BIAS_NORMAL_POWERSAVE),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_P,
+                     ENERGY_PERF_BIAS_NORMAL_POWERSAVE),
        {}
 };