| From c376768983df0d10d6ae5368f6ee4474e832751b Mon Sep 17 00:00:00 2001 |
| From: Kan Liang <kan.liang@linux.intel.com> |
| Date: Tue, 2 Apr 2019 12:45:07 -0700 |
| Subject: perf/x86/intel/rapl: Add Icelake support |
| |
| [ Upstream commit b3377c3acb9e54cf86efcfe25f2e792bca599ed4 ] |
| |
| Icelake support the same RAPL counters as Skylake. |
| |
| Signed-off-by: Kan Liang <kan.liang@linux.intel.com> |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Stephane Eranian <eranian@google.com> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Vince Weaver <vincent.weaver@maine.edu> |
| Cc: acme@kernel.org |
| Cc: jolsa@kernel.org |
| Link: https://lkml.kernel.org/r/20190402194509.2832-11-kan.liang@linux.intel.com |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 94dc564146ca8..37ebf6fc5415b 100644 |
| --- a/arch/x86/events/intel/rapl.c |
| +++ b/arch/x86/events/intel/rapl.c |
| @@ -775,6 +775,8 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { |
| X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_X, hsw_rapl_init), |
| |
| X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, hsw_rapl_init), |
| + |
| + X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, skl_rapl_init), |
| {}, |
| }; |
| |
| -- |
| 2.20.1 |
| |