[tip: perf/urgent] perf/x86/rapl: Add support for Intel Emerald Rapids
From: tip-bot2 for Zhang Rui
Date: Wed Jan 04 2023 - 15:08:52 EST
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 57512b57dcfaf63c52d8ad2fb35321328cde31b0
Gitweb: https://git.kernel.org/tip/57512b57dcfaf63c52d8ad2fb35321328cde31b0
Author: Zhang Rui <rui.zhang@xxxxxxxxx>
AuthorDate: Wed, 04 Jan 2023 22:58:31 +08:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Wed, 04 Jan 2023 21:00:29 +01:00
perf/x86/rapl: Add support for Intel Emerald Rapids
Emerald Rapids RAPL support is the same as previous Sapphire Rapids.
Add Emerald Rapids model for RAPL.
Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230104145831.25498-2-rui.zhang@xxxxxxxxx
---
arch/x86/events/rapl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 589c688..52e6e7e 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -806,6 +806,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
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),