| From 45beb31d3afb651bb5c41897e46bd4fa9980c51c Mon Sep 17 00:00:00 2001 |
| From: Kai-Heng Feng <kai.heng.feng@canonical.com> |
| Date: Tue, 28 Jul 2020 18:45:53 +0800 |
| Subject: [PATCH] PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken |
| |
| commit 45beb31d3afb651bb5c41897e46bd4fa9980c51c upstream. |
| |
| We are seeing AMD Radeon Pro W5700 doesn't work when IOMMU is enabled: |
| |
| iommu ivhd0: AMD-Vi: Event logged [IOTLB_INV_TIMEOUT device=63:00.0 address=0x42b5b01a0] |
| iommu ivhd0: AMD-Vi: Event logged [IOTLB_INV_TIMEOUT device=63:00.0 address=0x42b5b01c0] |
| |
| The error also makes graphics driver fail to probe the device. |
| |
| It appears to be the same issue as commit 5e89cd303e3a ("PCI: Mark AMD |
| Navi14 GPU rev 0xc5 ATS as broken") addresses, and indeed the same ATS |
| quirk can workaround the issue. |
| |
| See-also: 5e89cd303e3a ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken") |
| See-also: d28ca864c493 ("PCI: Mark AMD Stoney Radeon R7 GPU ATS as broken") |
| See-also: 9b44b0b09dec ("PCI: Mark AMD Stoney GPU ATS as broken") |
| Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208725 |
| Link: https://lore.kernel.org/r/20200728104554.28927-1-kai.heng.feng@canonical.com |
| Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Acked-by: Alex Deucher <alexander.deucher@amd.com> |
| Cc: stable@vger.kernel.org |
| |
| diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c |
| index 812bfc32ecb8..052efeb9f053 100644 |
| --- a/drivers/pci/quirks.c |
| +++ b/drivers/pci/quirks.c |
| @@ -5192,7 +5192,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); |
| */ |
| static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) |
| { |
| - if (pdev->device == 0x7340 && pdev->revision != 0xc5) |
| + if ((pdev->device == 0x7312 && pdev->revision != 0x00) || |
| + (pdev->device == 0x7340 && pdev->revision != 0xc5)) |
| return; |
| |
| pci_info(pdev, "disabling ATS\n"); |
| @@ -5203,6 +5204,8 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) |
| 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 Navi10 dGPU */ |
| +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); |
| #endif /* CONFIG_PCI_ATS */ |
| -- |
| 2.27.0 |
| |
