From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424825AbcFHLDw (ORCPT ); Wed, 8 Jun 2016 07:03:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57904 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932336AbcFHLDs (ORCPT ); Wed, 8 Jun 2016 07:03:48 -0400 Date: Wed, 8 Jun 2016 04:02:21 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: luto@amacapital.net, alexander.shishkin@linux.intel.com, dave.hansen@linux.intel.com, eranian@google.com, dvlasenk@redhat.com, peterz@infradead.org, torvalds@linux-foundation.org, bp@alien8.de, acme@redhat.com, brgerst@gmail.com, hpa@zytor.com, tglx@linutronix.de, vincent.weaver@maine.edu, dave@sr71.net, jolsa@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: dave@sr71.net, jolsa@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, dave.hansen@linux.intel.com, eranian@google.com, alexander.shishkin@linux.intel.com, luto@amacapital.net, peterz@infradead.org, dvlasenk@redhat.com, acme@redhat.com, bp@alien8.de, torvalds@linux-foundation.org, tglx@linutronix.de, vincent.weaver@maine.edu, hpa@zytor.com, brgerst@gmail.com In-Reply-To: <20160603001935.FE6B3847@viggo.jf.intel.com> References: <20160603001935.FE6B3847@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/msr: Add missing Intel models Git-Commit-ID: 5134596caee9e834d2486edc45efad4c9e6effc3 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 Commit-ID: 5134596caee9e834d2486edc45efad4c9e6effc3 Gitweb: http://git.kernel.org/tip/5134596caee9e834d2486edc45efad4c9e6effc3 Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:35 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 12:05:59 +0200 perf/x86/msr: Add missing Intel models This patch presumes that Kabylake and Skylake Server will be the same as the existing Skylake parts and adds them to the MSR events code. Also add handling for "WESTMERE2". Signed-off-by: Dave Hansen Cc: Alexander Shishkin Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: jacob.jun.pan@intel.com Link: http://lkml.kernel.org/r/20160603001935.FE6B3847@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/msr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c index 83cf13e..50b3a05 100644 --- a/arch/x86/events/msr.c +++ b/arch/x86/events/msr.c @@ -40,6 +40,7 @@ static bool test_intel(int idx) case INTEL_FAM6_NEHALEM_EX: case INTEL_FAM6_WESTMERE: + case INTEL_FAM6_WESTMERE2: case INTEL_FAM6_WESTMERE_EP: case INTEL_FAM6_WESTMERE_EX: @@ -68,6 +69,9 @@ static bool test_intel(int idx) case INTEL_FAM6_SKYLAKE_MOBILE: case INTEL_FAM6_SKYLAKE_DESKTOP: + case INTEL_FAM6_SKYLAKE_X: + case INTEL_FAM6_KABYLAKE_MOBILE: + case INTEL_FAM6_KABYLAKE_DESKTOP: if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF) return true; break;