Commit 4b32e5e8 authored by Tony Luck's avatar Tony Luck Committed by Rafael J. Wysocki
Browse files

powercap: intel_rapl_msr: Switch to new Intel CPU model defines 



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

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c3f38fa6

drivers/powercap/intel_rapl_msr.c

+8 −8
Original line number Diff line number Diff line
@@ -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),

	{}

};