Commit 042c1f23 authored Jan 04, 2023 by Zhang Rui Committed by Yunying Sun Apr 27, 2023

perf/x86/rapl: Add support for Intel Emerald Rapids

mainline inclusion
from mainline-v6.2-rc3
commit 57512b57
category: feature
feature: EMR RAPL support
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6YGL6
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=57512b57dcfaf63c52d8ad2fb35321328cde31b0



Intel-SIG: commit 57512b57 perf/x86/rapl: Add support for Intel
Emerald Rapids
Backported for adding EMR RAPL support to OLK-5.10.

-------------------------------------

Emerald Rapids RAPL support is the same as previous Sapphire Rapids.
Add Emerald Rapids model for RAPL.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230104145831.25498-2-rui.zhang@intel.com


Signed-off-by: Yunying Sun <yunying.sun@intel.com>

parent 4a1bd6e4

arch/x86/events/rapl.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -801,6 +801,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
		X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &model_skl),
		X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &model_skl),
		X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &model_spr),
		X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &model_spr),
		X86_MATCH_VENDOR_FAM(AMD, 0x17, &model_amd_fam17h),
		X86_MATCH_VENDOR_FAM(HYGON, 0x18, &model_amd_fam17h),
		X86_MATCH_VENDOR_FAM(AMD, 0x19, &model_amd_fam17h),