2 files changed, 52 insertions, 18 deletions

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
index e0e934c8ee77..3001015b755c 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
@@ -460,6 +460,10 @@ static const struct pci_device_id ivb_uncore_pci_ids[] = {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC),
                 .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
         },
+        { /* IMC */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_E3_IMC),
+                .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
+        },
         { /* end: all zeroes */ },
 };
 
@@ -486,34 +490,63 @@ static struct pci_driver hsw_uncore_pci_driver = {
         .id_table       = hsw_uncore_pci_ids,
 };
 
-int snb_uncore_pci_init(void)
+struct imc_uncore_pci_dev {
+        __u32 pci_id;
+        struct pci_driver *driver;
+};
+#define IMC_DEV(a, d) \
+        { .pci_id = PCI_DEVICE_ID_INTEL_##a, .driver = (d) }
+
+static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = {
+        IMC_DEV(SNB_IMC, &snb_uncore_pci_driver),
+        IMC_DEV(IVB_IMC, &ivb_uncore_pci_driver),    /* 3rd Gen Core processor */
+        IMC_DEV(IVB_E3_IMC, &ivb_uncore_pci_driver), /* Xeon E3-1200 v2/3rd Gen Core processor */
+        IMC_DEV(HSW_IMC, &hsw_uncore_pci_driver),    /* 4th Gen Core Processor */
+        {  /* end marker */ }
+};
+
+
+#define for_each_imc_pci_id(x, t) \
+        for (x = (t); (x)->pci_id; x++)
+
+static struct pci_driver *imc_uncore_find_dev(void)
 {
-        int ret = snb_pci2phy_map_init(PCI_DEVICE_ID_INTEL_SNB_IMC);
-        if (ret)
-                return ret;
-        uncore_pci_uncores = snb_pci_uncores;
-        uncore_pci_driver = &snb_uncore_pci_driver;
-        return 0;
+        const struct imc_uncore_pci_dev *p;
+        int ret;
+
+        for_each_imc_pci_id(p, desktop_imc_pci_ids) {
+                ret = snb_pci2phy_map_init(p->pci_id);
+                if (ret == 0)
+                        return p->driver;
+        }
+        return NULL;
 }
 
-int ivb_uncore_pci_init(void)
+static int imc_uncore_pci_init(void)
 {
-        int ret = snb_pci2phy_map_init(PCI_DEVICE_ID_INTEL_IVB_IMC);
-        if (ret)
-                return ret;
+        struct pci_driver *imc_drv = imc_uncore_find_dev();
+
+        if (!imc_drv)
+                return -ENODEV;
+
         uncore_pci_uncores = snb_pci_uncores;
-        uncore_pci_driver = &ivb_uncore_pci_driver;
+        uncore_pci_driver = imc_drv;
+
         return 0;
 }
 
+int snb_uncore_pci_init(void)
+{
+        return imc_uncore_pci_init();
+}
+
+int ivb_uncore_pci_init(void)
+{
+        return imc_uncore_pci_init();
+}
 int hsw_uncore_pci_init(void)
 {
-        int ret = snb_pci2phy_map_init(PCI_DEVICE_ID_INTEL_HSW_IMC);
-        if (ret)
-                return ret;
-        uncore_pci_uncores = snb_pci_uncores;
-        uncore_pci_driver = &hsw_uncore_pci_driver;
-        return 0;
+        return imc_uncore_pci_init();
 }
 
 /* end of Sandy Bridge uncore support */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 6ed0bb73a864..3102b7e3b460 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2536,6 +2536,7 @@
 #define PCI_DEVICE_ID_INTEL_EESSC       0x0008
 #define PCI_DEVICE_ID_INTEL_SNB_IMC     0x0100
 #define PCI_DEVICE_ID_INTEL_IVB_IMC     0x0154
+#define PCI_DEVICE_ID_INTEL_IVB_E3_IMC  0x0150
 #define PCI_DEVICE_ID_INTEL_HSW_IMC     0x0c00
 #define PCI_DEVICE_ID_INTEL_PXHD_0      0x0320
 #define PCI_DEVICE_ID_INTEL_PXHD_1      0x0321