| From | "Rafael J. Wysocki" <> | Date | Wed, 17 Apr 2024 10:22:17 +0200 | Subject | Re: [PATCH v3 67/74] x86/cpu/vfm: Update drivers/powercap/intel_rapl_msr.c |
| |
On Tue, Apr 16, 2024 at 11:22 PM Tony Luck <tony.luck@intel.com> wrote: > > New CPU #defines encode vendor and family as well as model. > > Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> --- > drivers/powercap/intel_rapl_msr.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/powercap/intel_rapl_msr.c b/drivers/powercap/intel_rapl_msr.c > index 35cb152fa9aa..733a36f67fbc 100644 > --- a/drivers/powercap/intel_rapl_msr.c > +++ b/drivers/powercap/intel_rapl_msr.c > @@ -139,14 +139,14 @@ static int rapl_msr_write_raw(int cpu, struct reg_action *ra) > > /* List of verified CPUs. */ > static const struct x86_cpu_id pl4_support_ids[] = { > - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, NULL), > - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, NULL), > + X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL), > + X86_MATCH_VFM(INTEL_ALDERLAKE, NULL), > + X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL), > + X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, NULL), > + X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL), > + X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL), > + X86_MATCH_VFM(INTEL_METEORLAKE, NULL), > + X86_MATCH_VFM(INTEL_METEORLAKE_L, NULL), > {} > }; > > -- > 2.44.0 >
|