Commit a572582b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v5.5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fix from Bjorn Helgaas:
 "Mark ATS as broken on AMD Navi14 GPU rev 0xc5 (Alex Deucher)"

* tag 'pci-v5.5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken
parents 3c2659bd 5e89cd30

drivers/pci/quirks.c

+13 −6
Original line number Diff line number Diff line
@@ -5074,18 +5074,25 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); 


#ifdef CONFIG_PCI_ATS

/*

 * Some devices have a broken ATS implementation causing IOMMU stalls.

 * Don't use ATS for those devices.

 * 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

 * chance to load and configure the device.

 */

static void quirk_no_ats(struct pci_dev *pdev)

static void quirk_amd_harvest_no_ats(struct pci_dev *pdev)

{

	pci_info(pdev, "disabling ATS (broken on this device)\n");

	if (pdev->device == 0x7340 && pdev->revision != 0xc5)

		return;



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

	pdev->ats_cap = 0;

}



/* AMD Stoney platform GPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_no_ats);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_amd_harvest_no_ats);

/* AMD Iceland dGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_amd_harvest_no_ats);

/* AMD Navi14 dGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7340, quirk_amd_harvest_no_ats);

#endif /* CONFIG_PCI_ATS */



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE