UBUNTU: SAUCE: (no-up) mei_me: Add module parameter to disable MSI

mei_me.disable_msi = 1

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index bac33311f55a6d7a6699b362c39730fae9c4f107..bbef8685c7044b01a7a3018a165ea1d5077a991b 100644 (file)
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -41,6 +41,9 @@
 #include "hw-me-regs.h"
 #include "hw-me.h"
 
+static bool disable_msi;
+module_param(disable_msi, bool, 0);
+
 /* mei_pci_tbl - PCI Device ID Table */
 static const struct pci_device_id mei_me_pci_tbl[] = {
        {MEI_PCI_DEVICE(MEI_DEV_ID_82946GZ, mei_me_legacy_cfg)},
@@ -185,7 +188,8 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw = to_me_hw(dev);
        hw->mem_addr = pcim_iomap_table(pdev)[0];
 
-       pci_enable_msi(pdev);
+       if (!disable_msi)
+               pci_enable_msi(pdev);
 
         /* request and enable interrupt */
        irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED;