From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754049AbbEKMrd (ORCPT ); Mon, 11 May 2015 08:47:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60793 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753322AbbEKMr3 (ORCPT ); Mon, 11 May 2015 08:47:29 -0400 Date: Mon, 11 May 2015 05:46:51 -0700 From: tip-bot for Stephane Eranian Message-ID: Cc: linux-kernel@vger.kernel.org, bp@alien8.de, dvlasenk@redhat.com, mingo@kernel.org, luto@amacapital.net, torvalds@linux-foundation.org, stable@vger.kernel.org, hpa@zytor.com, eranian@google.com, brgerst@gmail.com, tglx@linutronix.de Reply-To: hpa@zytor.com, eranian@google.com, brgerst@gmail.com, tglx@linutronix.de, mingo@kernel.org, luto@amacapital.net, torvalds@linux-foundation.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, dvlasenk@redhat.com In-Reply-To: <20150423070709.GA4970@thinkpad> References: <20150423070709.GA4970@thinkpad> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/rapl: Enable Broadwell-U RAPL support Git-Commit-ID: 44b11fee51711ca85aa2b121a49bf029d18a3722 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: 44b11fee51711ca85aa2b121a49bf029d18a3722 Gitweb: http://git.kernel.org/tip/44b11fee51711ca85aa2b121a49bf029d18a3722 Author: Stephane Eranian AuthorDate: Thu, 23 Apr 2015 09:07:09 +0200 Committer: Ingo Molnar CommitDate: Mon, 11 May 2015 11:52:30 +0200 perf/x86/rapl: Enable Broadwell-U RAPL support This patch enables RAPL counters (energy consumption counters) support for Intel Broadwell-U processors (Model 61): To use: $ perf stat -a -I 1000 -e power/energy-cores/,power/energy-pkg/,power/energy-ram/ sleep 10 Signed-off-by: Stephane Eranian Cc: Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Thomas Gleixner Cc: jacob.jun.pan@linux.intel.com Cc: kan.liang@intel.com Cc: peterz@infradead.org Cc: sonnyrao@chromium.org Link: http://lkml.kernel.org/r/20150423070709.GA4970@thinkpad Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c index 999289b9..358c54a 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c @@ -722,6 +722,7 @@ static int __init rapl_pmu_init(void) break; case 60: /* Haswell */ case 69: /* Haswell-Celeron */ + case 61: /* Broadwell */ rapl_cntr_mask = RAPL_IDX_HSW; rapl_pmu_events_group.attrs = rapl_events_hsw_attr; break;