[tip:x86/urgent] perf/x86/intel/rapl: Add missing CPU IDs

From: tip-bot for Kan Liang
Date: Mon Sep 25 2017 - 06:10:52 EST


Commit-ID: 450a97893559354b927c935f39ee11126f01f520
Gitweb: http://git.kernel.org/tip/450a97893559354b927c935f39ee11126f01f520
Author: Kan Liang <Kan.liang@xxxxxxxxx>
AuthorDate: Fri, 8 Sep 2017 17:34:49 -0400
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Mon, 25 Sep 2017 09:36:17 +0200

perf/x86/intel/rapl: Add missing CPU IDs

DENVERTON and GEMINI_LAKE support same RAPL counters as Apollo Lake.

Signed-off-by: Kan Liang <Kan.liang@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: ak@xxxxxxxxxxxxxxx
Cc: peterz@xxxxxxxxxxxxx
Cc: piotr.luc@xxxxxxxxx
Cc: harry.pan@xxxxxxxxx
Cc: srinivas.pandruvada@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/20170908213449.6224-3-kan.liang@xxxxxxxxx

---
arch/x86/events/intel/rapl.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 8e2457c..005908e 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -775,6 +775,9 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_rapl_init),

X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, hsw_rapl_init),
+ X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_DENVERTON, hsw_rapl_init),
+
+ X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GEMINI_LAKE, hsw_rapl_init),
{},
};