--- drivers/pci/quirks.c

+++ drivers/pci/quirks.c

@@ -2575,6 +2575,29 @@ 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)

{