 @@ -1,14 +1,14 @@
-/*	$NetBSD: xhci.c,v 1.176 2023/04/07 09:39:48 riastradh Exp $	*/
+/*	$NetBSD: xhci.c,v 1.177 2023/04/09 20:41:28 riastradh Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB rev 2.0 and rev 3.1 specification
  *  http://www.usb.org/developers/docs/
  * xHCI rev 1.1 specification
  *  http://www.intel.com/technology/usb/spec.htm
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.176 2023/04/07 09:39:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.177 2023/04/09 20:41:28 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 @@ -690,26 +690,27 @@ xhci_suspend(device_t self, const pmf_qu
 	int port;
 	uint32_t v;
 	usbd_status err;
 	bool ok = false;
 	XHCIHIST_FUNC(); XHCIHIST_CALLED();
 	/*
 	 * Block issuance of new commands, and wait for all pending
 	 * commands to complete.
 	 */
 	mutex_enter(&sc->sc_lock);
 	KASSERT(sc->sc_suspender == NULL);
 	KASSERT(!sc->sc_suspendresume_failed);
 	sc->sc_suspender = curlwp;
 	while (sc->sc_command_addr != 0)
 		cv_wait(&sc->sc_cmdbusy_cv, &sc->sc_lock);
 	mutex_exit(&sc->sc_lock);
 	/*
 	 * Block roothub xfers which might touch portsc registers until
 	 * we're done suspending.
 	 */
 	mutex_enter(&sc->sc_rhlock);
 	/*
 	 * xHCI Requirements Specification 1.2, May 2019, Sec. 4.23.2:
 @@ -885,49 +886,62 @@ xhci_suspend(device_t self, const pmf_qu
 	 *  successfully.'
 	 */
 	if (xhci_op_read_4(sc, XHCI_USBSTS) & XHCI_STS_SRE) {
 		device_printf(self, "suspend error, USBSTS.SRE\n");
 		goto out;
+	}
 	/* Success!  */
 	ok = true;
 out:	mutex_exit(&sc->sc_rhlock);
 	if (!ok) {
 		/*
-		 * If suspend failed, resume command issuance.
+		 * If suspend failed, stop holding up command issuance
 		 * and make it fail instead.
 		 */
 		mutex_enter(&sc->sc_lock);
 		KASSERT(sc->sc_suspender == curlwp);
 		sc->sc_suspender = NULL;
 		sc->sc_suspendresume_failed = true;
 		cv_broadcast(&sc->sc_cmdbusy_cv);
 		mutex_exit(&sc->sc_lock);
+	}
 	return ok;
+}
 bool
 xhci_resume(device_t self, const pmf_qual_t *qual)
+{
 	struct xhci_softc * const sc = device_private(self);
 	size_t i, j, bn, dci;
 	int port;
 	uint32_t v;
 	bool ok = false;
 	XHCIHIST_FUNC(); XHCIHIST_CALLED();
 	/*
 	 * If resume had previously failed, just try again.  Can't make
 	 * things worse, probably.
 	 */
 	mutex_enter(&sc->sc_lock);
 	if (sc->sc_suspendresume_failed) {
 		KASSERT(sc->sc_suspender == NULL);
 		sc->sc_suspender = curlwp;
 		sc->sc_suspendresume_failed = false;
+	}
 	KASSERT(sc->sc_suspender);
 	mutex_exit(&sc->sc_lock);
 	/*
 	 * Block roothub xfers which might touch portsc registers until
 	 * we're done resuming.
 	 */
 	mutex_enter(&sc->sc_rhlock);
 	/*
 	 * xHCI Requirements Specification 1.2, May 2019, Sec. 4.23.2:
 	 * xHCI Power Management, p. 343
 	 * https://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/extensible-host-controler-interface-usb-xhci.pdf#page=343
 	 */
 @@ -1101,26 +1115,27 @@ xhci_resume(device_t self, const pmf_qua
 	/* 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;
 	sc->sc_suspendresume_failed = !ok;
 	cv_broadcast(&sc->sc_cmdbusy_cv);
 	mutex_exit(&sc->sc_lock);
 	mutex_exit(&sc->sc_rhlock);
 	return ok;
+}
 bool
 xhci_shutdown(device_t self, int flags)
+{
 	return false;
+}
 @@ -3207,26 +3222,28 @@ xhci_do_command_locked(struct xhci_softc
 	struct xhci_ring * const cr = sc->sc_cr;
 	usbd_status err;
 	XHCIHIST_FUNC();
 	XHCIHIST_CALLARGS("input: 0x%016jx 0x%08jx 0x%08jx",
 	    trb->trb_0, trb->trb_2, trb->trb_3, 0);
 	KASSERTMSG(!cpu_intr_p() && !cpu_softintr_p(), "called from intr ctx");
 	KASSERT(mutex_owned(&sc->sc_lock));
 	while (sc->sc_command_addr != 0 ||
 	    (sc->sc_suspender != NULL && sc->sc_suspender != curlwp))
 		cv_wait(&sc->sc_cmdbusy_cv, &sc->sc_lock);
 	if (sc->sc_suspendresume_failed)
 		return USBD_IOERROR;
 	/*
 	 * If enqueue pointer points at last of ring, it's Link TRB,
 	 * command TRB will be stored in 0th TRB.
 	 */
 	if (cr->xr_ep == cr->xr_ntrb - 1)
 		sc->sc_command_addr = xhci_ring_trbp(cr, 0);
 	else
 		sc->sc_command_addr = xhci_ring_trbp(cr, cr->xr_ep);
 	sc->sc_resultpending = true;
 	mutex_enter(&cr->xr_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xhcivar.h,v 1.23 2023/04/07 09:39:48 riastradh Exp $	*/
+/*	$NetBSD: xhcivar.h,v 1.24 2023/04/09 20:41:29 riastradh Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -130,26 +130,27 @@ struct xhci_softc {
 	usb_dma_t sc_eventst_dma;
 	usb_dma_t sc_dcbaa_dma;
 	usb_dma_t sc_spbufarray_dma;
 	usb_dma_t *sc_spbuf_dma;
 	kcondvar_t sc_cmdbusy_cv;
 	kcondvar_t sc_command_cv;
 	bus_addr_t sc_command_addr;
 	struct xhci_soft_trb sc_result_trb;
 	bool sc_resultpending;
 	bool sc_dying;
 	bool sc_suspendresume_failed;
 	struct lwp *sc_suspender;
 	void (*sc_vendor_init)(struct xhci_softc *);
 	int (*sc_vendor_port_status)(struct xhci_softc *, uint32_t, int);
 	int sc_quirks;
 #define XHCI_QUIRK_INTEL	__BIT(0) /* Intel xhci chip */
 #define XHCI_DEFERRED_START	__BIT(1)
 	uint32_t sc_hcc;		/* copy of HCCPARAMS1 */
 	uint32_t sc_hcc2;		/* copy of HCCPARAMS2 */
 	struct xhci_registers {
 		uint32_t	usbcmd;