| Message ID | 20200804160821.18679-2-kai.heng.feng@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix IOMMU error on AMD Radeon Pro W5700 | expand |
On 04.08.20 18:08, Kai-Heng Feng wrote: > BugLink: https://bugs.launchpad.net/bugs/1890306 > > 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 > (cherry picked from commit 45beb31d3afb651bb5c41897e46bd4fa9980c51c linux-next) > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- Regression Potential as it is described in the SRU documentation (https://wiki.ubuntu.com/StableReleaseUpdates/#SRU_Bug_Template) probably should be: Modifications are limited to a specific model of graphics card. Worst case there might be some functionality not working as expected. Which, compared to not working at all, would not be a regression. -Stefan > drivers/pci/quirks.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 3ee66e7c5a14..63e6f98fcd9c 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -5230,7 +5230,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"); > @@ -5241,6 +5242,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 */ >
On 04.08.20 18:08, Kai-Heng Feng wrote: > BugLink: https://bugs.launchpad.net/bugs/1890306 > > 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 > (cherry picked from commit 45beb31d3afb651bb5c41897e46bd4fa9980c51c linux-next) > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > drivers/pci/quirks.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 3ee66e7c5a14..63e6f98fcd9c 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -5230,7 +5230,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"); > @@ -5241,6 +5242,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 */ >
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 3ee66e7c5a14..63e6f98fcd9c 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5230,7 +5230,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"); @@ -5241,6 +5242,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 */
BugLink: https://bugs.launchpad.net/bugs/1890306 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 (cherry picked from commit 45beb31d3afb651bb5c41897e46bd4fa9980c51c linux-next) Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- drivers/pci/quirks.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)