--- drivers/pci/quirks.c

+++ drivers/pci/quirks.c

@@ -155,26 +155,6 @@ 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)

@@ -2104,7 +2084,6 @@ 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)

@@ -2377,9 +2356,6 @@ 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);

@@ -2575,29 +2551,6 @@ extern struct pci_fixup __end_pci_fixups

extern struct pci_fixup __start_pci_fixups_suspend[];

extern struct pci_fixup __end_pci_fixups_suspend[];

-#if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)

-#define VTUNCERRMSK_REG 0x1ac

-#define VTD_MSK_SPEC_ERRORS (1 << 31)

-/*

- * This is a quirk for masking vt-d spec defined errors to platform error

- * handling logic. With out this, platforms using Intel 7500, 5500 chipsets

- * (and the derivative chipsets like X58 etc) seem to generate NMI/SMI (based

- * on the RAS config settings of the platform) when a vt-d fault happens.

- * The resulting SMI caused the system to hang.

- *

- * VT-d spec related errors are already handled by the VT-d OS code, so no

- * need to report the same error through other channels.

- */

-static void vtd_mask_spec_errors(struct pci_dev *dev)

-{

- u32 word;

-

- pci_read_config_dword(dev, VTUNCERRMSK_REG, &word);

- pci_write_config_dword(dev, VTUNCERRMSK_REG, word | VTD_MSK_SPEC_ERRORS);

-}

-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x342e, vtd_mask_spec_errors);

-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors);

-#endif

void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)

{