From d8772220f3cd4b9c8ab2f6a0e78b4f63f814b14b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 26 Jul 2021 11:36:13 +0200 Subject: [PATCH] 5.10-stable patches added patches: pci-mark-amd-navi14-gpu-ats-as-broken.patch --- ...ci-mark-amd-navi14-gpu-ats-as-broken.patch | 51 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 52 insertions(+) create mode 100644 queue-5.10/pci-mark-amd-navi14-gpu-ats-as-broken.patch diff --git a/queue-5.10/pci-mark-amd-navi14-gpu-ats-as-broken.patch b/queue-5.10/pci-mark-amd-navi14-gpu-ats-as-broken.patch new file mode 100644 index 00000000000..329a9220c40 --- /dev/null +++ b/queue-5.10/pci-mark-amd-navi14-gpu-ats-as-broken.patch @@ -0,0 +1,51 @@ +From foo@baz Mon Jul 26 11:34:14 AM CEST 2021 +From: Evan Quan +Date: Wed, 2 Jun 2021 10:12:55 +0800 +Subject: PCI: Mark AMD Navi14 GPU ATS as broken + +From: Evan Quan + +commit e8946a53e2a698c148b3b3ed732f43c7747fbeb6 upstream + +Observed unexpected GPU hang during runpm stress test on 0x7341 rev 0x00. +Further debugging shows broken ATS is related. + +Disable ATS on this part. Similar issues on other devices: + + a2da5d8cc0b0 ("PCI: Mark AMD Raven iGPU ATS as broken in some platforms") + 45beb31d3afb ("PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken") + 5e89cd303e3a ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken") + +Suggested-by: Alex Deucher +Link: https://lore.kernel.org/r/20210602021255.939090-1-evan.quan@amd.com +Signed-off-by: Evan Quan +Signed-off-by: Bjorn Helgaas +Reviewed-by: Krzysztof Wilczyński +Cc: stable@vger.kernel.org +[sudip: adjust context] +Signed-off-by: Sudip Mukherjee +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/quirks.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -5264,7 +5264,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SE + static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) + { + if ((pdev->device == 0x7312 && pdev->revision != 0x00) || +- (pdev->device == 0x7340 && pdev->revision != 0xc5)) ++ (pdev->device == 0x7340 && pdev->revision != 0xc5) || ++ (pdev->device == 0x7341 && pdev->revision != 0x00)) + return; + + pci_info(pdev, "disabling ATS\n"); +@@ -5279,6 +5280,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + 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); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7341, quirk_amd_harvest_no_ats); + #endif /* CONFIG_PCI_ATS */ + + /* Freescale PCIe doesn't support MSI in RC mode */ diff --git a/queue-5.10/series b/queue-5.10/series index 8a1be1d52ce..28366d64315 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -158,3 +158,4 @@ drm-return-enotty-for-non-drm-ioctls.patch drm-amdgpu-update-golden-setting-for-sienna_cichlid.patch net-dsa-mv88e6xxx-enable-serdes-rx-stats-for-topaz.patch net-dsa-mv88e6xxx-enable-serdes-pcs-register-dump-via-ethtool-d-on-topaz.patch +pci-mark-amd-navi14-gpu-ats-as-broken.patch -- 2.47.3