XPS 13 9370 USB-C ports stop working after hibernate.

[jroth]

I have a Dell XPS 13 9370, which doesn't have a Gentoo Wiki page yet, so I followed the wiki page for the 9360 model to get it set up. Specifically, I did these kernel options to make the USB-C ports on the left side (which double as charge ports) work.

And they mostly do work - until I hibernate the machine. When I wake it up from hibernation, often (but not always) the left side USB-C ports don't work as USB ports - keyboards, mice, and USB-A adapters plugged into them won't work anymore, although they continue to work as charge ports. Once they stop working I won't even see USB connect/disconnect events on those ports when I watch in dmesg.

Does anyone know how to diagnose/fix this?