Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a2a7797 authored by Dasaratharaman Chandramouli's avatar Dasaratharaman Chandramouli Committed by Ingo Molnar
Browse files

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: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarStephane Eranian <eranian@google.com>
Acked-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jacob Pan Jun <jacob.jun.pan@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nikhil Rao <nikhil.rao@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/aa63b4a3af3160152fea1a10c807f4200527280c.1432665809.git.dasaratharaman.chandramouli@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 2a742ced

arch/x86/kernel/cpu/perf_event_intel_rapl.c

+20 −0
Original line number Diff line number Diff line
@@ -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 */