Skip to contentSkip to conversation

PCI: Add quirk for AMD Navi14 to disable ATS support

PATCH Applied Evan Quan 2 participants 4 messages Jun 2, 2021 – Jun 7, 2021 PCI

lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH v3 1/1 PCI: Add quirk for AMD Navi14 to disable ATS support

Unexpected GPU hang was observed during runpm stress test on 0x7341 rev 0x00. Further debugging shows broken ATS is related. Thus as a followup of commit 5e89cd303e3a ("PCI:
Mark AMD Navi14 GPU rev 0xc5 ATS as broken"), we disable the ATS for the specific SKU also.

---
ChangeLog v2->v3:
- further update for description part(suggested by Krzysztof) ChangeLog v1->v2:
- cosmetic fix for description part(suggested by Krzysztof)

---
 drivers/pci/quirks.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/quirks.c +3 -1
index b7e19bbb901a..70803ad6d2ac 100644
@@ -5176,7 +5176,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 == 0x7312 && pdev->revision != 0x00) ||
-	    (pdev->device == 0x7340 && pdev->revision != 0xc5))
+	    (pdev->device == 0x7340 && pdev->revision != 0xc5) ||
+	    (pdev->device == 0x7341 && pdev->revision != 0x00))
 		return;
 
 	if (pdev->device == 0x15d8) {
@@ -5203,6 +5204,7 @@ 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);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7341, 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 */
Signature · 1 line
2.29.0
Reviewed-by Krzysztof Wilczyński on v3 1/1 Applied
#1 lore raw
Quoted 9 lines · Evan Quan

Unexpected GPU hang was observed during runpm stress test on 0x7341 rev 0x00. Further debugging shows broken ATS is related. Thus as a followup of commit 5e89cd303e3a ("PCI:
Mark AMD Navi14 GPU rev 0xc5 ATS as broken"), we disable the ATS for the specific SKU also.

Applied to pci/virtualization for v5.14, thanks.

I updated the commit log like this:

PCI: Mark AMD Navi14 GPU ATS as broken

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")

Quoted 34 lines

---
ChangeLog v2->v3:
- further update for description part(suggested by Krzysztof) ChangeLog v1->v2:
- cosmetic fix for description part(suggested by Krzysztof)

---
 drivers/pci/quirks.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/quirks.c +3 -1
index b7e19bbb901a..70803ad6d2ac 100644
@@ -5176,7 +5176,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 == 0x7312 && pdev->revision != 0x00) ||
-	    (pdev->device == 0x7340 && pdev->revision != 0xc5))
+	    (pdev->device == 0x7340 && pdev->revision != 0xc5) ||
+	    (pdev->device == 0x7341 && pdev->revision != 0x00))
 		return;
 
 	if (pdev->device == 0x15d8) {
@@ -5203,6 +5204,7 @@ 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);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7341, 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 */
Signature · 1 line
2.29.0
author
#2 lore raw

[AMD Official Use Only]

Thanks Bjorn.
@Deucher, Alexander can you advise whether this is needed for stable kernel branches and which branches if yes?

BR
Evan

Quoted 91 lines

-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Saturday, June 5, 2021 4:59 AM
To: Quan, Evan <[email protected]>
Cc: [email protected]; [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH V3] PCI: Add quirk for AMD Navi14 to disable ATS support

Quoted 9 lines · Evan Quan

