Commit a6e0eba6 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/msi' 

- Avoid broken MSI on SB600 USB devices (Bjorn Helgaas)

* pci/msi:
  PCI: Avoid broken MSI on SB600 USB devices
parents 73c82469 63cd736f

drivers/pci/quirks.c

+12 −0
Original line number Diff line number Diff line
@@ -1811,6 +1811,18 @@ static void quirk_alder_ioapic(struct pci_dev *pdev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_EESSC,	quirk_alder_ioapic);

#endif



static void quirk_no_msi(struct pci_dev *dev)

{

	pci_info(dev, "avoiding MSI to work around a hardware defect\n");

	dev->no_msi = 1;

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4386, quirk_no_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4387, quirk_no_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4388, quirk_no_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4389, quirk_no_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x438a, quirk_no_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x438b, quirk_no_msi);



static void quirk_pcie_mch(struct pci_dev *pdev)

{

	pdev->no_msi = 1;