Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752880AbbFVSwZ (ORCPT ); Mon, 22 Jun 2015 14:52:25 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:33971 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbbFVSwR (ORCPT ); Mon, 22 Jun 2015 14:52:17 -0400 MIME-Version: 1.0 In-Reply-To: <20150529115543.GP3644@twins.programming.kicks-ass.net> References: <20150529115543.GP3644@twins.programming.kicks-ass.net> Date: Mon, 22 Jun 2015 11:52:16 -0700 Message-ID: Subject: Re: [PATCH] perf/x86/intel/rapl: Add support for Knights Landing (KNL) From: Stephane Eranian To: Peter Zijlstra Cc: Dasaratharaman Chandramouli , Jacob Pan Jun , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo , Thomas Gleixner , "H. Peter Anvin" , x86 , LKML , Nikhil Rao Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2554 Lines: 70 On Fri, May 29, 2015 at 4:55 AM, Peter Zijlstra wrote: > > On Tue, May 26, 2015 at 11:47:39AM -0700, Dasaratharaman Chandramouli wrote: > > Knights Landing DRAM RAPL supports PKG and DRAM RAPL domains. > > DRAM RAPL has a different fixed energy unit (2^-16J) similar to > > that of HSW. > > > > Please also Cc the author of the code you're patching. > > Cc: Stephane Eranian > > Signed-off-by: Dasaratharaman Chandramouli > > --- > > arch/x86/kernel/cpu/perf_event_intel_rapl.c | 20 ++++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > > > diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c > > index 999289b9..96633fb 100644 > > --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c > > +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c > > @@ -86,6 +86,10 @@ static const char *rapl_domain_names[NR_RAPL_DOMAINS] __initconst = { > > 1< > 1< > > > +/* Knights Landing has PKG, RAM */ > > +#define RAPL_IDX_KNL (1< > + 1< > + > > /* > > * event code: LSB 8 bits, passed in attr->config > > * any other bit is reserved > > @@ -487,6 +491,18 @@ static struct attribute *rapl_events_hsw_attr[] = { > > NULL, > > }; > > > > +static struct attribute *rapl_events_knl_attr[] = { > > + EVENT_PTR(rapl_pkg), > > + EVENT_PTR(rapl_ram), > > + > > + EVENT_PTR(rapl_pkg_unit), > > + EVENT_PTR(rapl_ram_unit), > > + > > + EVENT_PTR(rapl_pkg_scale), > > + EVENT_PTR(rapl_ram_scale), > > + NULL, > > +}; > > + > > static struct attribute_group rapl_pmu_events_group = { > > .name = "events", > > .attrs = NULL, /* patched at runtime */ > > @@ -730,6 +746,10 @@ static int __init rapl_pmu_init(void) > > rapl_cntr_mask = RAPL_IDX_SRV; > > rapl_pmu_events_group.attrs = rapl_events_srv_attr; > > break; > > + case 87: /* Knights Landing */ > > + rapl_add_quirk(rapl_hsw_server_quirk); Does KNL also have different raw units for RAM requiring the use of the quirk? > > > + rapl_cntr_mask = RAPL_IDX_KNL; > > + rapl_pmu_events_group.attrs = rapl_events_knl_attr; > > break; > > ? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/