Commit d7a0853d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2023-01-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fix from Ingo Molnar:
 "Intel RAPL updates for new model IDs"

* tag 'perf-urgent-2023-01-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/rapl: Add support for Intel Emerald Rapids
  perf/x86/rapl: Add support for Intel Meteor Lake
  perf/x86/rapl: Treat Tigerlake like Icelake
parents 90bc52c5 57512b57

arch/x86/events/rapl.c

+5 −0
Original line number Diff line number Diff line
@@ -800,13 +800,18 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = { 
	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		&model_hsx),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&model_spr),

	X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X,	&model_spr),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,	&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&model_skl),

	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&model_skl),

	{},

};

MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);