Messages in this thread Patch in this message | | | Date | Fri, 26 Apr 2024 18:12:11 -0000 | From | "tip-bot2 for Tony Luck" <> | Subject | [tip: x86/cpu] x86/cpu/intel_epb: Switch to new Intel CPU model defines |
| |
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 77d0930acedf5b81c0a88d385b90747cc1fc4ca0 Gitweb: https://git.kernel.org/tip/77d0930acedf5b81c0a88d385b90747cc1fc4ca0 Author: Tony Luck <tony.luck@intel.com> AuthorDate: Wed, 24 Apr 2024 11:15:09 -07:00 Committer: Dave Hansen <dave.hansen@linux.intel.com> CommitterDate: Fri, 26 Apr 2024 08:49:24 -07:00
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> Link: https://lore.kernel.org/all/20240424181510.41733-1-tony.luck%40intel.com --- arch/x86/kernel/cpu/intel_epb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel_epb.c b/arch/x86/kernel/cpu/intel_epb.c index f18d35f..30b1d63 100644 --- 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), {} };
| |