Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934552AbdIYKKu (ORCPT ); Mon, 25 Sep 2017 06:10:50 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52935 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753908AbdIYKKr (ORCPT ); Mon, 25 Sep 2017 06:10:47 -0400 Date: Mon, 25 Sep 2017 03:09:41 -0700 From: tip-bot for Kan Liang Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, Kan.liang@intel.com Reply-To: Kan.liang@intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <20170908213449.6224-3-kan.liang@intel.com> References: <20170908213449.6224-3-kan.liang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] perf/x86/intel/rapl: Add missing CPU IDs Git-Commit-ID: 450a97893559354b927c935f39ee11126f01f520 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1350 Lines: 38 Commit-ID: 450a97893559354b927c935f39ee11126f01f520 Gitweb: http://git.kernel.org/tip/450a97893559354b927c935f39ee11126f01f520 Author: Kan Liang AuthorDate: Fri, 8 Sep 2017 17:34:49 -0400 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner Cc: ak@linux.intel.com Cc: peterz@infradead.org Cc: piotr.luc@intel.com Cc: harry.pan@intel.com Cc: srinivas.pandruvada@linux.intel.com Link: http://lkml.kernel.org/r/20170908213449.6224-3-kan.liang@intel.com --- 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), {}, };