perf/x86: add more Intel uncore IMC PCI IDs for SkyLake
Subsystems (2)
PATCH v2 1/1 perf/x86: add more Intel uncore IMC PCI IDs for SkyLake
From: Kan Liang <[email protected]>
Several uncore IMC PCI IDs are missed for Intel SkyLake.
Adds the PCI IDs for SkyLake Y, U, H and S platforms. Rename the ID macros for 0x191f and 0x190c.
The issue has been logged in the kernel org bugzilla.
The bug id is 187301.
https://bugzilla.kernel.org/show_bug.cgi?id=187301
The related datasheets are also attached in the bug entry for permanent reference.
---
Change since V1:
- Refine changelog
arch/x86/events/intel/uncore_snb.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore_snb.c +28 -4
@@ -8,8 +8,12 @@#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 -#define PCI_DEVICE_ID_INTEL_SKL_U_IMC 0x190c +#define PCI_DEVICE_ID_INTEL_SKL_U_IMC 0x1904 +#define PCI_DEVICE_ID_INTEL_SKL_Y_IMC 0x190c +#define PCI_DEVICE_ID_INTEL_SKL_HD_IMC 0x1900 +#define PCI_DEVICE_ID_INTEL_SKL_HQ_IMC 0x1910 +#define PCI_DEVICE_ID_INTEL_SKL_SD_IMC 0x190f +#define PCI_DEVICE_ID_INTEL_SKL_SQ_IMC 0x191f/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -616,13 +620,29 @@ static const struct pci_device_id bdw_uncore_pci_ids[] = {static const struct pci_device_id skl_uncore_pci_ids[] = { {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_IMC ), +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_Y_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), }, {/* IMC */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_U_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HD_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HQ_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SD_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SQ_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, {/* end: all zeroes */ }, };
@@ -666,8 +686,12 @@ 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 */ +IMC_DEV (SKL_Y_IMC , &skl_uncore_pci_driver),/* 6th Gen Core Y */ IMC_DEV (SKL_U_IMC , &skl_uncore_pci_driver),/* 6th Gen Core U */ +IMC_DEV (SKL_HD_IMC , &skl_uncore_pci_driver),/* 6th Gen Core H Dual Core */ +IMC_DEV (SKL_HQ_IMC , &skl_uncore_pci_driver),/* 6th Gen Core H Quad Core */ +IMC_DEV (SKL_SD_IMC , &skl_uncore_pci_driver),/* 6th Gen Core S Dual Core */ + IMC_DEV(SKL_SQ_IMC, &skl_uncore_pci_driver), /* 6th Gen Core S Quad Core */ { /* end marker */ } };
Signature · 1 line
2.5.5
tip-bot for Kan Liang
merge bot[tip:perf/urgent] perf/x86/intel/uncore: Add more Intel uncore IMC PCI IDs for SkyLake
perf/x86/intel/uncore: Add more Intel uncore IMC PCI IDs for SkyLake
Commit-ID: d786810b2f896854506e7b698a137f074942e410 Gitweb: http://git.kernel.org/tip/d786810b2f896854506e7b698a137f074942e410 Author: Kan Liang <[email protected]> AuthorDate: Tue, 8 Nov 2016 13:54:41 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 11 Nov 2016 08:30:22 +0100
perf/x86/intel/uncore: Add more Intel uncore IMC PCI IDs for SkyLake
Several uncore IMC PCI IDs are missed for Intel SkyLake.
Add the PCI IDs for SkyLake Y, U, H and S platforms. Rename the ID macros for 0x191f and 0x190c.
The corresponding bug:
https://bugzilla.kernel.org/show_bug.cgi?id=187301
The related datasheets are also attached in the bug entry for permanent reference.
--- arch/x86/events/intel/uncore_snb.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore_snb.c +28 -4
@@ -8,8 +8,12 @@#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 -#define PCI_DEVICE_ID_INTEL_SKL_U_IMC 0x190c +#define PCI_DEVICE_ID_INTEL_SKL_U_IMC 0x1904 +#define PCI_DEVICE_ID_INTEL_SKL_Y_IMC 0x190c +#define PCI_DEVICE_ID_INTEL_SKL_HD_IMC 0x1900 +#define PCI_DEVICE_ID_INTEL_SKL_HQ_IMC 0x1910 +#define PCI_DEVICE_ID_INTEL_SKL_SD_IMC 0x190f +#define PCI_DEVICE_ID_INTEL_SKL_SQ_IMC 0x191f/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -616,13 +620,29 @@ static const struct pci_device_id bdw_uncore_pci_ids[] = {static const struct pci_device_id skl_uncore_pci_ids[] = { {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_IMC ), +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_Y_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), }, {/* IMC */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_U_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HD_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HQ_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SD_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SQ_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, {/* end: all zeroes */ }, };
@@ -666,8 +686,12 @@ 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 */ +IMC_DEV (SKL_Y_IMC , &skl_uncore_pci_driver),/* 6th Gen Core Y */ IMC_DEV (SKL_U_IMC , &skl_uncore_pci_driver),/* 6th Gen Core U */ +IMC_DEV (SKL_HD_IMC , &skl_uncore_pci_driver),/* 6th Gen Core H Dual Core */ +IMC_DEV (SKL_HQ_IMC , &skl_uncore_pci_driver),/* 6th Gen Core H Quad Core */ +IMC_DEV (SKL_SD_IMC , &skl_uncore_pci_driver),/* 6th Gen Core S Dual Core */ + IMC_DEV(SKL_SQ_IMC, &skl_uncore_pci_driver), /* 6th Gen Core S Quad Core */ { /* end marker */ } };