On Thu, Aug 15, 2024 at 11:17:06AM -0600, Mark Kettenis wrote: > CVSROOT: /cvs > Module name: src > Changes by: kette...@cvs.openbsd.org 2024/08/15 11:17:06 > > Modified files: > sys/dev/usb : xhci.c xhcivar.h > > Log message: > Upon resume, restore the saved state. Newer Intel xHCI controller (e.g. > those on Meteor Lake) need this, otherwise the ports are dead after > resume. > > ok mglocker@, deraadt@
This seems to break USB (e.g: webcam) on resume for my old AMD laptop: xhci0 at pci2 dev 0 function 3 "AMD 17h/1xh xHCI" rev 0x00: msix, xHCI 1.10 ... ugen0 detached uhub0 detached video0 detached uvideo0 detached uhub1 detached uhub0 at usb0 configuration 1 interface 0 "AMD xHCI root hub" rev 3.00/1.00 addr 1 uhub1 at usb1 configuration 1 interface 0 "AMD xHCI root hub" rev 3.00/1.00 addr 1 dwiic1: timed out waiting for stop intr uhub0: device problem, disabling port 2 uhub1: device problem, disabling port 1 wakeups: 0 1 wakeup event: unknown Reverting this change fixes it. ugen0 detached uhub0 detached video0 detached uvideo0 detached uhub1 detached uhub0 at usb0 configuration 1 interface 0 "AMD xHCI root hub" rev 3.00/1.00 addr 1 uhub1 at usb1 configuration 1 interface 0 "AMD xHCI root hub" rev 3.00/1.00 addr 1 ugen0 at uhub0 port 2 "Intel Bluetooth" rev 2.00/0.10 addr 2 dwiic1: timed out waiting for stop intr uvideo0 at uhub1 port 1 configuration 1 interface 0 "SunplusIT Inc hm1091_techfront" rev 2.00/0.13 addr 2 video0 at uvideo0 wakeups: 0 1 wakeup event: unknown
