Commit 3c14a050 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/ats' 

- Disable ATS for Intel IPU E2000 A- and B-stepping devices to avoid
  invalidation message endianness erratum (Bartosz Pawlowski)

* pci/ats:
  PCI: Disable ATS for specific Intel IPU E2000 devices
  PCI: Extract ATS disabling to a helper function
parents b63c6dfe a18615b1

drivers/pci/quirks.c

+28 −7
Original line number Diff line number Diff line
@@ -5507,6 +5507,12 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0420, quirk_no_ext_tags); 
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags);



#ifdef CONFIG_PCI_ATS

static void quirk_no_ats(struct pci_dev *pdev)

{

	pci_info(pdev, "disabling ATS\n");

	pdev->ats_cap = 0;

}



/*

 * Some devices require additional driver setup to enable ATS.  Don't use

 * ATS for those devices as ATS will be enabled before the driver has had a
@@ -5520,14 +5526,10 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) 
		    (pdev->subsystem_device == 0xce19 ||

		     pdev->subsystem_device == 0xcc10 ||

		     pdev->subsystem_device == 0xcc08))

			goto no_ats;

		else

			return;

			quirk_no_ats(pdev);

	} else {

		quirk_no_ats(pdev);

	}



no_ats:

	pci_info(pdev, "disabling ATS\n");

	pdev->ats_cap = 0;

}



/* AMD Stoney platform GPU */
@@ -5550,6 +5552,25 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7347, quirk_amd_harvest_no_ats); 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x734f, quirk_amd_harvest_no_ats);

/* AMD Raven platform iGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x15d8, quirk_amd_harvest_no_ats);



/*

 * Intel IPU E2000 revisions before C0 implement incorrect endianness

 * in ATS Invalidate Request message body. Disable ATS for those devices.

 */

static void quirk_intel_e2000_no_ats(struct pci_dev *pdev)

{

	if (pdev->revision < 0x20)

		quirk_no_ats(pdev);

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1451, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1452, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1453, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1454, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1455, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1457, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1459, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x145a, quirk_intel_e2000_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x145c, quirk_intel_e2000_no_ats);

#endif /* CONFIG_PCI_ATS */



/* Freescale PCIe doesn't support MSI in RC mode */