[tip: perf/urgent] perf/x86/rapl: Add support for Intel Meteor Lake

From: tip-bot2 for Zhang Rui
Date: Wed Jan 04 2023 - 15:08:55 EST


The following commit has been merged into the perf/urgent branch of tip:

Commit-ID: f52853a668bfeddd79f319d536a506f68cc2b478
Gitweb: https://git.kernel.org/tip/f52853a668bfeddd79f319d536a506f68cc2b478
Author: Zhang Rui <rui.zhang@xxxxxxxxx>
AuthorDate: Wed, 04 Jan 2023 22:58:30 +08:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Wed, 04 Jan 2023 21:00:28 +01:00

perf/x86/rapl: Add support for Intel Meteor Lake

Meteor Lake RAPL support is the same as previous Sky Lake.
Add Meteor Lake 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-1-rui.zhang@xxxxxxxxx
---
arch/x86/events/rapl.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index ae5779e..589c688 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -809,6 +809,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
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);