[tip:,perf/urgent] perf/x86/rapl: Treat Tigerlake like Icelake

Message ID 167276884075.4906.6298448659461708987.tip-bot2@tip-bot2
State New
Headers
Series [tip:,perf/urgent] perf/x86/rapl: Treat Tigerlake like Icelake |

Commit Message

tip-bot2 for Thomas Gleixner Jan. 3, 2023, 6 p.m. UTC
  The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     c07311b5509f6035f1dd828db3e90ff4859cf3b9
Gitweb:        https://git.kernel.org/tip/c07311b5509f6035f1dd828db3e90ff4859cf3b9
Author:        Chris Wilson <chris@chris-wilson.co.uk>
AuthorDate:    Wed, 28 Dec 2022 06:34:54 -05:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 03 Jan 2023 18:55:35 +01:00

perf/x86/rapl: Treat Tigerlake like Icelake

Since Tigerlake seems to have inherited its cstates and other RAPL power
caps from Icelake, assume it also follows Icelake for its RAPL events.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Link: https://lore.kernel.org/r/20221228113454.1199118-1-rodrigo.vivi@intel.com
---
 arch/x86/events/rapl.c | 2 ++
 1 file changed, 2 insertions(+)
  

Patch

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index a829492..ae5779e 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -800,6 +800,8 @@  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),