Module Name: src
Committed By: riastradh
Date: Tue Sep 13 10:15:29 UTC 2022
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
xhci(4): Resume commands even if USBSTS.SRE is set.
Commands might not work after this but let's at least not deadlock --
give them an opportunity to time out or fail.
XXX Maybe set sc_dying here to skip the timeout.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.169 src/sys/dev/usb/xhci.c:1.170
--- src/sys/dev/usb/xhci.c:1.169 Thu Sep 1 18:09:45 2022
+++ src/sys/dev/usb/xhci.c Tue Sep 13 10:15:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.169 2022/09/01 18:09:45 riastradh Exp $ */
+/* $NetBSD: xhci.c,v 1.170 2022/09/13 10:15:28 riastradh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.169 2022/09/01 18:09:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.170 2022/09/13 10:15:28 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1103,17 +1103,22 @@ xhci_resume(device_t self, const pmf_qua
goto out;
}
- /* Resume command issuance. */
+ /* Success! */
+ ok = true;
+
+out: /*
+ * Resume command issuance. If the hardware failed to resume,
+ * well, tough -- deadlocking because everything is held up on
+ * the suspension, with no opportunity to detach, isn't better
+ * than timing out waiting for dead hardware.
+ */
mutex_enter(&sc->sc_lock);
KASSERT(sc->sc_suspender);
sc->sc_suspender = NULL;
cv_broadcast(&sc->sc_cmdbusy_cv);
mutex_exit(&sc->sc_lock);
- /* Success! */
- ok = true;
-
-out: mutex_exit(&sc->sc_rhlock);
+ mutex_exit(&sc->sc_rhlock);
return ok;
}
