Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934191AbdIYKKE (ORCPT ); Mon, 25 Sep 2017 06:10:04 -0400 Received: from terminus.zytor.com ([65.50.211.136]:39715 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753144AbdIYKKD (ORCPT ); Mon, 25 Sep 2017 06:10:03 -0400 Date: Mon, 25 Sep 2017 03:08:55 -0700 From: tip-bot for Kan Liang Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, Kan.liang@intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, hpa@zytor.com, Kan.liang@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <20170908213449.6224-1-kan.liang@intel.com> References: <20170908213449.6224-1-kan.liang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] perf/x86/intel/cstate: Add missing CPU IDs Git-Commit-ID: b09c146f8f63c0e03adba74df76bf9c2be466fec 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: 1876 Lines: 49 Commit-ID: b09c146f8f63c0e03adba74df76bf9c2be466fec Gitweb: http://git.kernel.org/tip/b09c146f8f63c0e03adba74df76bf9c2be466fec Author: Kan Liang AuthorDate: Fri, 8 Sep 2017 17:34:47 -0400 Committer: Thomas Gleixner CommitDate: Mon, 25 Sep 2017 09:36:17 +0200 perf/x86/intel/cstate: Add missing CPU IDs Skylake server uses the same C-state residency events as Sandy Bridge. Denverton and Gemini lake use the same C-state residency events 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-1-kan.liang@intel.com --- arch/x86/events/intel/cstate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c index 4cf100f..72db066 100644 --- a/arch/x86/events/intel/cstate.c +++ b/arch/x86/events/intel/cstate.c @@ -552,6 +552,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE, snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates), + X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE, snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates), @@ -560,6 +561,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates), X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates), + X86_CSTATES_MODEL(INTEL_FAM6_ATOM_DENVERTON, glm_cstates), + + X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GEMINI_LAKE, glm_cstates), { }, }; MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);