From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754533AbcCULTW (ORCPT ); Mon, 21 Mar 2016 07:19:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49752 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753709AbcCULTO (ORCPT ); Mon, 21 Mar 2016 07:19:14 -0400 Date: Mon, 21 Mar 2016 04:18:31 -0700 From: tip-bot for Srinivas Pandruvada Message-ID: Cc: vincent.weaver@maine.edu, jolsa@redhat.com, alexander.shishkin@linux.intel.com, mingo@kernel.org, hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org, dsahern@gmail.com, peterz@infradead.org, torvalds@linux-foundation.org, srinivas.pandruvada@linux.intel.com, eranian@google.com Reply-To: dsahern@gmail.com, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, alexander.shishkin@linux.intel.com, mingo@kernel.org, jolsa@redhat.com, vincent.weaver@maine.edu, eranian@google.com, srinivas.pandruvada@linux.intel.com, torvalds@linux-foundation.org, peterz@infradead.org In-Reply-To: <1458517938-25308-1-git-send-email-srinivas.pandruvada@linux.intel.com> References: <1458517938-25308-1-git-send-email-srinivas.pandruvada@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/intel/rapl: Add missing Broadwell models Git-Commit-ID: 7b0fd56930399d87241ad2f49d48c315307471ee 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: 7b0fd56930399d87241ad2f49d48c315307471ee Gitweb: http://git.kernel.org/tip/7b0fd56930399d87241ad2f49d48c315307471ee Author: Srinivas Pandruvada AuthorDate: Sun, 20 Mar 2016 16:52:18 -0700 Committer: Ingo Molnar CommitDate: Mon, 21 Mar 2016 11:16:19 +0100 perf/x86/intel/rapl: Add missing Broadwell models Added Broadwell-H and Broadwell-Server. Signed-off-by: Srinivas Pandruvada Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Jiri Olsa Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: bp@alien8.de Link: http://lkml.kernel.org/r/1458517938-25308-1-git-send-email-srinivas.pandruvada@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/rapl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index b834a3f..70c93f9 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -711,6 +711,7 @@ static int __init rapl_pmu_init(void) rapl_pmu_events_group.attrs = rapl_events_cln_attr; break; case 63: /* Haswell-Server */ + case 79: /* Broadwell-Server */ apply_quirk = true; rapl_cntr_mask = RAPL_IDX_SRV; rapl_pmu_events_group.attrs = rapl_events_srv_attr; @@ -718,6 +719,7 @@ static int __init rapl_pmu_init(void) case 60: /* Haswell */ case 69: /* Haswell-Celeron */ case 61: /* Broadwell */ + case 71: /* Broadwell-H */ rapl_cntr_mask = RAPL_IDX_HSW; rapl_pmu_events_group.attrs = rapl_events_hsw_attr; break;