From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756640AbbE2RHf (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 May 2015 13:07:35 -0400
Received: from mga01.intel.com ([192.55.52.88]:34164 "EHLO mga01.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752875AbbE2RH1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 May 2015 13:07:27 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.13,518,1427785200"; 
   d="scan'208";a="737470745"
Date: Fri, 29 May 2015 10:06:31 -0700
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: Dasaratharaman Chandramouli 
	<dasaratharaman.chandramouli@intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>, Paul Mackerras <paulus@samba.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>,
        x86@kernel.org, linux-kernel@vger.kernel.org,
        Nikhil Rao <nikhil.rao@intel.com>
Subject: Re: [PATCH] perf/x86/intel/rapl: Add support for Knights Landing
 (KNL)
Message-ID: <20150529100631.763eaef5@icelake>
In-Reply-To: <aa63b4a3af3160152fea1a10c807f4200527280c.1432665809.git.dasaratharaman.chandramouli@intel.com>
References: <aa63b4a3af3160152fea1a10c807f4200527280c.1432665809.git.dasaratharaman.chandramouli@intel.com>
Organization: OTC
X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, 26 May 2015 11:47:39 -0700
Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
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.
> 
Acked-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> Signed-off-by: Dasaratharaman Chandramouli
> <dasaratharaman.chandramouli@intel.com> ---
>  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<<RAPL_IDX_RAM_NRG_STAT|\ 1<<RAPL_IDX_PP1_NRG_STAT)
>  
> +/* Knights Landing has PKG, RAM */
> +#define RAPL_IDX_KNL	(1<<RAPL_IDX_PKG_NRG_STAT|\
> +			 1<<RAPL_IDX_RAM_NRG_STAT)
> +
>  /*
>   * 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);
> +		rapl_cntr_mask = RAPL_IDX_KNL;
> +		rapl_pmu_events_group.attrs = rapl_events_knl_attr;
>  
>  	default:
>  		/* unsupported */

[Jacob Pan]