Commit f1b0e54e authored by Jon Derrick's avatar Jon Derrick Committed by Bjorn Helgaas
Browse files

x86/PCI: Move VMD quirk to x86 fixups 



VMD currently only exists for Intel x86 products, so move the VMD quirk to
arch/x86.

Signed-off-by: default avatarJon Derrick <jonathan.derrick@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7674d05d

arch/x86/pci/fixup.c

+17 −0
Original line number Diff line number Diff line
@@ -618,3 +618,20 @@ static void quirk_apple_mbp_poweroff(struct pci_dev *pdev) 
		dev_info(dev, "can't work around MacBook Pro poweroff issue\n");

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);



/*

 * VMD-enabled root ports will change the source ID for all messages

 * to the VMD device. Rather than doing device matching with the source

 * ID, the AER driver should traverse the child device tree, reading

 * AER registers to find the faulting device.

 */

static void quirk_no_aersid(struct pci_dev *pdev)

{

	/* VMD Domain */

	if (pdev->bus->sysdata && pci_domain_nr(pdev->bus) >= 0x10000)

		pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2030, quirk_no_aersid);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);

drivers/pci/quirks.c

+0 −17
Original line number Diff line number Diff line
@@ -4657,23 +4657,6 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) 
}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);



/*

 * VMD-enabled root ports will change the source ID for all messages

 * to the VMD device. Rather than doing device matching with the source

 * ID, the AER driver should traverse the child device tree, reading

 * AER registers to find the faulting device.

 */

static void quirk_no_aersid(struct pci_dev *pdev)

{

	/* VMD Domain */

	if (pdev->bus->sysdata && pci_domain_nr(pdev->bus) >= 0x10000)

		pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2030, quirk_no_aersid);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);



/* FLR may cause some 82579 devices to hang. */

static void quirk_intel_no_flr(struct pci_dev *dev)

{