Commit c086b55e authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/virtualization' 

- Mark AMD Raven iGPU ATS as broken in some Emerson platforms to avoid
  issues (Alex Deucher)

- Add function 1 DMA alias quirk for Marvell 9215 SATA controller (Bjorn
  Helgaas)

* pci/virtualization:
  PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller
  PCI: Mark AMD Raven iGPU ATS as broken in some platforms
parents 72b3a644 05998379

drivers/pci/quirks.c

+17 −0
Original line number Diff line number Diff line
@@ -3998,6 +3998,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9183, 
/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c46 */

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x91a0,

			 quirk_dma_func1_alias);

/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c135 */

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9215,

			 quirk_dma_func1_alias);

/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c127 */

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9220,

			 quirk_dma_func1_alias);
@@ -5164,6 +5167,18 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) 
	    (pdev->device == 0x7340 && pdev->revision != 0xc5))

		return;



	if (pdev->device == 0x15d8) {

		if (pdev->revision == 0xcf &&

		    pdev->subsystem_vendor == 0xea50 &&

		    (pdev->subsystem_device == 0xce19 ||

		     pdev->subsystem_device == 0xcc10 ||

		     pdev->subsystem_device == 0xcc08))

			goto no_ats;

		else

			return;

	}



no_ats:

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

	pdev->ats_cap = 0;

}
@@ -5176,6 +5191,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_amd_harvest_no_ats); 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7312, quirk_amd_harvest_no_ats);

/* AMD Navi14 dGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7340, quirk_amd_harvest_no_ats);

/* AMD Raven platform iGPU */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x15d8, 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