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

Commit 0e1eb0a1 authored by Stephane Eranian's avatar Stephane Eranian Committed by Ingo Molnar
Browse files

perf/x86: add Intel SkyLake uncore IMC PMU support 



This patch enables the uncore_imc PMU for Intel
SkyLake Desktop processors (Core i7-6700, model 94).

It is possible to compute memory read/write bandwidth
using:

  $ perf stat -a -e uncore_imc/data_reads/,uncore_imc/data_writes/ ....

Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: kan.liang@intel.com
Link: http://lkml.kernel.org/r/1452151546-8853-1-git-send-email-eranian@google.com


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

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+3 −0
Original line number Diff line number Diff line
@@ -995,6 +995,9 @@ static int __init uncore_pci_init(void) 
	case 87: /* Knights Landing */

		ret = knl_uncore_pci_init();

		break;

	case 94: /* SkyLake */

		ret = skl_uncore_pci_init();

		break;

	default:

		return 0;

	}

arch/x86/kernel/cpu/perf_event_intel_uncore.h

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ int snb_uncore_pci_init(void); 
int ivb_uncore_pci_init(void);

int hsw_uncore_pci_init(void);

int bdw_uncore_pci_init(void);

int skl_uncore_pci_init(void);

void snb_uncore_cpu_init(void);

void nhm_uncore_cpu_init(void);

int snb_pci2phy_map_init(int devid);

arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c

+20 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define PCI_DEVICE_ID_INTEL_HSW_IMC	0x0c00

#define PCI_DEVICE_ID_INTEL_HSW_U_IMC	0x0a04

#define PCI_DEVICE_ID_INTEL_BDW_IMC	0x1604

#define PCI_DEVICE_ID_INTEL_SKL_IMC	0x191f



/* SNB event control */

#define SNB_UNC_CTL_EV_SEL_MASK			0x000000ff
@@ -524,6 +525,14 @@ static const struct pci_device_id bdw_uncore_pci_ids[] = { 
	{ /* end: all zeroes */ },

};



static const struct pci_device_id skl_uncore_pci_ids[] = {

	{ /* IMC */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_IMC),

		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),

	},

	{ /* end: all zeroes */ },

};



static struct pci_driver snb_uncore_pci_driver = {

	.name		= "snb_uncore",

	.id_table	= snb_uncore_pci_ids,
@@ -544,6 +553,11 @@ static struct pci_driver bdw_uncore_pci_driver = { 
	.id_table	= bdw_uncore_pci_ids,

};



static struct pci_driver skl_uncore_pci_driver = {

	.name		= "skl_uncore",

	.id_table	= skl_uncore_pci_ids,

};



struct imc_uncore_pci_dev {

	__u32 pci_id;

	struct pci_driver *driver;
@@ -558,6 +572,7 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = { 
	IMC_DEV(HSW_IMC, &hsw_uncore_pci_driver),    /* 4th Gen Core Processor */

	IMC_DEV(HSW_U_IMC, &hsw_uncore_pci_driver),  /* 4th Gen Core ULT Mobile Processor */

	IMC_DEV(BDW_IMC, &bdw_uncore_pci_driver),    /* 5th Gen Core U */

	IMC_DEV(SKL_IMC, &skl_uncore_pci_driver),    /* 6th Gen Core */

	{  /* end marker */ }

};
@@ -610,6 +625,11 @@ int bdw_uncore_pci_init(void) 
	return imc_uncore_pci_init();

}



int skl_uncore_pci_init(void)

{

	return imc_uncore_pci_init();

}



/* end of Sandy Bridge uncore support */



/* Nehalem uncore support */