* [PATCH 0/2] Adjust AMD GPU ATS quirks
@ 2020-01-14 20:55 Alex Deucher
2020-01-14 20:55 ` [PATCH 1/2] pci: Clarify ATS quirk Alex Deucher
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Alex Deucher @ 2020-01-14 20:55 UTC (permalink / raw)
To: amd-gfx, linux-pci, bhelgaas; +Cc: Alex Deucher
We've root caused the issue and clarified the quirk.
This also adds a new quirk for a new GPU.
Alex Deucher (2):
pci: Clarify ATS quirk
pci: add ATS quirk for navi14 board (v2)
drivers/pci/quirks.c | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
--
2.24.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/2] pci: Clarify ATS quirk 2020-01-14 20:55 [PATCH 0/2] Adjust AMD GPU ATS quirks Alex Deucher @ 2020-01-14 20:55 ` Alex Deucher 2020-01-14 20:55 ` [PATCH 2/2] pci: add ATS quirk for navi14 board (v2) Alex Deucher 2020-01-14 23:41 ` [PATCH 0/2] Adjust AMD GPU ATS quirks Bjorn Helgaas 2 siblings, 0 replies; 10+ messages in thread From: Alex Deucher @ 2020-01-14 20:55 UTC (permalink / raw) To: amd-gfx, linux-pci, bhelgaas; +Cc: Alex Deucher We finally root caused this to a GPU configuration issue. On some harvest configurations, a driver needs to properly initialize some of the caches on the GPU for instances that are harvested (parts of the chip that are disabled due to silicon flaws). The necessary code to fix this up is too complex to add as a quirk. Bug: https://gitlab.freedesktop.org/drm/amd/issues/1015 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/pci/quirks.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 4937a088d7d8..6569dacbb48b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5074,18 +5074,28 @@ 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 properly 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"); - pdev->ats_cap = 0; + switch (pdev->device) { + case 0x98e4: + case 0x6900: + pci_info(pdev, "disabling ATS\n"); + pdev->ats_cap = 0; + break; + default: + break; + } } /* 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); #endif /* CONFIG_PCI_ATS */ /* Freescale PCIe doesn't support MSI in RC mode */ -- 2.24.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] pci: add ATS quirk for navi14 board (v2) 2020-01-14 20:55 [PATCH 0/2] Adjust AMD GPU ATS quirks Alex Deucher 2020-01-14 20:55 ` [PATCH 1/2] pci: Clarify ATS quirk Alex Deucher @ 2020-01-14 20:55 ` Alex Deucher 2020-01-14 23:41 ` [PATCH 0/2] Adjust AMD GPU ATS quirks Bjorn Helgaas 2 siblings, 0 replies; 10+ messages in thread From: Alex Deucher @ 2020-01-14 20:55 UTC (permalink / raw) To: amd-gfx, linux-pci, bhelgaas; +Cc: Alex Deucher On some harvest configurations, a driver needs to properly initialize some of the caches on the GPU for instances that are harvested (parts of the chip that are disabled due to silicon flaws). For navi we implemented this in the vbios, but it appears some boards went to production with an older vbios. Add a quirk for this board. The necessary code to fix this up is too complex to add as a quirk. v2: use revision id. Only revision 0xc5 should be affected. Bug: https://gitlab.freedesktop.org/drm/amd/issues/1015 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/pci/quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 6569dacbb48b..f7a5e1c3c523 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5087,6 +5087,12 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) pci_info(pdev, "disabling ATS\n"); pdev->ats_cap = 0; break; + case 0x7340: + if (pdev->revision == 0xc5) { + pci_info(pdev, "disabling ATS\n"); + pdev->ats_cap = 0; + } + break; default: break; } @@ -5096,6 +5102,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 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 */ -- 2.24.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] Adjust AMD GPU ATS quirks 2020-01-14 20:55 [PATCH 0/2] Adjust AMD GPU ATS quirks Alex Deucher 2020-01-14 20:55 ` [PATCH 1/2] pci: Clarify ATS quirk Alex Deucher 2020-01-14 20:55 ` [PATCH 2/2] pci: add ATS quirk for navi14 board (v2) Alex Deucher @ 2020-01-14 23:41 ` Bjorn Helgaas 2020-01-15 14:08 ` Deucher, Alexander 2020-01-15 17:14 ` Bjorn Helgaas 2 siblings, 2 replies; 10+ messages in thread From: Bjorn Helgaas @ 2020-01-14 23:41 UTC (permalink / raw) To: Alex Deucher; +Cc: Alex Deucher, linux-pci, amd-gfx On Tue, Jan 14, 2020 at 03:55:21PM -0500, Alex Deucher wrote: > We've root caused the issue and clarified the quirk. > This also adds a new quirk for a new GPU. > > Alex Deucher (2): > pci: Clarify ATS quirk > pci: add ATS quirk for navi14 board (v2) > > drivers/pci/quirks.c | 32 +++++++++++++++++++++++++------- > 1 file changed, 25 insertions(+), 7 deletions(-) I propose the following, which I intend to be functionally identical. It just doesn't repeat the pci_info() and pdev->ats_cap = 0. commit 998c4f7975b0 ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken") Author: Bjorn Helgaas <bhelgaas@google.com> Date: Tue Jan 14 17:09:28 2020 -0600 PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken To account for parts of the chip that are "harvested" (disabled) due to silicon flaws, caches on some AMD GPUs must be initialized before ATS is enabled. ATS is normally enabled by the IOMMU driver before the GPU driver loads, so this cache initialization would have to be done in a quirk, but that's too complex to be practical. For Navi14 (device ID 0x7340), this initialization is done by the VBIOS, but apparently some boards went to production with an older VBIOS that doesn't do it. Disable ATS for those boards. https://lore.kernel.org/r/20200114205523.1054271-3-alexander.deucher@amd.com Bug: https://gitlab.freedesktop.org/drm/amd/issues/1015 See-also: d28ca864c493 ("PCI: Mark AMD Stoney Radeon R7 GPU ATS as broken") See-also: 9b44b0b09dec ("PCI: Mark AMD Stoney GPU ATS as broken") Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 4937a088d7d8..fbeb9f73ef28 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -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 */ _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: [PATCH 0/2] Adjust AMD GPU ATS quirks 2020-01-14 23:41 ` [PATCH 0/2] Adjust AMD GPU ATS quirks Bjorn Helgaas @ 2020-01-15 14:08 ` Deucher, Alexander 2020-01-15 17:14 ` Bjorn Helgaas 1 sibling, 0 replies; 10+ messages in thread From: Deucher, Alexander @ 2020-01-15 14:08 UTC (permalink / raw) To: Bjorn Helgaas, Alex Deucher; +Cc: linux-pci, amd-gfx [AMD Public Use] > -----Original Message----- > From: Bjorn Helgaas <helgaas@kernel.org> > Sent: Tuesday, January 14, 2020 6:42 PM > To: Alex Deucher <alexdeucher@gmail.com> > Cc: amd-gfx@lists.freedesktop.org; linux-pci@vger.kernel.org; Deucher, > Alexander <Alexander.Deucher@amd.com> > Subject: Re: [PATCH 0/2] Adjust AMD GPU ATS quirks > > On Tue, Jan 14, 2020 at 03:55:21PM -0500, Alex Deucher wrote: > > We've root caused the issue and clarified the quirk. > > This also adds a new quirk for a new GPU. > > > > Alex Deucher (2): > > pci: Clarify ATS quirk > > pci: add ATS quirk for navi14 board (v2) > > > > drivers/pci/quirks.c | 32 +++++++++++++++++++++++++------- > > 1 file changed, 25 insertions(+), 7 deletions(-) > > I propose the following, which I intend to be functionally identical. > It just doesn't repeat the pci_info() and pdev->ats_cap = 0. > Works for me. Thanks! Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > commit 998c4f7975b0 ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken") > Author: Bjorn Helgaas <bhelgaas@google.com> > Date: Tue Jan 14 17:09:28 2020 -0600 > > PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken > > To account for parts of the chip that are "harvested" (disabled) due to > silicon flaws, caches on some AMD GPUs must be initialized before ATS is > enabled. > > ATS is normally enabled by the IOMMU driver before the GPU driver loads, > so > this cache initialization would have to be done in a quirk, but that's too > complex to be practical. > > For Navi14 (device ID 0x7340), this initialization is done by the VBIOS, > but apparently some boards went to production with an older VBIOS that > doesn't do it. Disable ATS for those boards. > > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore. > kernel.org%2Fr%2F20200114205523.1054271-3- > alexander.deucher%40amd.com&data=02%7C01%7Calexander.deucher > %40amd.com%7C7bbf2f086ba64a68891e08d7994b5216%7C3dd8961fe4884e6 > 08e11a82d994e183d%7C0%7C0%7C637146421098328112&sdata=aLaNuiJ > pB4dYatxvBJuC%2Blk90Dhl4qd5jvLp75ZUDns%3D&reserved=0 > Bug: > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitla > b.freedesktop.org%2Fdrm%2Famd%2Fissues%2F1015&data=02%7C01% > 7Calexander.deucher%40amd.com%7C7bbf2f086ba64a68891e08d7994b5216 > %7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C63714642109832811 > 2&sdata=QgCFuWKp8Dg3lpQhXCb2z4qmukdqkiX0e3%2BRz%2FcPkg0%3 > D&reserved=0 > See-also: d28ca864c493 ("PCI: Mark AMD Stoney Radeon R7 GPU ATS as > broken") > See-also: 9b44b0b09dec ("PCI: Mark AMD Stoney GPU ATS as broken") > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index > 4937a088d7d8..fbeb9f73ef28 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -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 */ _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] Adjust AMD GPU ATS quirks 2020-01-14 23:41 ` [PATCH 0/2] Adjust AMD GPU ATS quirks Bjorn Helgaas 2020-01-15 14:08 ` Deucher, Alexander @ 2020-01-15 17:14 ` Bjorn Helgaas 2020-01-15 17:26 ` Alex Deucher 1 sibling, 1 reply; 10+ messages in thread From: Bjorn Helgaas @ 2020-01-15 17:14 UTC (permalink / raw) To: Alex Deucher; +Cc: Alex Deucher, linux-pci, amd-gfx On Tue, Jan 14, 2020 at 05:41:44PM -0600, Bjorn Helgaas wrote: > On Tue, Jan 14, 2020 at 03:55:21PM -0500, Alex Deucher wrote: > > We've root caused the issue and clarified the quirk. > > This also adds a new quirk for a new GPU. > > > > Alex Deucher (2): > > pci: Clarify ATS quirk > > pci: add ATS quirk for navi14 board (v2) > > > > drivers/pci/quirks.c | 32 +++++++++++++++++++++++++------- > > 1 file changed, 25 insertions(+), 7 deletions(-) > > I propose the following, which I intend to be functionally identical. > It just doesn't repeat the pci_info() and pdev->ats_cap = 0. Applied to pci/misc for v5.6, thanks! > commit 998c4f7975b0 ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken") > Author: Bjorn Helgaas <bhelgaas@google.com> > Date: Tue Jan 14 17:09:28 2020 -0600 > > PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken > > To account for parts of the chip that are "harvested" (disabled) due to > silicon flaws, caches on some AMD GPUs must be initialized before ATS is > enabled. > > ATS is normally enabled by the IOMMU driver before the GPU driver loads, so > this cache initialization would have to be done in a quirk, but that's too > complex to be practical. > > For Navi14 (device ID 0x7340), this initialization is done by the VBIOS, > but apparently some boards went to production with an older VBIOS that > doesn't do it. Disable ATS for those boards. > > https://lore.kernel.org/r/20200114205523.1054271-3-alexander.deucher@amd.com > Bug: https://gitlab.freedesktop.org/drm/amd/issues/1015 > See-also: d28ca864c493 ("PCI: Mark AMD Stoney Radeon R7 GPU ATS as broken") > See-also: 9b44b0b09dec ("PCI: Mark AMD Stoney GPU ATS as broken") > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 4937a088d7d8..fbeb9f73ef28 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -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 */ _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] Adjust AMD GPU ATS quirks 2020-01-15 17:14 ` Bjorn Helgaas @ 2020-01-15 17:26 ` Alex Deucher 2020-01-15 20:17 ` Bjorn Helgaas 0 siblings, 1 reply; 10+ messages in thread From: Alex Deucher @ 2020-01-15 17:26 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: Alex Deucher, Linux PCI, amd-gfx list On Wed, Jan 15, 2020 at 12:14 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Tue, Jan 14, 2020 at 05:41:44PM -0600, Bjorn Helgaas wrote: > > On Tue, Jan 14, 2020 at 03:55:21PM -0500, Alex Deucher wrote: > > > We've root caused the issue and clarified the quirk. > > > This also adds a new quirk for a new GPU. > > > > > > Alex Deucher (2): > > > pci: Clarify ATS quirk > > > pci: add ATS quirk for navi14 board (v2) > > > > > > drivers/pci/quirks.c | 32 +++++++++++++++++++++++++------- > > > 1 file changed, 25 insertions(+), 7 deletions(-) > > > > I propose the following, which I intend to be functionally identical. > > It just doesn't repeat the pci_info() and pdev->ats_cap = 0. > > Applied to pci/misc for v5.6, thanks! Can we add this to stable as well? Alex > > > commit 998c4f7975b0 ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken") > > Author: Bjorn Helgaas <bhelgaas@google.com> > > Date: Tue Jan 14 17:09:28 2020 -0600 > > > > PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken > > > > To account for parts of the chip that are "harvested" (disabled) due to > > silicon flaws, caches on some AMD GPUs must be initialized before ATS is > > enabled. > > > > ATS is normally enabled by the IOMMU driver before the GPU driver loads, so > > this cache initialization would have to be done in a quirk, but that's too > > complex to be practical. > > > > For Navi14 (device ID 0x7340), this initialization is done by the VBIOS, > > but apparently some boards went to production with an older VBIOS that > > doesn't do it. Disable ATS for those boards. > > > > https://lore.kernel.org/r/20200114205523.1054271-3-alexander.deucher@amd.com > > Bug: https://gitlab.freedesktop.org/drm/amd/issues/1015 > > See-also: d28ca864c493 ("PCI: Mark AMD Stoney Radeon R7 GPU ATS as broken") > > See-also: 9b44b0b09dec ("PCI: Mark AMD Stoney GPU ATS as broken") > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > > index 4937a088d7d8..fbeb9f73ef28 100644 > > --- a/drivers/pci/quirks.c > > +++ b/drivers/pci/quirks.c > > @@ -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 */ _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] Adjust AMD GPU ATS quirks 2020-01-15 17:26 ` Alex Deucher @ 2020-01-15 20:17 ` Bjorn Helgaas 2020-01-15 20:20 ` Alex Deucher 0 siblings, 1 reply; 10+ messages in thread From: Bjorn Helgaas @ 2020-01-15 20:17 UTC (permalink / raw) To: Alex Deucher; +Cc: Alex Deucher, Linux PCI, amd-gfx list On Wed, Jan 15, 2020 at 12:26:32PM -0500, Alex Deucher wrote: > On Wed, Jan 15, 2020 at 12:14 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Tue, Jan 14, 2020 at 05:41:44PM -0600, Bjorn Helgaas wrote: > > > On Tue, Jan 14, 2020 at 03:55:21PM -0500, Alex Deucher wrote: > > > > We've root caused the issue and clarified the quirk. > > > > This also adds a new quirk for a new GPU. > > > > > > > > Alex Deucher (2): > > > > pci: Clarify ATS quirk > > > > pci: add ATS quirk for navi14 board (v2) > > > > > > > > drivers/pci/quirks.c | 32 +++++++++++++++++++++++++------- > > > > 1 file changed, 25 insertions(+), 7 deletions(-) > > > > > > I propose the following, which I intend to be functionally identical. > > > It just doesn't repeat the pci_info() and pdev->ats_cap = 0. > > > > Applied to pci/misc for v5.6, thanks! > > Can we add this to stable as well? Done! Do you want it in v5.5? It's pretty localized so looks pretty low-risk. _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] Adjust AMD GPU ATS quirks 2020-01-15 20:17 ` Bjorn Helgaas @ 2020-01-15 20:20 ` Alex Deucher 2020-01-15 22:52 ` Bjorn Helgaas 0 siblings, 1 reply; 10+ messages in thread From: Alex Deucher @ 2020-01-15 20:20 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: Alex Deucher, Linux PCI, amd-gfx list On Wed, Jan 15, 2020 at 3:17 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Wed, Jan 15, 2020 at 12:26:32PM -0500, Alex Deucher wrote: > > On Wed, Jan 15, 2020 at 12:14 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > > On Tue, Jan 14, 2020 at 05:41:44PM -0600, Bjorn Helgaas wrote: > > > > On Tue, Jan 14, 2020 at 03:55:21PM -0500, Alex Deucher wrote: > > > > > We've root caused the issue and clarified the quirk. > > > > > This also adds a new quirk for a new GPU. > > > > > > > > > > Alex Deucher (2): > > > > > pci: Clarify ATS quirk > > > > > pci: add ATS quirk for navi14 board (v2) > > > > > > > > > > drivers/pci/quirks.c | 32 +++++++++++++++++++++++++------- > > > > > 1 file changed, 25 insertions(+), 7 deletions(-) > > > > > > > > I propose the following, which I intend to be functionally identical. > > > > It just doesn't repeat the pci_info() and pdev->ats_cap = 0. > > > > > > Applied to pci/misc for v5.6, thanks! > > > > Can we add this to stable as well? > > Done! Do you want it in v5.5? It's pretty localized so looks pretty > low-risk. Sure. Thanks! Alex _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] Adjust AMD GPU ATS quirks 2020-01-15 20:20 ` Alex Deucher @ 2020-01-15 22:52 ` Bjorn Helgaas 0 siblings, 0 replies; 10+ messages in thread From: Bjorn Helgaas @ 2020-01-15 22:52 UTC (permalink / raw) To: Alex Deucher; +Cc: Alex Deucher, Linux PCI, amd-gfx list On Wed, Jan 15, 2020 at 03:20:18PM -0500, Alex Deucher wrote: > On Wed, Jan 15, 2020 at 3:17 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Wed, Jan 15, 2020 at 12:26:32PM -0500, Alex Deucher wrote: > > > On Wed, Jan 15, 2020 at 12:14 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > > > On Tue, Jan 14, 2020 at 05:41:44PM -0600, Bjorn Helgaas wrote: > > > > > On Tue, Jan 14, 2020 at 03:55:21PM -0500, Alex Deucher wrote: > > > > > > We've root caused the issue and clarified the quirk. > > > > > > This also adds a new quirk for a new GPU. > > > > > > > > > > > > Alex Deucher (2): > > > > > > pci: Clarify ATS quirk > > > > > > pci: add ATS quirk for navi14 board (v2) > > > > > > > > > > > > drivers/pci/quirks.c | 32 +++++++++++++++++++++++++------- > > > > > > 1 file changed, 25 insertions(+), 7 deletions(-) > > > > > > > > > > I propose the following, which I intend to be functionally identical. > > > > > It just doesn't repeat the pci_info() and pdev->ats_cap = 0. > > > > > > > > Applied to pci/misc for v5.6, thanks! > > > > > > Can we add this to stable as well? > > > > Done! Do you want it in v5.5? It's pretty localized so looks pretty > > low-risk. > > Sure. Thanks! Moved to for-linus for v5.5. _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-01-15 22:52 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-01-14 20:55 [PATCH 0/2] Adjust AMD GPU ATS quirks Alex Deucher 2020-01-14 20:55 ` [PATCH 1/2] pci: Clarify ATS quirk Alex Deucher 2020-01-14 20:55 ` [PATCH 2/2] pci: add ATS quirk for navi14 board (v2) Alex Deucher 2020-01-14 23:41 ` [PATCH 0/2] Adjust AMD GPU ATS quirks Bjorn Helgaas 2020-01-15 14:08 ` Deucher, Alexander 2020-01-15 17:14 ` Bjorn Helgaas 2020-01-15 17:26 ` Alex Deucher 2020-01-15 20:17 ` Bjorn Helgaas 2020-01-15 20:20 ` Alex Deucher 2020-01-15 22:52 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).