--- drivers/pci/quirks.c

+++ drivers/pci/quirks.c

@@ -1444,7 +1444,8 @@ static void quirk_jmicron_ata(struct pci

conf5 &= ~(1 << 24); /* Clear bit 24 */

switch (pdev->device) {

- case PCI_DEVICE_ID_JMICRON_JMB360:

+ case PCI_DEVICE_ID_JMICRON_JMB360: /* SATA single port */

+ case PCI_DEVICE_ID_JMICRON_JMB362: /* SATA dual ports */

/* The controller should be in single function ahci mode */

conf1 |= 0x0002A100; /* Set 8, 13, 15, 17 */

break;

@@ -1480,12 +1481,14 @@ static void quirk_jmicron_ata(struct pci

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB360, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, quirk_jmicron_ata);

+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB362, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB360, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, quirk_jmicron_ata);

+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB362, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, quirk_jmicron_ata);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, quirk_jmicron_ata);

@@ -2092,6 +2095,8 @@ static void __devinit quirk_disable_msi(

}

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi);

+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, 0xa238, quirk_disable_msi);

+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x5a3f, quirk_disable_msi);

/* Go through the list of Hypertransport capabilities and

* return 1 if a HT MSI capability is found and enabled */

@@ -2183,15 +2188,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8132_BRIDGE,

ht_enable_msi_mapping);

-/* The P5N32-SLI Premium motherboard from Asus has a problem with msi

+/* The P5N32-SLI motherboards from Asus have a problem with msi

* for the MCP55 NIC. It is not yet determined whether the msi problem

* also affects other devices. As for now, turn off msi for this device.

*/

static void __devinit nvenet_msi_disable(struct pci_dev *dev)

{

- if (dmi_name_in_vendors("P5N32-SLI PREMIUM")) {

+ if (dmi_name_in_vendors("P5N32-SLI PREMIUM") ||

+ dmi_name_in_vendors("P5N32-E SLI")) {

dev_info(&dev->dev,

- "Disabling msi for MCP55 NIC on P5N32-SLI Premium\n");

+ "Disabling msi for MCP55 NIC on P5N32-SLI\n");

dev->no_msi = 1;

}

}

@@ -2513,6 +2519,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e8, quirk_i82576_sriov);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150a, quirk_i82576_sriov);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);

+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);

#endif /* CONFIG_PCI_IOV */