 @@ -1,14 +1,14 @@
-/*	$NetBSD: xhci.c,v 1.28.2.64 2016/04/10 21:30:41 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.28.2.65 2016/04/10 22:16:00 skrll 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.
 @@ -26,27 +26,27 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB rev 3.1 specification
  *  http://www.usb.org/developers/docs/usb_31_040315.zip
  * USB rev 2.0 specification
  *  http://www.usb.org/developers/docs/usb20_docs/usb_20_031815.zip
  * xHCI rev 1.1 specification
  *  http://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/extensible-host-controler-interface-usb-xhci.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.64 2016/04/10 21:30:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.65 2016/04/10 22:16:00 skrll Exp $");
 #include "opt_usb.h"
 #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>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 @@ -136,28 +136,26 @@ static usbd_status xhci_new_device(devic
     struct usbd_port *);
 static int xhci_roothub_ctrl(struct usbd_bus *, usb_device_request_t *,
     void *, int);
 static usbd_status xhci_configure_endpoint(struct usbd_pipe *);
 //static usbd_status xhci_unconfigure_endpoint(struct usbd_pipe *);
 static usbd_status xhci_reset_endpoint(struct usbd_pipe *);
 static usbd_status xhci_stop_endpoint(struct usbd_pipe *);
 static usbd_status xhci_set_dequeue(struct usbd_pipe *);
 static usbd_status xhci_do_command(struct xhci_softc * const,
     struct xhci_trb * const, int);
 static usbd_status xhci_do_command1(struct xhci_softc * const,
     struct xhci_trb * const, int, int);
 static usbd_status xhci_do_command_locked(struct xhci_softc * const,
     struct xhci_trb * const, int);
 static usbd_status xhci_init_slot(struct usbd_device *, uint32_t, uint32_t, int);
 static usbd_status xhci_enable_slot(struct xhci_softc * const,
     uint8_t * const);
 static usbd_status xhci_disable_slot(struct xhci_softc * const, uint8_t);
 static usbd_status xhci_address_device(struct xhci_softc * const,
     uint64_t, uint8_t, bool);
 static void xhci_set_dcba(struct xhci_softc * const, uint64_t, int);
 static usbd_status xhci_update_ep0_mps(struct xhci_softc * const,
     struct xhci_slot * const, u_int);
 static usbd_status xhci_ring_init(struct xhci_softc * const,
     struct xhci_ring * const, size_t, size_t);
 @@ -2465,40 +2463,38 @@ xhci_ring_put(struct xhci_softc * const
 	xr->xr_cs = cs;
 	DPRINTFN(12, "%p xr_ep 0x%x xr_cs %u", xr, xr->xr_ep, xr->xr_cs, 0);
+}
 /*
  * Put a command on command ring, ring bell, set timer, and cv_timedwait.
  * Command completion is notified by cv_signal from xhci_handle_event
  * (called from interrupt from xHCI), or timed-out.
  * Command validation is performed in xhci_handle_event by checking if
  * trb_0 in CMD_COMPLETE TRB and sc->sc_command_addr are identical.
  */
 static usbd_status
-xhci_do_command1(struct xhci_softc * const sc, struct xhci_trb * const trb,
+xhci_do_command_locked(struct xhci_softc * const sc, struct xhci_trb * const trb,
-    int timeout, int locked)
+    int timeout)
+{
 	struct xhci_ring * const cr = &sc->sc_cr;
 	usbd_status err;
 	XHCIHIST_FUNC(); XHCIHIST_CALLED();
 	DPRINTFN(12, "input: 0x%016"PRIx64" 0x%08"PRIx32" 0x%08"PRIx32,
 	    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));
 	if (!locked)
 		mutex_enter(&sc->sc_lock);
 	/* XXX KASSERT may fire when cv_timedwait unlocks sc_lock */
 	KASSERT(sc->sc_command_addr == 0);
 	sc->sc_command_addr = xhci_ring_trbp(cr, cr->xr_ep);
 	mutex_enter(&cr->xr_lock);
 	xhci_ring_put(sc, cr, NULL, trb, 1);
 	mutex_exit(&cr->xr_lock);
 	xhci_db_write_4(sc, XHCI_DOORBELL(0), 0);
 	if (cv_timedwait(&sc->sc_command_cv, &sc->sc_lock,
 	    MAX(1, mstohz(timeout))) == EWOULDBLOCK) {
 @@ -2518,48 +2514,39 @@ xhci_do_command1(struct xhci_softc * con
 		err = USBD_NORMAL_COMPLETION;
 		break;
 	default:
 	case 192 ... 223:
 		err = USBD_IOERROR;
 		break;
 	case 224 ... 255:
 		err = USBD_NORMAL_COMPLETION;
 		break;
+	}
 timedout:
 	sc->sc_command_addr = 0;
 	if (!locked)
 		mutex_exit(&sc->sc_lock);
 	return err;
+}
 static usbd_status
 xhci_do_command(struct xhci_softc * const sc, struct xhci_trb * const trb,
     int timeout)
+{
 	return xhci_do_command1(sc, trb, timeout, 0);
-/*
+	mutex_enter(&sc->sc_lock);
- * This allows xhci_do_command with already sc_lock held.
+	int ret = xhci_do_command_locked(sc, trb, timeout);
- * This is needed as USB stack calls close methods with sc_lock_held.
+	mutex_exit(&sc->sc_lock);
  * (see usbdivar.h)
- */
+	return ret;
 static usbd_status
 xhci_do_command_locked(struct xhci_softc * const sc,
     struct xhci_trb * const trb, int timeout)
 	return xhci_do_command1(sc, trb, timeout, 1);
+}
 static usbd_status
 xhci_enable_slot(struct xhci_softc * const sc, uint8_t * const slotp)
+{
 	struct xhci_trb trb;
 	usbd_status err;
 	XHCIHIST_FUNC(); XHCIHIST_CALLED();
 	trb.trb_0 = 0;
 	trb.trb_2 = 0;
 	trb.trb_3 = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_ENABLE_SLOT);