From: James Hastings <moosetek4@gmail.com>
Subject: xhci(4): Fix broken CSS on AMD 17h/6xh
To: moosetek4@gmail.com,tech@openbsd.org
Date: Mon, 16 Jun 2025 08:34:39 -0400

The xHCI controller save state (CSS/CRS) is broken on AMD 17h/6xh and hangs the
system during resume.

ok?

Index: dev/pci/xhci_pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/xhci_pci.c,v
retrieving revision 1.14
diff -u -p -r1.14 xhci_pci.c
--- dev/pci/xhci_pci.c	17 Aug 2024 01:55:03 -0000	1.14
+++ dev/pci/xhci_pci.c	16 Jun 2025 00:04:05 -0000
@@ -153,7 +153,8 @@ xhci_pci_attach(struct device *parent, s
 		break;
 	case PCI_VENDOR_AMD:
 		if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_17_1X_XHCI_1 ||
-		    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_17_1X_XHCI_2)
+		    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_17_1X_XHCI_2 ||
+		    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_17_6X_XHCI)
 			psc->sc.sc_flags |= XHCI_NOCSS;
 		break;
 	}