Unexpected GPU hang was observed during runpm stress test on 0x7341 rev 0x00. Further debugging shows broken ATS is related. Thus as a followup of commit 5e89cd303e3a ("PCI:
Mark AMD Navi14 GPU rev 0xc5 ATS as broken"), we disable the ATS for the specific SKU also.

Applied to pci/virtualization for v5.14, thanks.

I updated the commit log like this:

PCI: Mark AMD Navi14 GPU ATS as broken

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 <[email protected]>
    Link:

https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.
kernel.org%2Fr%2F20210602021255.939090-1- evan.quan%40amd.com&amp;data=04%7C01%7Cevan.quan%40amd.com%7 C2999a40d134142c2fdd608d9279b9ddb%7C3dd8961fe4884e608e11a82d994e 183d%7C0%7C0%7C637584371596788532%7CUnknown%7CTWFpbGZsb3d8ey JWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% 7C1000&amp;sdata=%2BgYq6SPJNCgqj%2By%2BLzkAGjmm5TONhApdYlze% 2FFz%2FiUM%3D&amp;reserved=0

Quoted 15 lines

---
ChangeLog v2->v3:
- further update for description part(suggested by Krzysztof) ChangeLog v1->v2:
- cosmetic fix for description part(suggested by Krzysztof)

---
 drivers/pci/quirks.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/quirks.c index renamed from drivers/pci/quirks.c +0 -0

b7e19bbb901a..70803ad6d2ac 100644

drivers/pci/quirks.c +0 -0
@@ -5176,7 +5176,8 @@
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422,
Quoted 1 line

quirk_no_ext_tags); static void quirk_amd_harvest_no_ats(struct pci_dev

*pdev) {

drivers/pci/quirks.c

Quoted 8 lines
drivers/pci/quirks.c +2 -1
 	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;
 
 	if (pdev->device == 0x15d8) {
@@ -5203,6 +5204,7 @@

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI,

Quoted 14 lines
drivers/pci/quirks.c +2 -0
 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);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7341,
+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 */ --
2.29.0

#3 lore raw
Quoted 4 lines · Evan

[AMD Official Use Only]

Thanks Bjorn.
@Deucher, Alexander can you advise whether this is needed for stable kernel branches and which branches if yes?

Sorry, I should have done this already. I went ahead and marked it for stable.

Quoted 91 lines
Quoted 91 lines

-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Saturday, June 5, 2021 4:59 AM
To: Quan, Evan <[email protected]>
Cc: [email protected]; [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH V3] PCI: Add quirk for AMD Navi14 to disable ATS support

Quoted 9 lines · Evan Quan

Unexpected GPU hang was observed during runpm stress test on 0x7341 rev 0x00. Further debugging shows broken ATS is related. Thus as a followup of commit 5e89cd303e3a ("PCI:
Mark AMD Navi14 GPU rev 0xc5 ATS as broken"), we disable the ATS for the specific SKU also.

Applied to pci/virtualization for v5.14, thanks.

I updated the commit log like this:

PCI: Mark AMD Navi14 GPU ATS as broken

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 <[email protected]>
    Link:

https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.
kernel.org%2Fr%2F20210602021255.939090-1- evan.quan%40amd.com&amp;data=04%7C01%7Cevan.quan%40amd.com%7 C2999a40d134142c2fdd608d9279b9ddb%7C3dd8961fe4884e608e11a82d994e 183d%7C0%7C0%7C637584371596788532%7CUnknown%7CTWFpbGZsb3d8ey JWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% 7C1000&amp;sdata=%2BgYq6SPJNCgqj%2By%2BLzkAGjmm5TONhApdYlze% 2FFz%2FiUM%3D&amp;reserved=0

Quoted 15 lines

---
ChangeLog v2->v3:
- further update for description part(suggested by Krzysztof) ChangeLog v1->v2:
- cosmetic fix for description part(suggested by Krzysztof)

---
 drivers/pci/quirks.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/quirks.c index renamed from drivers/pci/quirks.c +0 -0

b7e19bbb901a..70803ad6d2ac 100644

drivers/pci/quirks.c +0 -0
@@ -5176,7 +5176,8 @@
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422,
Quoted 1 line

quirk_no_ext_tags); static void quirk_amd_harvest_no_ats(struct pci_dev

*pdev) {

drivers/pci/quirks.c

Quoted 8 lines
drivers/pci/quirks.c +2 -1
 	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;
 
 	if (pdev->device == 0x15d8) {
@@ -5203,6 +5204,7 @@

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI,

Quoted 14 lines
drivers/pci/quirks.c +2 -0
 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);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7341,
+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 */ --
2.29.0