From: Kan Liang <kan.liang@linux.intel.com>
Date: Thu, 7 May 2020 06:14:18 -0700
Subject: perf/x86/rapl: Add Ice Lake RAPL support
Git-commit: f649fc2eefdef7a67698a3c584222c5c8c5a6785
Patch-mainline: v5.8-rc1
References: jsc#PED-5023 bsc#1211439
X-Info: adjust for context, no 5fb5273a905ca4cba7aae16e61c26127cadbac5c Use new MSR detection interface
Enable RAPL support for Intel Ice Lake X and Ice Lake D.
For RAPL support, it is identical to Sky Lake X.
Reported-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/1588857258-38213-1-git-send-email-kan.liang@linux.intel.com
Signed-off-by: Tony Jones <tonyj@suse.de>
---
arch/x86/events/intel/rapl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index a5dbd25852cb..9e1e141d22d3 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -738,6 +738,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &hsw_rapl_init),
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &skl_rapl_init),
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &skl_rapl_init),
+ X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &hsx_rapl_init),
+ X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &hsx_rapl_init),
{},
};
MODULE_DEVICE_TABLE(x86cpu, rapl_cpu_match);