--- drivers/pci/quirks.c

+++ drivers/pci/quirks.c

@@ -155,6 +155,26 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NE

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs);

/*

+ * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear

+ * for some HT machines to use C4 w/o hanging.

+ */

+static void __devinit quirk_tigerpoint_bm_sts(struct pci_dev *dev)

+{

+ u32 pmbase;

+ u16 pm1a;

+

+ pci_read_config_dword(dev, 0x40, &pmbase);

+ pmbase = pmbase & 0xff80;

+ pm1a = inw(pmbase);

+

+ if (pm1a & 0x10) {

+ dev_info(&dev->dev, FW_BUG "TigerPoint LPC.BM_STS cleared\n");

+ outw(0x10, pmbase);

+ }

+}

+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk_tigerpoint_bm_sts);

+

+/*

* Chipsets where PCI->PCI transfers vanish or hang

*/

static void __devinit quirk_nopcipci(struct pci_dev *dev)

@@ -2084,6 +2104,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3336, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3364, quirk_disable_all_msi);

+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8380_0, quirk_disable_all_msi);

/* Disable MSI on chipsets that are known to not support it */

static void __devinit quirk_disable_msi(struct pci_dev *dev)

@@ -2356,6 +2377,9 @@ static void __devinit __nv_msi_ht_cap_qu

int pos;

int found;

+ if (!pci_msi_enabled())

+ return;

+

/* check if there is HT MSI cap or enabled on this device */

found = ht_check_msi_mapping(dev);