From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424924AbcFHLFA (ORCPT ); Wed, 8 Jun 2016 07:05:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57976 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424907AbcFHLE5 (ORCPT ); Wed, 8 Jun 2016 07:04:57 -0400 Date: Wed, 8 Jun 2016 04:03:42 -0700 From: tip-bot for Jacob Pan Message-ID: Cc: alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, torvalds@linux-foundation.org, bp@alien8.de, jacob.jun.pan@linux.intel.com, dave@sr71.net, dvlasenk@redhat.com, mingo@kernel.org, dave.hansen@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org, jolsa@redhat.com, acme@redhat.com, luto@amacapital.net, brgerst@gmail.com, tglx@linutronix.de, eranian@google.com Reply-To: hpa@zytor.com, dave.hansen@linux.intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, peterz@infradead.org, jolsa@redhat.com, eranian@google.com, tglx@linutronix.de, luto@amacapital.net, brgerst@gmail.com, alexander.shishkin@linux.intel.com, bp@alien8.de, torvalds@linux-foundation.org, vincent.weaver@maine.edu, jacob.jun.pan@linux.intel.com, dave@sr71.net, dvlasenk@redhat.com In-Reply-To: <20160603001953.38848836@viggo.jf.intel.com> References: <20160603001953.38848836@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/rapl: Add Skylake server model detection Git-Commit-ID: 348c5ac6c7dc117e1de095bf07c86c31101d56f3 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: 348c5ac6c7dc117e1de095bf07c86c31101d56f3 Gitweb: http://git.kernel.org/tip/348c5ac6c7dc117e1de095bf07c86c31101d56f3 Author: Jacob Pan AuthorDate: Thu, 2 Jun 2016 17:19:53 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 12:06:01 +0200 perf/x86/rapl: Add Skylake server model detection SKX uses similar RAPL interface as Broadwell server. Signed-off-by: Jacob Pan 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/20160603001953.38848836@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 8012fe6..d0c58b3 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -807,6 +807,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP, skl_rapl_init), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X, hsx_rapl_init), {}, };