mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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: Stephane Eranian <eranian@google.com> Signed-off-by: Peter 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
63b6da39bb
commit
0e1eb0a1f5
3 changed files with 24 additions and 0 deletions
|
@ -995,6 +995,9 @@ static int __init uncore_pci_init(void)
|
||||||
case 87: /* Knights Landing */
|
case 87: /* Knights Landing */
|
||||||
ret = knl_uncore_pci_init();
|
ret = knl_uncore_pci_init();
|
||||||
break;
|
break;
|
||||||
|
case 94: /* SkyLake */
|
||||||
|
ret = skl_uncore_pci_init();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -336,6 +336,7 @@ int snb_uncore_pci_init(void);
|
||||||
int ivb_uncore_pci_init(void);
|
int ivb_uncore_pci_init(void);
|
||||||
int hsw_uncore_pci_init(void);
|
int hsw_uncore_pci_init(void);
|
||||||
int bdw_uncore_pci_init(void);
|
int bdw_uncore_pci_init(void);
|
||||||
|
int skl_uncore_pci_init(void);
|
||||||
void snb_uncore_cpu_init(void);
|
void snb_uncore_cpu_init(void);
|
||||||
void nhm_uncore_cpu_init(void);
|
void nhm_uncore_cpu_init(void);
|
||||||
int snb_pci2phy_map_init(int devid);
|
int snb_pci2phy_map_init(int devid);
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#define PCI_DEVICE_ID_INTEL_HSW_IMC 0x0c00
|
#define PCI_DEVICE_ID_INTEL_HSW_IMC 0x0c00
|
||||||
#define PCI_DEVICE_ID_INTEL_HSW_U_IMC 0x0a04
|
#define PCI_DEVICE_ID_INTEL_HSW_U_IMC 0x0a04
|
||||||
#define PCI_DEVICE_ID_INTEL_BDW_IMC 0x1604
|
#define PCI_DEVICE_ID_INTEL_BDW_IMC 0x1604
|
||||||
|
#define PCI_DEVICE_ID_INTEL_SKL_IMC 0x191f
|
||||||
|
|
||||||
/* SNB event control */
|
/* SNB event control */
|
||||||
#define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
|
#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 */ },
|
{ /* 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 = {
|
static struct pci_driver snb_uncore_pci_driver = {
|
||||||
.name = "snb_uncore",
|
.name = "snb_uncore",
|
||||||
.id_table = snb_uncore_pci_ids,
|
.id_table = snb_uncore_pci_ids,
|
||||||
|
@ -544,6 +553,11 @@ static struct pci_driver bdw_uncore_pci_driver = {
|
||||||
.id_table = bdw_uncore_pci_ids,
|
.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 {
|
struct imc_uncore_pci_dev {
|
||||||
__u32 pci_id;
|
__u32 pci_id;
|
||||||
struct pci_driver *driver;
|
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_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(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(BDW_IMC, &bdw_uncore_pci_driver), /* 5th Gen Core U */
|
||||||
|
IMC_DEV(SKL_IMC, &skl_uncore_pci_driver), /* 6th Gen Core */
|
||||||
{ /* end marker */ }
|
{ /* end marker */ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -610,6 +625,11 @@ int bdw_uncore_pci_init(void)
|
||||||
return imc_uncore_pci_init();
|
return imc_uncore_pci_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int skl_uncore_pci_init(void)
|
||||||
|
{
|
||||||
|
return imc_uncore_pci_init();
|
||||||
|
}
|
||||||
|
|
||||||
/* end of Sandy Bridge uncore support */
|
/* end of Sandy Bridge uncore support */
|
||||||
|
|
||||||
/* Nehalem uncore support */
|
/* Nehalem uncore support */
|
||||||
|
|
Loading…
Reference in a new issue