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.
Signed-off-by: Dasaratharaman Chandramouli <[email protected]>
---
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 */
--
1.8.1.5
Ping.
On Fri, 2015-05-29 at 10:06 -0700, Jacob Pan wrote:
> On Tue, 26 May 2015 11:47:39 -0700
> Dasaratharaman Chandramouli <[email protected]>
> 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 <[email protected]>
> > Signed-off-by: Dasaratharaman Chandramouli
> > <[email protected]> ---
> > 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]
On Fri, May 29, 2015 at 4:55 AM, Peter Zijlstra <[email protected]> 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 <[email protected]>
> > Signed-off-by: Dasaratharaman Chandramouli <[email protected]>
> > ---
> > 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);
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;
>
> ?
On Mon, 2015-06-22 at 11:52 -0700, Stephane Eranian wrote:
> On Fri, May 29, 2015 at 4:55 AM, Peter Zijlstra <[email protected]> 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 <[email protected]>
> > > Signed-off-by: Dasaratharaman Chandramouli <[email protected]>
> > > ---
> > > 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);
>
>
> Does KNL also have different raw units for RAM requiring the use of the quirk?
That is right. KNL's DRAM has a different fixed energy unit (2^-16J)
similar to that of HSW
>
> >
> > > + rapl_cntr_mask = RAPL_IDX_KNL;
> > > + rapl_pmu_events_group.attrs = rapl_events_knl_attr;
> >
> > break;
> >
> > ?
On Mon, 2015-06-22 at 13:56 -0700, Dasaratharaman Chandramouli wrote:
> On Mon, 2015-06-22 at 11:52 -0700, Stephane Eranian wrote:
> > On Fri, May 29, 2015 at 4:55 AM, Peter Zijlstra <[email protected]> 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 <[email protected]>
> > > > Signed-off-by: Dasaratharaman Chandramouli <[email protected]>
> > > > ---
> > > > 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);
> >
> >
> > Does KNL also have different raw units for RAM requiring the use of the quirk?
>
> That is right. KNL's DRAM has a different fixed energy unit (2^-16J)
> similar to that of HSW
Stepane, if there are no more comments/questions, could i get an ack?
>
> >
> > >
> > > > + rapl_cntr_mask = RAPL_IDX_KNL;
> > > > + rapl_pmu_events_group.attrs = rapl_events_knl_attr;
> > >
> > > break;
> > >
> > > ?
>
On Mon, 2015-06-29 at 09:37 -0700, Dasaratharaman Chandramouli wrote:
> On Mon, 2015-06-22 at 13:56 -0700, Dasaratharaman Chandramouli wrote:
> > On Mon, 2015-06-22 at 11:52 -0700, Stephane Eranian wrote:
> > > On Fri, May 29, 2015 at 4:55 AM, Peter Zijlstra <[email protected]> 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 <[email protected]>
> > > > > Signed-off-by: Dasaratharaman Chandramouli <[email protected]>
> > > > > ---
> > > > > 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);
> > >
> > >
> > > Does KNL also have different raw units for RAM requiring the use of the quirk?
> >
> > That is right. KNL's DRAM has a different fixed energy unit (2^-16J)
> > similar to that of HSW
>
> Stepane, if there are no more comments/questions, could i get an ack?
Ping.
> >
> > >
> > > >
> > > > > + rapl_cntr_mask = RAPL_IDX_KNL;
> > > > > + rapl_pmu_events_group.attrs = rapl_events_knl_attr;
> > > >
> > > > break;
> > > >
> > > > ?
> >
>
On Fri, May 29, 2015 at 4:55 AM, Peter Zijlstra <[email protected]> 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.
>
Acked-by: Stephane Eranian <[email protected]>
> Cc: Stephane Eranian <[email protected]>
>> Signed-off-by: Dasaratharaman Chandramouli <[email protected]>
>> ---
>> 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;
>
> break;
>
> ?
Commit-ID: 3a2a7797326a4bc59b7ff0cc92c8b274abf21892
Gitweb: http://git.kernel.org/tip/3a2a7797326a4bc59b7ff0cc92c8b274abf21892
Author: Dasaratharaman Chandramouli <[email protected]>
AuthorDate: Tue, 26 May 2015 11:47:39 -0700
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 4 Aug 2015 10:16:52 +0200
perf/x86/intel/rapl: Add support for Knights Landing (KNL)
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.
Signed-off-by: Dasaratharaman Chandramouli <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Acked-by: Stephane Eranian <[email protected]>
Acked-by: Jacob Pan <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Jacob Pan Jun <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Nikhil Rao <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/aa63b4a3af3160152fea1a10c807f4200527280c.1432665809.git.dasaratharaman.chandramouli@intel.com
Signed-off-by: Ingo Molnar <[email protected]>
---
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 5cbd4e6..81431c0 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
@@ -486,6 +490,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 */