1 files changed, 36 insertions, 10 deletions

diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index a49452e2aed9..127e8f169d9c 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/pcieport_if.h>
 #include <linux/aer.h>
+#include <linux/dmi.h>
 
 #include "portdrv.h"
 #include "aer/aerdrv.h"
@@ -24,7 +25,7 @@
  */
 #define DRIVER_VERSION "v1.0"
 #define DRIVER_AUTHOR "tom.l.nguyen@intel.com"
-#define DRIVER_DESC "PCIE Port Bus Driver"
+#define DRIVER_DESC "PCIe Port Bus Driver"
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
@@ -63,7 +64,7 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = {
  * pcie_portdrv_probe - Probe PCI-Express port devices
  * @dev: PCI-Express port device being probed
  *
- * If detected invokes the pcie_port_device_register() method for 
+ * If detected invokes the pcie_port_device_register() method for
  * this port device.
  *
  */
@@ -78,7 +79,7 @@ static int __devinit pcie_portdrv_probe(struct pci_dev *dev,
              (dev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM)))
                 return -ENODEV;
 
-        if (!dev->irq && dev->pin) {
+        if (!dev->irq && dev->pin) {
                 dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; "
                          "check vendor BIOS\n", dev->vendor, dev->device);
         }
@@ -91,7 +92,7 @@ static int __devinit pcie_portdrv_probe(struct pci_dev *dev,
         return 0;
 }
 
-static void pcie_portdrv_remove (struct pci_dev *dev)
+static void pcie_portdrv_remove(struct pci_dev *dev)
 {
         pcie_port_device_remove(dev);
         pci_disable_device(dev);
@@ -129,14 +130,13 @@ static int error_detected_iter(struct device *device, void *data)
 static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev,
                                         enum pci_channel_state error)
 {
-        struct aer_broadcast_data result_data =
-                        {error, PCI_ERS_RESULT_CAN_RECOVER};
-        int retval;
+        struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER};
+        int ret;
 
         /* can not fail */
-        retval = device_for_each_child(&dev->dev, &result_data, error_detected_iter);
+        ret = device_for_each_child(&dev->dev, &data, error_detected_iter);
 
-        return result_data.result;
+        return data.result;
 }
 
 static int mmio_enabled_iter(struct device *device, void *data)
@@ -274,10 +274,36 @@ static struct pci_driver pcie_portdriver = {
         .driver.pm      = PCIE_PORTDRV_PM_OPS,
 };
 
+static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
+{
+        pr_notice("%s detected: will not use MSI for PCIe PME signaling\n",
+                        d->ident);
+        pcie_pme_disable_msi();
+        return 0;
+}
+
+static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
+        /*
+         * Boxes that should not use MSI for PCIe PME signaling.
+         */
+        {
+         .callback = dmi_pcie_pme_disable_msi,
+         .ident = "MSI Wind U-100",
+         .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR,
+                                "MICRO-STAR INTERNATIONAL CO., LTD"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "U-100"),
+                     },
+         },
+         {}
+};
+
 static int __init pcie_portdrv_init(void)
 {
         int retval;
 
+        dmi_check_system(pcie_portdrv_dmi_table);
+
         retval = pcie_port_bus_register();
         if (retval) {
                 printk(KERN_WARNING "PCIE: bus_register error: %d\n", retval);
@@ -290,7 +316,7 @@ static int __init pcie_portdrv_init(void)
         return retval;
 }
 
-static void __exit pcie_portdrv_exit(void) 
+static void __exit pcie_portdrv_exit(void)
 {
         pci_unregister_driver(&pcie_portdriver);
         pcie_port_bus_unregister();