 @@ -1,23 +1,24 @@
-/*	$NetBSD: uhci.c,v 1.240.6.1 2011/12/04 13:23:17 jmcneill Exp $	*/
+/*	$NetBSD: uhci.c,v 1.240.6.1.2.1 2011/12/08 08:56:57 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 /*
- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2004, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca)
  * and Matthew R. Green.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 @@ -32,34 +33,34 @@
  */
 /*
  * USB Universal Host Controller driver.
  * Handles e.g. PIIX3 and PIIX4.
+ *
  * UHCI spec: http://www.intel.com/technology/usb/spec.htm
  * USB spec: http://www.usb.org/developers/docs/
  * PIIXn spec: ftp://download.intel.com/design/intarch/datashts/29055002.pdf
  *             ftp://download.intel.com/design/intarch/datashts/29056201.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.1 2011/12/04 13:23:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.1.2.1 2011/12/08 08:56:57 mrg Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/extent.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <machine/endian.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 @@ -161,26 +162,28 @@ Static void		uhci_remove_ls_ctrl(uhci_so
 Static void		uhci_remove_hs_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_remove_bulk(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_add_loop(uhci_softc_t *sc);
 Static void		uhci_rem_loop(uhci_softc_t *sc);
 Static usbd_status	uhci_setup_isoc(usbd_pipe_handle pipe);
 Static void		uhci_device_isoc_enter(usbd_xfer_handle);
 Static usbd_status	uhci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
 Static void		uhci_freem(struct usbd_bus *, usb_dma_t *);
 Static usbd_xfer_handle	uhci_allocx(struct usbd_bus *);
 Static void		uhci_freex(struct usbd_bus *, usbd_xfer_handle);
 Static void		uhci_get_locks(struct usbd_bus *, kmutex_t **,
 				       kmutex_t **);
 Static usbd_status	uhci_device_ctrl_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_device_ctrl_start(usbd_xfer_handle);
 Static void		uhci_device_ctrl_abort(usbd_xfer_handle);
 Static void		uhci_device_ctrl_close(usbd_pipe_handle);
 Static void		uhci_device_ctrl_done(usbd_xfer_handle);
 Static usbd_status	uhci_device_intr_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_device_intr_start(usbd_xfer_handle);
 Static void		uhci_device_intr_abort(usbd_xfer_handle);
 Static void		uhci_device_intr_close(usbd_pipe_handle);
 Static void		uhci_device_intr_done(usbd_xfer_handle);
 @@ -271,88 +274,88 @@ UREAD4(uhci_softc_t *sc, bus_size_t r)
 	return bus_space_read_4(sc->iot, sc->ioh, r);
+}
 #define UHCICMD(sc, cmd) UWRITE2(sc, UHCI_CMD, cmd)
 #define UHCISTS(sc) UREAD2(sc, UHCI_STS)
 #define UHCI_RESET_TIMEOUT 100	/* ms, reset timeout */
 #define UHCI_CURFRAME(sc) (UREAD2(sc, UHCI_FRNUM) & UHCI_FRNUM_MASK)
 #define UHCI_INTR_ENDPT 1
 const struct usbd_bus_methods uhci_bus_methods = {
-	uhci_open,
+	.open_pipe =	uhci_open,
-	uhci_softintr,
+	.soft_intr =	uhci_softintr,
-	uhci_poll,
+	.do_poll =	uhci_poll,
-	uhci_allocm,
+	.allocm =	uhci_allocm,
-	uhci_freem,
+	.freem =	uhci_freem,
-	uhci_allocx,
+	.allocx =	uhci_allocx,
-	uhci_freex,
+	.freex =	uhci_freex,
-	NULL, /* uhci_get_locks */
+	.get_locks =	uhci_get_locks,
 };
 const struct usbd_pipe_methods uhci_root_ctrl_methods = {
-	uhci_root_ctrl_transfer,
+	.transfer =	uhci_root_ctrl_transfer,
-	uhci_root_ctrl_start,
+	.start =	uhci_root_ctrl_start,
-	uhci_root_ctrl_abort,
+	.abort =	uhci_root_ctrl_abort,
-	uhci_root_ctrl_close,
+	.close =	uhci_root_ctrl_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_root_ctrl_done,
+	.done =		uhci_root_ctrl_done,
 };
 const struct usbd_pipe_methods uhci_root_intr_methods = {
-	uhci_root_intr_transfer,
+	.transfer =	uhci_root_intr_transfer,
-	uhci_root_intr_start,
+	.start =	uhci_root_intr_start,
-	uhci_root_intr_abort,
+	.abort =	uhci_root_intr_abort,
-	uhci_root_intr_close,
+	.close =	uhci_root_intr_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_root_intr_done,
+	.done =		uhci_root_intr_done,
 };
 const struct usbd_pipe_methods uhci_device_ctrl_methods = {
-	uhci_device_ctrl_transfer,
+	.transfer =	uhci_device_ctrl_transfer,
-	uhci_device_ctrl_start,
+	.start =	uhci_device_ctrl_start,
-	uhci_device_ctrl_abort,
+	.abort =	uhci_device_ctrl_abort,
-	uhci_device_ctrl_close,
+	.close =	uhci_device_ctrl_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_device_ctrl_done,
+	.done =		uhci_device_ctrl_done,
 };
 const struct usbd_pipe_methods uhci_device_intr_methods = {
-	uhci_device_intr_transfer,
+	.transfer =	uhci_device_intr_transfer,
-	uhci_device_intr_start,
+	.start =	uhci_device_intr_start,
-	uhci_device_intr_abort,
+	.abort =	uhci_device_intr_abort,
-	uhci_device_intr_close,
+	.close =	uhci_device_intr_close,
-	uhci_device_clear_toggle,
+	.cleartoggle =	uhci_device_clear_toggle,
-	uhci_device_intr_done,
+	.done =		uhci_device_intr_done,
 };
 const struct usbd_pipe_methods uhci_device_bulk_methods = {
-	uhci_device_bulk_transfer,
+	.transfer =	uhci_device_bulk_transfer,
-	uhci_device_bulk_start,
+	.start =	uhci_device_bulk_start,
-	uhci_device_bulk_abort,
+	.abort =	uhci_device_bulk_abort,
-	uhci_device_bulk_close,
+	.close =	uhci_device_bulk_close,
-	uhci_device_clear_toggle,
+	.cleartoggle =	uhci_device_clear_toggle,
-	uhci_device_bulk_done,
+	.done =		uhci_device_bulk_done,
 };
 const struct usbd_pipe_methods uhci_device_isoc_methods = {
-	uhci_device_isoc_transfer,
+	.transfer =	uhci_device_isoc_transfer,
-	uhci_device_isoc_start,
+	.start =	uhci_device_isoc_start,
-	uhci_device_isoc_abort,
+	.abort =	uhci_device_isoc_abort,
-	uhci_device_isoc_close,
+	.close =	uhci_device_isoc_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_device_isoc_done,
+	.done =		uhci_device_isoc_done,
 };
 #define uhci_add_intr_info(sc, ii) \
 	LIST_INSERT_HEAD(&(sc)->sc_intrhead, (ii), list)
 #define uhci_del_intr_info(ii) \
 	do { \
 		LIST_REMOVE((ii), list); \
 		(ii)->list.le_prev = NULL; \
 	} while (0)
 #define uhci_active_intr_info(ii) ((ii)->list.le_prev != NULL)
 static inline uhci_soft_qh_t *
 uhci_find_prev_qh(uhci_soft_qh_t *pqh, uhci_soft_qh_t *sqh)
 @@ -513,27 +516,31 @@ uhci_init(uhci_softc_t *sc)
 		     j < UHCI_FRAMELIST_COUNT;
 		     j += UHCI_VFRAMELIST_COUNT)
 			sc->sc_pframes[j] = htole32(std->physaddr);
+	}
 	usb_syncmem(&sc->sc_dma, 0,
 	    UHCI_FRAMELIST_COUNT * sizeof(uhci_physaddr_t),
 	    BUS_DMASYNC_PREWRITE);
 	LIST_INIT(&sc->sc_intrhead);
 	SIMPLEQ_INIT(&sc->sc_free_xfers);
-	callout_init(&sc->sc_poll_handle, 0);
+	callout_init(&sc->sc_poll_handle, CALLOUT_MPSAFE);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "uhciab");
 	/* Set up the bus struct. */
 	sc->sc_bus.methods = &uhci_bus_methods;
 	sc->sc_bus.pipe_size = sizeof(struct uhci_pipe);
 	UHCICMD(sc, UHCI_CMD_MAXP); /* Assume 64 byte packets at frame end */
 	DPRINTFN(1,("uhci_init: enabling\n"));
 	err =  uhci_run(sc, 1);		/* and here we go... */
 	UWRITE2(sc, UHCI_INTR, UHCI_INTR_TOCRCIE | UHCI_INTR_RIE |
 		UHCI_INTR_IOCE | UHCI_INTR_SPIE);	/* enable interrupts */
 	return err;
 @@ -570,67 +577,73 @@ uhci_detach(struct uhci_softc *sc, int f
 	if (sc->sc_child != NULL)
 		rv = config_detach(sc->sc_child, flags);
 	if (rv != 0)
 		return (rv);
 	/* Free all xfers associated with this HC. */
 	for (;;) {
 		xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 		if (xfer == NULL)
 			break;
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
-		free(xfer, M_USB);
+		kmem_free(xfer, sizeof(struct uhci_xfer));
+	}
 	callout_halt(&sc->sc_poll_handle, NULL);
 	callout_destroy(&sc->sc_poll_handle);
 	cv_destroy(&sc->sc_softwake_cv);
 	mutex_destroy(&sc->sc_lock);
 	mutex_destroy(&sc->sc_intr_lock);
 	/* XXX free other data structures XXX */
 	return (rv);
+}
 usbd_status
 uhci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size)
+{
 	struct uhci_softc *sc = bus->hci_private;
 	usbd_status status;
 	u_int32_t n;
 	/*
 	 * XXX
 	 * Since we are allocating a buffer we can assume that we will
 	 * need TDs for it.  Since we don't want to allocate those from
 	 * an interrupt context, we allocate them here and free them again.
 	 * This is no guarantee that we'll get the TDs next time...
 	 */
 	n = size / 8;
 	if (n > 16) {
 		u_int32_t i;
 		uhci_soft_td_t **stds;
 		DPRINTF(("uhci_allocm: get %d TDs\n", n));
-		stds = malloc(sizeof(uhci_soft_td_t *) * n, M_TEMP,
+		stds = kmem_alloc(sizeof(uhci_soft_td_t *) * n, KM_SLEEP);
-		    M_WAITOK|M_ZERO);
+		if (!stds)
-		for(i=0; i < n; i++)
+			return USBD_NOMEM;
 		for(i = 0; i < n; i++)
 			stds[i] = uhci_alloc_std(sc);
-		for(i=0; i < n; i++)
+		for(i = 0; i < n; i++)
 			if (stds[i] != NULL)
 				uhci_free_std(sc, stds[i]);
-		free(stds, M_TEMP);
+		kmem_free(stds, sizeof(uhci_soft_td_t *) * n);
+	}
 	status = usb_allocmem(&sc->sc_bus, size, 0, dma);
 	if (status == USBD_NOMEM)
 		status = usb_reserve_allocm(&sc->sc_dma_reserve, dma, size);
 	return status;
+}
 void
 uhci_freem(struct usbd_bus *bus, usb_dma_t *dma)
+{
 	if (dma->block->flags & USB_DMA_RESERVE) {
 		usb_reserve_freem(&((struct uhci_softc *)bus)->sc_dma_reserve,
 		    dma);
 		return;
 @@ -644,27 +657,27 @@ uhci_allocx(struct usbd_bus *bus)
 	struct uhci_softc *sc = bus->hci_private;
 	usbd_xfer_handle xfer;
 	xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 	if (xfer != NULL) {
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 #ifdef DIAGNOSTIC
 		if (xfer->busy_free != XFER_FREE) {
 			printf("uhci_allocx: xfer=%p not free, 0x%08x\n", xfer,
 			       xfer->busy_free);
+		}
 #endif
 	} else {
-		xfer = malloc(sizeof(struct uhci_xfer), M_USB, M_NOWAIT);
+		xfer = kmem_alloc(sizeof(struct uhci_xfer), KM_SLEEP);
+	}
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof (struct uhci_xfer));
 		UXFER(xfer)->iinfo.sc = sc;
 #ifdef DIAGNOSTIC
 		UXFER(xfer)->iinfo.isdone = 1;
 		xfer->busy_free = XFER_BUSY;
 #endif
+	}
 	return (xfer);
+}
 void
 @@ -675,41 +688,50 @@ uhci_freex(struct usbd_bus *bus, usbd_xf
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_BUSY) {
 		printf("uhci_freex: xfer=%p not busy, 0x%08x\n", xfer,
 		       xfer->busy_free);
+	}
 	xfer->busy_free = XFER_FREE;
 	if (!UXFER(xfer)->iinfo.isdone) {
 		printf("uhci_freex: !isdone\n");
+	}
 #endif
 	SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
+}
 Static void
 uhci_get_locks(struct usbd_bus *bus, kmutex_t **intr, kmutex_t **thread)
+{
 	struct uhci_softc *sc = bus->hci_private;
 	*intr = &sc->sc_intr_lock;
 	*thread = &sc->sc_lock;
+}
 /*
  * Handle suspend/resume.
+ *
  * We need to switch to polling mode here, because this routine is
  * called from an interrupt context.  This is all right since we
  * are almost suspended anyway.
  */
 bool
 uhci_resume(device_t dv, const pmf_qual_t *qual)
+{
 	uhci_softc_t *sc = device_private(dv);
 	int cmd;
 	int s;
-	s = splhardusb();
+	mutex_spin_enter(&sc->sc_intr_lock);
 	cmd = UREAD2(sc, UHCI_CMD);
 	sc->sc_bus.use_polling++;
 	UWRITE2(sc, UHCI_INTR, 0);
 	uhci_globalreset(sc);
 	uhci_reset(sc);
 	if (cmd & UHCI_CMD_RS)
 		uhci_run(sc, 0);
 	/* restore saved state */
 	UWRITE4(sc, UHCI_FLBASEADDR, DMAADDR(&sc->sc_dma, 0));
 	UWRITE2(sc, UHCI_FRNUM, sc->sc_saved_frnum);
 	UWRITE1(sc, UHCI_SOF, sc->sc_saved_sof);
 @@ -722,65 +744,64 @@ uhci_resume(device_t dv, const pmf_qual_
 	UHCICMD(sc, UHCI_CMD_MAXP);
 	uhci_run(sc, 1); /* and start traffic again */
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_RECOVERY);
 	sc->sc_bus.use_polling--;
 	if (sc->sc_intr_xfer != NULL)
 		callout_reset(&sc->sc_poll_handle, sc->sc_ival, uhci_poll_hub,
 		    sc->sc_intr_xfer);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 2)
 		uhci_dumpregs(sc);
 #endif
 	sc->sc_suspend = PWR_RESUME;
-	splx(s);
+	mutex_spin_exit(&sc->sc_intr_lock);
 	return true;
+}
 bool
 uhci_suspend(device_t dv, const pmf_qual_t *qual)
+{
 	uhci_softc_t *sc = device_private(dv);
 	int cmd;
 	int s;
-	s = splhardusb();
+	mutex_spin_enter(&sc->sc_intr_lock);
 	cmd = UREAD2(sc, UHCI_CMD);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 2)
 		uhci_dumpregs(sc);
 #endif
 	if (sc->sc_intr_xfer != NULL)
 		callout_stop(&sc->sc_poll_handle);
 	sc->sc_suspend = PWR_SUSPEND;
 	sc->sc_bus.use_polling++;
 	uhci_run(sc, 0); /* stop the controller */
 	cmd &= ~UHCI_CMD_RS;
 	/* save some state if BIOS doesn't */
 	sc->sc_saved_frnum = UREAD2(sc, UHCI_FRNUM);
 	sc->sc_saved_sof = UREAD1(sc, UHCI_SOF);
 	UWRITE2(sc, UHCI_INTR, 0); /* disable intrs */
 	UHCICMD(sc, cmd | UHCI_CMD_EGSM); /* enter suspend */
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT);
 	sc->sc_bus.use_polling--;
-	splx(s);
+	mutex_spin_exit(&sc->sc_intr_lock);
 	return true;
+}
 #ifdef UHCI_DEBUG
 Static void
 uhci_dumpregs(uhci_softc_t *sc)
+{
 	DPRINTFN(-1,("%s regs: cmd=%04x, sts=%04x, intr=%04x, frnum=%04x, "
 		     "flbase=%08x, sof=%04x, portsc1=%04x, portsc2=%04x\n",
 		     device_xname(sc->sc_dev),
 		     UREAD2(sc, UHCI_CMD),
 		     UREAD2(sc, UHCI_STS),
 @@ -982,53 +1003,52 @@ void iidump(void) { uhci_dump_iis(thesc)
 #endif
 /*
  * This routine is executed periodically and simulates interrupts
  * from the root controller interrupt pipe for port status change.
  */
 void
 uhci_poll_hub(void *addr)
+{
 	usbd_xfer_handle xfer = addr;
 	usbd_pipe_handle pipe = xfer->pipe;
 	uhci_softc_t *sc;
 	int s;
 	u_char *p;
 	DPRINTFN(20, ("uhci_poll_hub\n"));
 	if (__predict_false(pipe->device == NULL || pipe->device->bus == NULL))
 		return;	/* device has detached */
 	sc = pipe->device->bus->hci_private;
 	callout_reset(&sc->sc_poll_handle, sc->sc_ival, uhci_poll_hub, xfer);
 	p = KERNADDR(&xfer->dmabuf, 0);
 	p[0] = 0;
 	if (UREAD2(sc, UHCI_PORTSC1) & (UHCI_PORTSC_CSC|UHCI_PORTSC_OCIC))
 		p[0] |= 1<<1;
 	if (UREAD2(sc, UHCI_PORTSC2) & (UHCI_PORTSC_CSC|UHCI_PORTSC_OCIC))
 		p[0] |= 1<<2;
 	if (p[0] == 0)
 		/* No change, try again in a while */
 		return;
 	xfer->actlen = 1;
 	xfer->status = USBD_NORMAL_COMPLETION;
-	s = splusb();
+	mutex_enter(&sc->sc_lock);
 	xfer->device->bus->intr_context++;
 	usb_transfer_complete(xfer);
 	xfer->device->bus->intr_context--;
-	splx(s);
+	mutex_exit(&sc->sc_lock);
+}
 void
 uhci_root_intr_done(usbd_xfer_handle xfer)
+{
+}
 void
 uhci_root_ctrl_done(usbd_xfer_handle xfer)
+{
+}
 /*
 @@ -1067,54 +1087,54 @@ uhci_rem_loop(uhci_softc_t *sc) {
 		usb_syncmem(&sc->sc_last_qh->dma,
 		    sc->sc_last_qh->offs + offsetof(uhci_qh_t, qh_hlink),
 		    sizeof(sc->sc_last_qh->qh.qh_hlink),
 		    BUS_DMASYNC_PREWRITE);
+	}
+}
 /* Add high speed control QH, called at splusb(). */
 void
 uhci_add_hs_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *eqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_add_ctrl: sqh=%p\n", sqh));
 	eqh = sc->sc_hctl_end;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink),
 	    BUS_DMASYNC_POSTWRITE);
 	sqh->hlink       = eqh->hlink;
 	sqh->qh.qh_hlink = eqh->qh.qh_hlink;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE);
 	eqh->hlink       = sqh;
 	eqh->qh.qh_hlink = htole32(sqh->physaddr | UHCI_PTR_QH);
 	sc->sc_hctl_end = sqh;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 #ifdef UHCI_CTL_LOOP
 	uhci_add_loop(sc);
 #endif
+}
 /* Remove high speed control QH, called at splusb(). */
 void
 uhci_remove_hs_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *pqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_remove_hs_ctrl: sqh=%p\n", sqh));
 #ifdef UHCI_CTL_LOOP
 	uhci_rem_loop(sc);
 #endif
 	/*
 	 * The T bit should be set in the elink of the QH so that the HC
 	 * doesn't follow the pointer.  This condition may fail if the
 	 * the transferred packet was short so that the QH still points
 	 * at the last used TD.
 	 * In this case we set the T bit and wait a little for the HC
 	 * to stop looking at the TD.
 	 * Note that if the TD chain is large enough, the controller
 @@ -1144,50 +1164,50 @@ uhci_remove_hs_ctrl(uhci_softc_t *sc, uh
 	    sizeof(pqh->qh.qh_hlink),
 	    BUS_DMASYNC_PREWRITE);
 	delay(UHCI_QH_REMOVE_DELAY);
 	if (sc->sc_hctl_end == sqh)
 		sc->sc_hctl_end = pqh;
+}
 /* Add low speed control QH, called at splusb(). */
 void
 uhci_add_ls_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *eqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_add_ls_ctrl: sqh=%p\n", sqh));
 	eqh = sc->sc_lctl_end;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_POSTWRITE);
 	sqh->hlink = eqh->hlink;
 	sqh->qh.qh_hlink = eqh->qh.qh_hlink;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE);
 	eqh->hlink = sqh;
 	eqh->qh.qh_hlink = htole32(sqh->physaddr | UHCI_PTR_QH);
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 	sc->sc_lctl_end = sqh;
+}
 /* Remove low speed control QH, called at splusb(). */
 void
 uhci_remove_ls_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *pqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_remove_ls_ctrl: sqh=%p\n", sqh));
 	/* See comment in uhci_remove_hs_ctrl() */
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_elink),
 	    sizeof(sqh->qh.qh_elink),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (!(sqh->qh.qh_elink & htole32(UHCI_PTR_T))) {
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		delay(UHCI_QH_REMOVE_DELAY);
 @@ -1201,51 +1221,51 @@ uhci_remove_ls_ctrl(uhci_softc_t *sc, uh
 	    sizeof(pqh->qh.qh_hlink),
 	    BUS_DMASYNC_PREWRITE);
 	delay(UHCI_QH_REMOVE_DELAY);
 	if (sc->sc_lctl_end == sqh)
 		sc->sc_lctl_end = pqh;
+}
 /* Add bulk QH, called at splusb(). */
 void
 uhci_add_bulk(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *eqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_add_bulk: sqh=%p\n", sqh));
 	eqh = sc->sc_bulk_end;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_POSTWRITE);
 	sqh->hlink = eqh->hlink;
 	sqh->qh.qh_hlink = eqh->qh.qh_hlink;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE);
 	eqh->hlink = sqh;
 	eqh->qh.qh_hlink = htole32(sqh->physaddr | UHCI_PTR_QH);
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 	sc->sc_bulk_end = sqh;
 	uhci_add_loop(sc);
+}
 /* Remove bulk QH, called at splusb(). */
 void
 uhci_remove_bulk(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *pqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_remove_bulk: sqh=%p\n", sqh));
 	uhci_rem_loop(sc);
 	/* See comment in uhci_remove_hs_ctrl() */
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_elink),
 	    sizeof(sqh->qh.qh_elink),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (!(sqh->qh.qh_elink & htole32(UHCI_PTR_T))) {
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 @@ -1259,53 +1279,62 @@ uhci_remove_bulk(uhci_softc_t *sc, uhci_
 	usb_syncmem(&pqh->dma, pqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(pqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 	delay(UHCI_QH_REMOVE_DELAY);
 	if (sc->sc_bulk_end == sqh)
 		sc->sc_bulk_end = pqh;
+}
 Static int uhci_intr1(uhci_softc_t *);
 int
 uhci_intr(void *arg)
+{
 	uhci_softc_t *sc = arg;
 	int ret = 0;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	if (sc->sc_dying || !device_has_power(sc->sc_dev))
-		return (0);
+		goto done;
 	if (sc->sc_bus.use_polling || UREAD2(sc, UHCI_INTR) == 0) {
 #ifdef DIAGNOSTIC
 		DPRINTFN(16, ("uhci_intr: ignored interrupt while polling\n"));
 #endif
-		return (0);
+		goto done;
+	}
-	return (uhci_intr1(sc));
+	ret = uhci_intr1(sc);
  done:
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return ret;
+}
 int
 uhci_intr1(uhci_softc_t *sc)
+{
 	int status;
 	int ack;
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 15) {
 		DPRINTF(("%s: uhci_intr1\n", device_xname(sc->sc_dev)));
 		uhci_dumpregs(sc);
+	}
 #endif
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	status = UREAD2(sc, UHCI_STS) & UHCI_STS_ALLINTRS;
 	if (status == 0)	/* The interrupt was not for us. */
 		return (0);
 	if (sc->sc_suspend != PWR_RESUME) {
 #ifdef DIAGNOSTIC
 		printf("%s: interrupt while not operating ignored\n",
 		       device_xname(sc->sc_dev));
 #endif
 		UWRITE2(sc, UHCI_STS, status); /* acknowledge the ints */
 		return (0);
+	}
 @@ -1355,52 +1384,54 @@ uhci_intr1(uhci_softc_t *sc)
 	return (1);
+}
 void
 uhci_softintr(void *v)
+{
 	struct usbd_bus *bus = v;
 	uhci_softc_t *sc = bus->hci_private;
 	uhci_intr_info_t *ii, *nextii;
 	DPRINTFN(10,("%s: uhci_softintr (%d)\n", device_xname(sc->sc_dev),
 		     sc->sc_bus.intr_context));
 	mutex_enter(&sc->sc_lock);
 	sc->sc_bus.intr_context++;
 	/*
 	 * Interrupts on UHCI really suck.  When the host controller
 	 * interrupts because a transfer is completed there is no
 	 * way of knowing which transfer it was.  You can scan down
 	 * the TDs and QHs of the previous frame to limit the search,
 	 * but that assumes that the interrupt was not delayed by more
 	 * than 1 ms, which may not always be true (e.g. after debug
 	 * output on a slow console).
 	 * We scan all interrupt descriptors to see if any have
 	 * completed.
 	 */
 	for (ii = LIST_FIRST(&sc->sc_intrhead); ii; ii = nextii) {
 		nextii = LIST_NEXT(ii, list);
 		uhci_check_intr(sc, ii);
+	}
 #ifdef USB_USE_SOFTINTR
 	if (sc->sc_softwake) {
 		sc->sc_softwake = 0;
-		wakeup(&sc->sc_softwake);
+		cv_broadcast(&sc->sc_softwake_cv);
+	}
 #endif /* USB_USE_SOFTINTR */
 	sc->sc_bus.intr_context--;
 	mutex_exit(&sc->sc_lock);
+}
 /* Check for an interrupt. */
 void
 uhci_check_intr(uhci_softc_t *sc, uhci_intr_info_t *ii)
+{
 	uhci_soft_td_t *std, *lstd;
 	u_int32_t status;
 	DPRINTFN(15, ("uhci_check_intr: ii=%p\n", ii));
 #ifdef DIAGNOSTIC
 	if (ii == NULL) {
 		printf("uhci_check_intr: no ii? %p\n", ii);
 @@ -1475,26 +1506,27 @@ uhci_check_intr(uhci_softc_t *sc, uhci_i
 /* Called at splusb() */
 void
 uhci_idone(uhci_intr_info_t *ii)
+{
 	usbd_xfer_handle xfer = ii->xfer;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	uhci_soft_td_t *std;
 	u_int32_t status = 0, nstatus;
 	int actlen;
 	DPRINTFN(12, ("uhci_idone: ii=%p\n", ii));
 #ifdef DIAGNOSTIC
+	{
 		/* XXX SMP? */
 		int s = splhigh();
 		if (ii->isdone) {
 			splx(s);
 #ifdef UHCI_DEBUG
 			printf("uhci_idone: ii is done!\n   ");
 			uhci_dump_ii(ii);
 #else
 			printf("uhci_idone: ii=%p is done!\n", ii);
 #endif
 			return;
+		}
 		ii->isdone = 1;
 		splx(s);
 @@ -1621,124 +1653,131 @@ uhci_timeout(void *addr)
 		return;
+	}
 	/* Execute the abort in a process context. */
 	usb_init_task(&uxfer->abort_task, uhci_timeout_task, ii->xfer);
 	usb_add_task(uxfer->xfer.pipe->device, &uxfer->abort_task,
 	    USB_TASKQ_HC);
+}
 void
 uhci_timeout_task(void *addr)
+{
 	usbd_xfer_handle xfer = addr;
 	int s;
 	DPRINTF(("uhci_timeout_task: xfer=%p\n", xfer));
 	s = splusb();
 	uhci_abort_xfer(xfer, USBD_TIMEOUT);
 	splx(s);
+}
 /*
  * Wait here until controller claims to have an interrupt.
  * Then call uhci_intr and return.  Use timeout to avoid waiting
  * too long.
  * Only used during boot when interrupts are not enabled yet.
  */
 void
 uhci_waitintr(uhci_softc_t *sc, usbd_xfer_handle xfer)
+{
 	int timo = xfer->timeout;
 	uhci_intr_info_t *ii;
 	mutex_enter(&sc->sc_lock);
 	DPRINTFN(10,("uhci_waitintr: timeout = %dms\n", timo));
 	xfer->status = USBD_IN_PROGRESS;
 	for (; timo >= 0; timo--) {
 		usb_delay_ms(&sc->sc_bus, 1);
 		DPRINTFN(20,("uhci_waitintr: 0x%04x\n", UREAD2(sc, UHCI_STS)));
 		if (UREAD2(sc, UHCI_STS) & UHCI_STS_USBINT) {
 			mutex_spin_enter(&sc->sc_intr_lock);
 			uhci_intr1(sc);
 			mutex_spin_exit(&sc->sc_intr_lock);
 			if (xfer->status != USBD_IN_PROGRESS)
-				return;
+				goto done;
+		}
+	}
 	/* Timeout */
 	DPRINTF(("uhci_waitintr: timeout\n"));
 	for (ii = LIST_FIRST(&sc->sc_intrhead);
 	     ii != NULL && ii->xfer != xfer;
 	     ii = LIST_NEXT(ii, list))
+		;
 #ifdef DIAGNOSTIC
 	if (ii == NULL)
 		panic("uhci_waitintr: lost intr_info");
 #endif
 	uhci_idone(ii);
 done:
 	mutex_exit(&sc->sc_lock);
+}
 void
 uhci_poll(struct usbd_bus *bus)
+{
 	uhci_softc_t *sc = bus->hci_private;
-	if (UREAD2(sc, UHCI_STS) & UHCI_STS_USBINT)
+	if (UREAD2(sc, UHCI_STS) & UHCI_STS_USBINT) {
 		mutex_spin_enter(&sc->sc_intr_lock);
 		uhci_intr1(sc);
 		mutex_spin_exit(&sc->sc_intr_lock);
+	}
+}
 void
 uhci_reset(uhci_softc_t *sc)
+{
 	int n;
 	UHCICMD(sc, UHCI_CMD_HCRESET);
 	/* The reset bit goes low when the controller is done. */
 	for (n = 0; n < UHCI_RESET_TIMEOUT &&
 		    (UREAD2(sc, UHCI_CMD) & UHCI_CMD_HCRESET); n++)
 		usb_delay_ms(&sc->sc_bus, 1);
 	if (n >= UHCI_RESET_TIMEOUT)
 		printf("%s: controller did not reset\n",
 		       device_xname(sc->sc_dev));
+}
 usbd_status
 uhci_run(uhci_softc_t *sc, int run)
+{
-	int s, n, running;
+	int n, running;
 	u_int16_t cmd;
 	run = run != 0;
-	s = splhardusb();
+	mutex_spin_enter(&sc->sc_intr_lock);
 	DPRINTF(("uhci_run: setting run=%d\n", run));
 	cmd = UREAD2(sc, UHCI_CMD);
 	if (run)
 		cmd |= UHCI_CMD_RS;
 	else
 		cmd &= ~UHCI_CMD_RS;
 	UHCICMD(sc, cmd);
 	for(n = 0; n < 10; n++) {
 		running = !(UREAD2(sc, UHCI_STS) & UHCI_STS_HCH);
 		/* return when we've entered the state we want */
 		if (run == running) {
-			splx(s);
+			mutex_spin_exit(&sc->sc_intr_lock);
 			DPRINTF(("uhci_run: done cmd=0x%x sts=0x%x\n",
 				 UREAD2(sc, UHCI_CMD), UREAD2(sc, UHCI_STS)));
 			return (USBD_NORMAL_COMPLETION);
+		}
 		usb_delay_ms(&sc->sc_bus, 1);
+	}
-	splx(s);
+	mutex_spin_exit(&sc->sc_intr_lock);
 	printf("%s: cannot %s\n", device_xname(sc->sc_dev),
 	       run ? "start" : "stop");
 	return (USBD_IOERROR);
+}
 /*
  * Memory management routines.
  *  uhci_alloc_std allocates TDs
  *  uhci_alloc_sqh allocates QHs
  * These two routines do their own free list management,
  * partly for speed, partly because allocating DMAable memory
  * has page size granularaity so much memory would be wasted if
  * only one TD/QH (32 bytes) was placed in each allocated chunk.
 @@ -1748,27 +1787,27 @@ uhci_soft_td_t *
 uhci_alloc_std(uhci_softc_t *sc)
+{
 	uhci_soft_td_t *std;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freetds == NULL) {
 		DPRINTFN(2,("uhci_alloc_std: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, UHCI_STD_SIZE * UHCI_STD_CHUNK,
 			  UHCI_TD_ALIGN, &dma);
 		if (err)
 			return (0);
-		for(i = 0; i < UHCI_STD_CHUNK; i++) {
+		for (i = 0; i < UHCI_STD_CHUNK; i++) {
 			offs = i * UHCI_STD_SIZE;
 			std = KERNADDR(&dma, offs);
 			std->physaddr = DMAADDR(&dma, offs);
 			std->dma = dma;
 			std->offs = offs;
 			std->link.std = sc->sc_freetds;
 			sc->sc_freetds = std;
+		}
+	}
 	std = sc->sc_freetds;
 	sc->sc_freetds = std->link.std;
 	memset(&std->td, 0, sizeof(uhci_td_t));
 	return std;
 @@ -1863,26 +1902,29 @@ uhci_alloc_std_chain(struct uhci_pipe *u
 		     int rd, u_int16_t flags, usb_dma_t *dma,
 		     uhci_soft_td_t **sp, uhci_soft_td_t **ep)
+{
 	uhci_soft_td_t *p, *lastp;
 	uhci_physaddr_t lastlink;
 	int i, ntd, l, tog, maxp;
 	u_int32_t status;
 	int addr = upipe->pipe.device->address;
 	int endpt = upipe->pipe.endpoint->edesc->bEndpointAddress;
 	DPRINTFN(8, ("uhci_alloc_std_chain: addr=%d endpt=%d len=%d speed=%d "
 		      "flags=0x%x\n", addr, UE_GET_ADDR(endpt), len,
 		      upipe->pipe.device->speed, flags));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	maxp = UGETW(upipe->pipe.endpoint->edesc->wMaxPacketSize);
 	if (maxp == 0) {
 		printf("uhci_alloc_std_chain: maxp=0\n");
 		return (USBD_INVAL);
+	}
 	ntd = (len + maxp - 1) / maxp;
 	if ((flags & USBD_FORCE_SHORT_XFER) && len % maxp == 0)
 		ntd++;
 	DPRINTFN(10, ("uhci_alloc_std_chain: maxp=%d ntd=%d\n", maxp, ntd));
 	if (ntd == 0) {
 		*sp = *ep = 0;
 		DPRINTFN(-1,("uhci_alloc_std_chain: ntd=0\n"));
 		return (USBD_NORMAL_COMPLETION);
 @@ -1940,76 +1982,82 @@ uhci_device_clear_toggle(usbd_pipe_handl
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	upipe->nexttoggle = 0;
+}
 void
 uhci_noop(usbd_pipe_handle pipe)
+{
+}
 usbd_status
 uhci_device_bulk_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * so start it first.
 	 */
 	return (uhci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 usbd_status
 uhci_device_bulk_start(usbd_xfer_handle xfer)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_soft_td_t *data, *dataend;
 	uhci_soft_qh_t *sqh;
 	usbd_status err;
 	int len, isread, endpt;
 	int s;
 	DPRINTFN(3, ("uhci_device_bulk_start: xfer=%p len=%d flags=%d ii=%p\n",
 		     xfer, xfer->length, xfer->flags, ii));
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST)
 		panic("uhci_device_bulk_transfer: a request");
 #endif
 	mutex_enter(&sc->sc_lock);
 	len = xfer->length;
 	endpt = upipe->pipe.endpoint->edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	sqh = upipe->u.bulk.sqh;
 	upipe->u.bulk.isread = isread;
 	upipe->u.bulk.length = len;
 	err = uhci_alloc_std_chain(upipe, sc, len, isread, xfer->flags,
 				   &xfer->dmabuf, &data, &dataend);
-	if (err)
+	if (err) {
 		mutex_exit(&sc->sc_lock);
 		return (err);
+	}
 	dataend->td.td_status |= htole32(UHCI_TD_IOC);
 	usb_syncmem(&dataend->dma,
 	    dataend->offs + offsetof(uhci_td_t, td_status),
 	    sizeof(dataend->td.td_status),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 8) {
 		DPRINTF(("uhci_device_bulk_transfer: data(1)\n"));
 		uhci_dump_tds(data);
+	}
 #endif
 @@ -2019,47 +2067,46 @@ uhci_device_bulk_start(usbd_xfer_handle
 	ii->stdstart = data;
 	ii->stdend = dataend;
 #ifdef DIAGNOSTIC
 	if (!ii->isdone) {
 		printf("uhci_device_bulk_transfer: not done, ii=%p\n", ii);
+	}
 	ii->isdone = 0;
 #endif
 	sqh->elink = data;
 	sqh->qh.qh_elink = htole32(data->physaddr | UHCI_PTR_TD);
 	/* uhci_add_bulk() will do usb_syncmem(sqh) */
 	s = splusb();
 	uhci_add_bulk(sc, sqh);
 	uhci_add_intr_info(sc, ii);
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&xfer->timeout_handle, mstohz(xfer->timeout),
 			    uhci_timeout, ii);
+	}
 	xfer->status = USBD_IN_PROGRESS;
 	splx(s);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 10) {
 		DPRINTF(("uhci_device_bulk_transfer: data(2)\n"));
 		uhci_dump_tds(data);
+	}
 #endif
 	if (sc->sc_bus.use_polling)
 		uhci_waitintr(sc, xfer);
 	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a device bulk request. */
 void
 uhci_device_bulk_abort(usbd_xfer_handle xfer)
+{
 	DPRINTF(("uhci_device_bulk_abort:\n"));
 	uhci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /*
  * Abort a device request.
 @@ -2068,199 +2115,200 @@ uhci_device_bulk_abort(usbd_xfer_handle
  * for it will be called with USBD_CANCELLED status.
  * It's impossible to guarantee that the requested transfer will not
  * have happened since the hardware runs concurrently.
  * If the transaction has already happened we rely on the ordinary
  * interrupt processing to process it.
  */
 void
 uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
+{
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	uhci_softc_t *sc = upipe->pipe.device->bus->hci_private;
 	uhci_soft_td_t *std;
 	int s;
 	int wake;
 	DPRINTFN(1,("uhci_abort_xfer: xfer=%p, status=%d\n", xfer, status));
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
-		s = splusb();
+		mutex_enter(&sc->sc_lock);
 		xfer->status = status;	/* make software ignore it */
 		callout_stop(&xfer->timeout_handle);
 		usb_transfer_complete(xfer);
-		splx(s);
+		mutex_exit(&sc->sc_lock);
 		return;
+	}
 	if (xfer->device->bus->intr_context || !curproc)
 		panic("uhci_abort_xfer: not in process context");
 	mutex_enter(&sc->sc_lock);
 	/*
 	 * If an abort is already in progress then just wait for it to
 	 * complete and return.
 	 */
 	if (xfer->hcflags & UXFER_ABORTING) {
 		DPRINTFN(2, ("uhci_abort_xfer: already aborting\n"));
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("uhci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		/* Override the status which might be USBD_TIMEOUT. */
 		xfer->status = status;
 		DPRINTFN(2, ("uhci_abort_xfer: waiting for abort to finish\n"));
 		xfer->hcflags |= UXFER_ABORTWAIT;
 		while (xfer->hcflags & UXFER_ABORTING)
-			tsleep(&xfer->hcflags, PZERO, "uhciaw", 0);
+			cv_wait(&xfer->hccv, &sc->sc_lock);
-		return;
+		goto done;
+	}
 	xfer->hcflags |= UXFER_ABORTING;
 	/*
 	 * Step 1: Make interrupt routine and hardware ignore xfer.
 	 */
 	s = splusb();
 	xfer->status = status;	/* make software ignore it */
 	callout_stop(&xfer->timeout_handle);
 	DPRINTFN(1,("uhci_abort_xfer: stop ii=%p\n", ii));
 	for (std = ii->stdstart; std != NULL; std = std->link.std) {
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(std->td.td_status),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		std->td.td_status &= htole32(~(UHCI_TD_ACTIVE | UHCI_TD_IOC));
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(std->td.td_status),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	splx(s);
 	/*
 	 * Step 2: Wait until we know hardware has finished any possible
 	 * use of the xfer.  Also make sure the soft interrupt routine
 	 * has run.
 	 */
 	usb_delay_ms(upipe->pipe.device->bus, 2); /* Hardware finishes in 1ms */
 	s = splusb();
 #ifdef USB_USE_SOFTINTR
 	sc->sc_softwake = 1;
 #endif /* USB_USE_SOFTINTR */
 	usb_schedsoftintr(&sc->sc_bus);
-#ifdef USB_USE_SOFTINTR
+	DPRINTFN(1,("uhci_abort_xfer: cv_wait\n"));
-	DPRINTFN(1,("uhci_abort_xfer: tsleep\n"));
+	cv_wait(&sc->sc_softwake_cv, &sc->sc_lock);
 	tsleep(&sc->sc_softwake, PZERO, "uhciab", 0);
 #endif /* USB_USE_SOFTINTR */
 	splx(s);
 	/*
 	 * Step 3: Execute callback.
 	 */
 	DPRINTFN(1,("uhci_abort_xfer: callback\n"));
 	s = splusb();
 #ifdef DIAGNOSTIC
 	ii->isdone = 1;
 #endif
 	wake = xfer->hcflags & UXFER_ABORTWAIT;
 	xfer->hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake)
-		wakeup(&xfer->hcflags);
+		cv_broadcast(&xfer->hccv);
-	splx(s);
+done:
 	mutex_exit(&sc->sc_lock);
+}
 /* Close a device bulk pipe. */
 void
 uhci_device_bulk_close(usbd_pipe_handle pipe)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	uhci_free_sqh(sc, upipe->u.bulk.sqh);
 	pipe->endpoint->datatoggle = upipe->nexttoggle;
+}
 usbd_status
 uhci_device_ctrl_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * so start it first.
 	 */
 	return (uhci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 usbd_status
 uhci_device_ctrl_start(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST))
 		panic("uhci_device_ctrl_transfer: not a request");
 #endif
 	mutex_enter(&sc->sc_lock);
 	err = uhci_device_request(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	if (sc->sc_bus.use_polling)
 		uhci_waitintr(sc, xfer);
 	return (USBD_IN_PROGRESS);
+}
 usbd_status
 uhci_device_intr_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * so start it first.
 	 */
 	return (uhci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 usbd_status
 uhci_device_intr_start(usbd_xfer_handle xfer)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_soft_td_t *data, *dataend;
 	uhci_soft_qh_t *sqh;
 	usbd_status err;
 	int isread, endpt;
-	int i, s;
+	int i;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 	DPRINTFN(3,("uhci_device_intr_transfer: xfer=%p len=%d flags=%d\n",
 		    xfer, xfer->length, xfer->flags));
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST)
 		panic("uhci_device_intr_transfer: a request");
 #endif
 	endpt = upipe->pipe.endpoint->edesc->bEndpointAddress;
 @@ -2277,52 +2325,52 @@ uhci_device_intr_start(usbd_xfer_handle
 	usb_syncmem(&dataend->dma,
 	    dataend->offs + offsetof(uhci_td_t, td_status),
 	    sizeof(dataend->td.td_status),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 10) {
 		DPRINTF(("uhci_device_intr_transfer: data(1)\n"));
 		uhci_dump_tds(data);
 		uhci_dump_qh(upipe->u.intr.qhs[0]);
+	}
 #endif
-	s = splusb();
+	mutex_enter(&sc->sc_lock);
 	/* Set up interrupt info. */
 	ii->xfer = xfer;
 	ii->stdstart = data;
 	ii->stdend = dataend;
 #ifdef DIAGNOSTIC
 	if (!ii->isdone) {
 		printf("uhci_device_intr_transfer: not done, ii=%p\n", ii);
+	}
 	ii->isdone = 0;
 #endif
 	DPRINTFN(10,("uhci_device_intr_transfer: qhs[0]=%p\n",
 		     upipe->u.intr.qhs[0]));
 	for (i = 0; i < upipe->u.intr.npoll; i++) {
 		sqh = upipe->u.intr.qhs[i];
 		sqh->elink = data;
 		sqh->qh.qh_elink = htole32(data->physaddr | UHCI_PTR_TD);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	uhci_add_intr_info(sc, ii);
 	xfer->status = USBD_IN_PROGRESS;
-	splx(s);
+	mutex_exit(&sc->sc_lock);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 10) {
 		DPRINTF(("uhci_device_intr_transfer: data(2)\n"));
 		uhci_dump_tds(data);
 		uhci_dump_qh(upipe->u.intr.qhs[0]);
+	}
 #endif
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a device control request. */
 @@ -2348,65 +2396,65 @@ uhci_device_intr_abort(usbd_xfer_handle
 		DPRINTFN(1,("uhci_device_intr_abort: remove\n"));
 		xfer->pipe->intrxfer = NULL;
+	}
 	uhci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /* Close a device interrupt pipe. */
 void
 uhci_device_intr_close(usbd_pipe_handle pipe)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	uhci_softc_t *sc = pipe->device->bus->hci_private;
 	int i, npoll;
 	int s;
 	/* Unlink descriptors from controller data structures. */
 	npoll = upipe->u.intr.npoll;
-	s = splusb();
+	mutex_enter(&sc->sc_lock);
 	for (i = 0; i < npoll; i++)
 		uhci_remove_intr(sc, upipe->u.intr.qhs[i]);
-	splx(s);
+	mutex_exit(&sc->sc_lock);
 	/*
 	 * We now have to wait for any activity on the physical
 	 * descriptors to stop.
 	 */
 	usb_delay_ms(&sc->sc_bus, 2);
 	for(i = 0; i < npoll; i++)
 		uhci_free_sqh(sc, upipe->u.intr.qhs[i]);
-	free(upipe->u.intr.qhs, M_USBHC);
+	kmem_free(upipe->u.intr.qhs, npoll * sizeof(uhci_soft_qh_t *));
 	/* XXX free other resources */
+}
 usbd_status
 uhci_device_request(usbd_xfer_handle xfer)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	usb_device_request_t *req = &xfer->request;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	int addr = dev->address;
 	int endpt = upipe->pipe.endpoint->edesc->bEndpointAddress;
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_soft_td_t *setup, *data, *stat, *next, *dataend;
 	uhci_soft_qh_t *sqh;
 	int len;
 	u_int32_t ls;
 	usbd_status err;
 	int isread;
 	int s;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(3,("uhci_device_control type=0x%02x, request=0x%02x, "
 		    "wValue=0x%04x, wIndex=0x%04x len=%d, addr=%d, endpt=%d\n",
 		    req->bmRequestType, req->bRequest, UGETW(req->wValue),
 		    UGETW(req->wIndex), UGETW(req->wLength),
 		    addr, endpt));
 	ls = dev->speed == USB_SPEED_LOW ? UHCI_TD_LS : 0;
 	isread = req->bmRequestType & UT_READ;
 	len = UGETW(req->wLength);
 	setup = upipe->u.ctl.setup;
 	stat = upipe->u.ctl.stat;
 @@ -2466,27 +2514,26 @@ uhci_device_request(usbd_xfer_handle xfe
 	ii->stdstart = setup;
 	ii->stdend = stat;
 #ifdef DIAGNOSTIC
 	if (!ii->isdone) {
 		printf("uhci_device_request: not done, ii=%p\n", ii);
+	}
 	ii->isdone = 0;
 #endif
 	sqh->elink = setup;
 	sqh->qh.qh_elink = htole32(setup->physaddr | UHCI_PTR_TD);
 	/* uhci_add_?s_ctrl() will do usb_syncmem(sqh) */
 	s = splusb();
 	if (dev->speed == USB_SPEED_LOW)
 		uhci_add_ls_ctrl(sc, sqh);
 	else
 		uhci_add_hs_ctrl(sc, sqh);
 	uhci_add_intr_info(sc, ii);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 12) {
 		uhci_soft_td_t *std;
 		uhci_soft_qh_t *xqh;
 		uhci_soft_qh_t *sxqh;
 		int maxqh = 0;
 		uhci_physaddr_t link;
 		DPRINTF(("uhci_enter_ctl_q: follow from [0]\n"));
 @@ -2504,67 +2551,69 @@ uhci_device_request(usbd_xfer_handle xfe
                             xqh->hlink == xqh ? NULL : xqh->hlink)) {
 			uhci_dump_qh(xqh);
+		}
 		DPRINTF(("Enqueued QH:\n"));
 		uhci_dump_qh(sqh);
 		uhci_dump_tds(sqh->elink);
+	}
 #endif
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&xfer->timeout_handle, mstohz(xfer->timeout),
 			    uhci_timeout, ii);
+	}
 	xfer->status = USBD_IN_PROGRESS;
 	splx(s);
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_status
 uhci_device_isoc_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	DPRINTFN(5,("uhci_device_isoc_transfer: xfer=%p\n", xfer));
 	/* Put it on our queue, */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	/* bail out on error, */
 	if (err && err != USBD_IN_PROGRESS)
 		return (err);
 	/* XXX should check inuse here */
 	/* insert into schedule, */
 	uhci_device_isoc_enter(xfer);
 	/* and start if the pipe wasn't running */
 	if (!err)
 		uhci_device_isoc_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
 	return (err);
+}
 void
 uhci_device_isoc_enter(usbd_xfer_handle xfer)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	struct iso *iso = &upipe->u.iso;
 	uhci_soft_td_t *std;
 	u_int32_t buf, len, status, offs;
-	int s, i, next, nframes;
+	int i, next, nframes;
 	int rd = UE_GET_DIR(upipe->pipe.endpoint->edesc->bEndpointAddress) == UE_DIR_IN;
 	DPRINTFN(5,("uhci_device_isoc_enter: used=%d next=%d xfer=%p "
 		    "nframes=%d\n",
 		    iso->inuse, iso->next, xfer, xfer->nframes));
 	if (sc->sc_dying)
 		return;
 	if (xfer->status == USBD_IN_PROGRESS) {
 		/* This request has already been entered into the frame list */
 		printf("uhci_device_isoc_enter: xfer=%p in frame list\n", xfer);
 		/* XXX */
 @@ -2581,27 +2630,27 @@ uhci_device_isoc_enter(usbd_xfer_handle
 		next = (UREAD2(sc, UHCI_FRNUM) + 3) % UHCI_VFRAMELIST_COUNT;
 		DPRINTFN(2,("uhci_device_isoc_enter: start next=%d\n", next));
+	}
 	xfer->status = USBD_IN_PROGRESS;
 	UXFER(xfer)->curframe = next;
 	buf = DMAADDR(&xfer->dmabuf, 0);
 	offs = 0;
 	status = UHCI_TD_ZERO_ACTLEN(UHCI_TD_SET_ERRCNT(0) |
 				     UHCI_TD_ACTIVE |
 				     UHCI_TD_IOS);
 	nframes = xfer->nframes;
-	s = splusb();
+	mutex_enter(&sc->sc_lock);
 	for (i = 0; i < nframes; i++) {
 		std = iso->stds[next];
 		if (++next >= UHCI_VFRAMELIST_COUNT)
 			next = 0;
 		len = xfer->frlengths[i];
 		std->td.td_buffer = htole32(buf);
 		usb_syncmem(&xfer->dmabuf, offs, len,
 		    rd ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE);
 		if (i == nframes - 1)
 			status |= UHCI_TD_IOC;
 		std->td.td_status = htole32(status);
 		std->td.td_token &= htole32(~UHCI_TD_MAXLEN_MASK);
 		std->td.td_token |= htole32(UHCI_TD_SET_MAXLEN(len));
 @@ -2609,93 +2658,96 @@ uhci_device_isoc_enter(usbd_xfer_handle
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef UHCI_DEBUG
 		if (uhcidebug > 5) {
 			DPRINTFN(5,("uhci_device_isoc_enter: TD %d\n", i));
 			uhci_dump_td(std);
+		}
 #endif
 		buf += len;
 		offs += len;
+	}
 	iso->next = next;
 	iso->inuse += xfer->nframes;
-	splx(s);
+	mutex_exit(&sc->sc_lock);
+}
 usbd_status
 uhci_device_isoc_start(usbd_xfer_handle xfer)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	uhci_softc_t *sc = upipe->pipe.device->bus->hci_private;
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_soft_td_t *end;
-	int s, i;
+	int i;
 	DPRINTFN(5,("uhci_device_isoc_start: xfer=%p\n", xfer));
-	if (sc->sc_dying)
+	mutex_enter(&sc->sc_lock);
 	if (sc->sc_dying) {
 		mutex_exit(&sc->sc_lock);
 		return (USBD_IOERROR);
+	}
 #ifdef DIAGNOSTIC
 	if (xfer->status != USBD_IN_PROGRESS)
 		printf("uhci_device_isoc_start: not in progress %p\n", xfer);
 #endif
 	/* Find the last TD */
 	i = UXFER(xfer)->curframe + xfer->nframes;
 	if (i >= UHCI_VFRAMELIST_COUNT)
 		i -= UHCI_VFRAMELIST_COUNT;
 	end = upipe->u.iso.stds[i];
 #ifdef DIAGNOSTIC
 	if (end == NULL) {
 		printf("uhci_device_isoc_start: end == NULL\n");
 		return (USBD_INVAL);
+	}
 #endif
 	s = splusb();
 	/* Set up interrupt info. */
 	ii->xfer = xfer;
 	ii->stdstart = end;
 	ii->stdend = end;
 #ifdef DIAGNOSTIC
 	if (!ii->isdone)
 		printf("uhci_device_isoc_start: not done, ii=%p\n", ii);
 	ii->isdone = 0;
 #endif
 	uhci_add_intr_info(sc, ii);
-	splx(s);
+	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 void
 uhci_device_isoc_abort(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	uhci_soft_td_t **stds = upipe->u.iso.stds;
 	uhci_soft_td_t *std;
-	int i, n, s, nframes, maxlen, len;
+	int i, n, nframes, maxlen, len;
-	s = splusb();
+	mutex_enter(&sc->sc_lock);
 	/* Transfer is already done. */
 	if (xfer->status != USBD_NOT_STARTED &&
 	    xfer->status != USBD_IN_PROGRESS) {
-		splx(s);
+		mutex_exit(&sc->sc_lock);
 		return;
+	}
 	/* Give xfer the requested abort code. */
 	xfer->status = USBD_CANCELLED;
 	/* make hardware ignore it, */
 	nframes = xfer->nframes;
 	n = UXFER(xfer)->curframe;
 	maxlen = 0;
 	for (i = 0; i < nframes; i++) {
 		std = stds[n];
 		usb_syncmem(&std->dma,
 @@ -2717,157 +2769,162 @@ uhci_device_isoc_abort(usbd_xfer_handle
 		if (++n >= UHCI_VFRAMELIST_COUNT)
 			n = 0;
+	}
 	/* and wait until we are sure the hardware has finished. */
 	delay(maxlen);
 #ifdef DIAGNOSTIC
 	UXFER(xfer)->iinfo.isdone = 1;
 #endif
 	/* Run callback and remove from interrupt list. */
 	usb_transfer_complete(xfer);
-	splx(s);
+	mutex_exit(&sc->sc_lock);
+}
 void
 uhci_device_isoc_close(usbd_pipe_handle pipe)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	uhci_soft_td_t *std, *vstd;
 	struct iso *iso;
-	int i, s;
+	int i;
 	/*
 	 * Make sure all TDs are marked as inactive.
 	 * Wait for completion.
 	 * Unschedule.
 	 * Deallocate.
 	 */
 	iso = &upipe->u.iso;
 	mutex_enter(&sc->sc_lock);
 	for (i = 0; i < UHCI_VFRAMELIST_COUNT; i++) {
 		std = iso->stds[i];
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(std->td.td_status),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		std->td.td_status &= htole32(~UHCI_TD_ACTIVE);
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(std->td.td_status),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	usb_delay_ms(&sc->sc_bus, 2); /* wait for completion */
 	s = splusb();
 	for (i = 0; i < UHCI_VFRAMELIST_COUNT; i++) {
 		std = iso->stds[i];
 		for (vstd = sc->sc_vframes[i].htd;
 		     vstd != NULL && vstd->link.std != std;
 		     vstd = vstd->link.std)
+			;
 		if (vstd == NULL) {
 			/*panic*/
 			printf("uhci_device_isoc_close: %p not found\n", std);
-			splx(s);
+			mutex_exit(&sc->sc_lock);
 			return;
+		}
 		vstd->link = std->link;
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(std->td.td_link),
 		    BUS_DMASYNC_POSTWRITE);
 		vstd->td.td_link = std->td.td_link;
 		usb_syncmem(&vstd->dma,
 		    vstd->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(vstd->td.td_link),
 		    BUS_DMASYNC_PREWRITE);
 		uhci_free_std(sc, std);
+	}
-	splx(s);
+	mutex_exit(&sc->sc_lock);
-	free(iso->stds, M_USBHC);
+	kmem_free(iso->stds, UHCI_VFRAMELIST_COUNT * sizeof (uhci_soft_td_t *));
+}
 usbd_status
 uhci_setup_isoc(usbd_pipe_handle pipe)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	int addr = upipe->pipe.device->address;
 	int endpt = upipe->pipe.endpoint->edesc->bEndpointAddress;
 	int rd = UE_GET_DIR(endpt) == UE_DIR_IN;
 	uhci_soft_td_t *std, *vstd;
 	u_int32_t token;
 	struct iso *iso;
-	int i, s;
+	int i;
 	iso = &upipe->u.iso;
-	iso->stds = malloc(UHCI_VFRAMELIST_COUNT * sizeof (uhci_soft_td_t *),
+	iso->stds = kmem_alloc(UHCI_VFRAMELIST_COUNT *
-			   M_USBHC, M_WAITOK);
+				 sizeof (uhci_soft_td_t *),
 			       KM_SLEEP);
 	if (iso->stds == NULL)
 		return USBD_NOMEM;
 	token = rd ? UHCI_TD_IN (0, endpt, addr, 0) :
 		     UHCI_TD_OUT(0, endpt, addr, 0);
 	mutex_enter(&sc->sc_lock);
 	/* Allocate the TDs and mark as inactive; */
 	for (i = 0; i < UHCI_VFRAMELIST_COUNT; i++) {
 		std = uhci_alloc_std(sc);
 		if (std == 0)
 			goto bad;
 		std->td.td_status = htole32(UHCI_TD_IOS); /* iso, inactive */
 		std->td.td_token = htole32(token);
 		usb_syncmem(&std->dma, std->offs, sizeof(std->td),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		iso->stds[i] = std;
+	}
 	/* Insert TDs into schedule. */
 	s = splusb();
 	for (i = 0; i < UHCI_VFRAMELIST_COUNT; i++) {
 		std = iso->stds[i];
 		vstd = sc->sc_vframes[i].htd;
 		usb_syncmem(&vstd->dma,
 		    vstd->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(vstd->td.td_link),
 		    BUS_DMASYNC_POSTWRITE);
 		std->link = vstd->link;
 		std->td.td_link = vstd->td.td_link;
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(std->td.td_link),
 		    BUS_DMASYNC_PREWRITE);
 		vstd->link.std = std;
 		vstd->td.td_link = htole32(std->physaddr | UHCI_PTR_TD);
 		usb_syncmem(&vstd->dma,
 		    vstd->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(vstd->td.td_link),
 		    BUS_DMASYNC_PREWRITE);
+	}
-	splx(s);
+	mutex_exit(&sc->sc_lock);
 	iso->next = -1;
 	iso->inuse = 0;
 	return (USBD_NORMAL_COMPLETION);
  bad:
 	while (--i >= 0)
 		uhci_free_std(sc, iso->stds[i]);
-	free(iso->stds, M_USBHC);
+	mutex_exit(&sc->sc_lock);
 	kmem_free(iso->stds, UHCI_VFRAMELIST_COUNT * sizeof (uhci_soft_td_t *));
 	return (USBD_NOMEM);
+}
 void
 uhci_device_isoc_done(usbd_xfer_handle xfer)
+{
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	int i, offs;
 	int rd = UE_GET_DIR(upipe->pipe.endpoint->edesc->bEndpointAddress) == UE_DIR_IN;
 	DPRINTFN(4, ("uhci_isoc_done: length=%d, busy_free=0x%08x\n",
 @@ -2912,26 +2969,28 @@ uhci_device_isoc_done(usbd_xfer_handle x
+}
 void
 uhci_device_intr_done(usbd_xfer_handle xfer)
+{
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_softc_t *sc = ii->sc;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	uhci_soft_qh_t *sqh;
 	int i, npoll, isread;
 	DPRINTFN(5, ("uhci_device_intr_done: length=%d\n", xfer->actlen));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	npoll = upipe->u.intr.npoll;
 	for(i = 0; i < npoll; i++) {
 		sqh = upipe->u.intr.qhs[i];
 		sqh->elink = NULL;
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	uhci_free_std_chain(sc, ii->stdstart, NULL);
 	isread = UE_GET_DIR(upipe->pipe.endpoint->edesc->bEndpointAddress) == UE_DIR_IN;
 @@ -2988,26 +3047,28 @@ uhci_device_intr_done(usbd_xfer_handle x
+	}
+}
 /* Deallocate request data structures */
 void
 uhci_device_ctrl_done(usbd_xfer_handle xfer)
+{
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_softc_t *sc = ii->sc;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	int len = UGETW(xfer->request.wLength);
 	int isread = (xfer->request.bmRequestType & UT_READ);
 	KASSERT(mutex_owned(&sc->sc_lock));
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST))
 		panic("uhci_device_ctrl_done: not a request");
 #endif
 	if (!uhci_active_intr_info(ii))
 		return;
 	uhci_del_intr_info(ii);	/* remove from active list */
 	if (upipe->pipe.device->speed == USB_SPEED_LOW)
 		uhci_remove_ls_ctrl(sc, upipe->u.ctl.sqh);
 	else
 @@ -3027,26 +3088,28 @@ uhci_device_ctrl_done(usbd_xfer_handle x
+}
 /* Deallocate request data structures */
 void
 uhci_device_bulk_done(usbd_xfer_handle xfer)
+{
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_softc_t *sc = ii->sc;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	DPRINTFN(5,("uhci_device_bulk_done: xfer=%p ii=%p sc=%p upipe=%p\n",
 		    xfer, ii, sc, upipe));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (!uhci_active_intr_info(ii))
 		return;
 	uhci_del_intr_info(ii);	/* remove from active list */
 	uhci_remove_bulk(sc, upipe->u.bulk.sqh);
 	uhci_free_std_chain(sc, ii->stdstart, NULL);
 	DPRINTFN(5, ("uhci_device_bulk_done: length=%d\n", xfer->actlen));
+}
 /* Add interrupt QH, called with vflock. */
 @@ -3108,95 +3171,100 @@ uhci_remove_intr(uhci_softc_t *sc, uhci_
 	usb_syncmem(&pqh->dma, pqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(pqh->qh.qh_hlink),
 	    BUS_DMASYNC_PREWRITE);
 	delay(UHCI_QH_REMOVE_DELAY);
 	if (vf->eqh == sqh)
 		vf->eqh = pqh;
 	vf->bandwidth--;
+}
 usbd_status
 uhci_device_setintr(uhci_softc_t *sc, struct uhci_pipe *upipe, int ival)
+{
 	uhci_soft_qh_t *sqh;
-	int i, npoll, s;
+	int i, npoll;
 	u_int bestbw, bw, bestoffs, offs;
 	DPRINTFN(2, ("uhci_device_setintr: pipe=%p\n", upipe));
 	if (ival == 0) {
 		printf("uhci_device_setintr: 0 interval\n");
 		return (USBD_INVAL);
+	}
 	if (ival > UHCI_VFRAMELIST_COUNT)
 		ival = UHCI_VFRAMELIST_COUNT;
 	npoll = (UHCI_VFRAMELIST_COUNT + ival - 1) / ival;
 	DPRINTFN(2, ("uhci_device_setintr: ival=%d npoll=%d\n", ival, npoll));
 	upipe->u.intr.npoll = npoll;
 	upipe->u.intr.qhs =
-		malloc(npoll * sizeof(uhci_soft_qh_t *), M_USBHC, M_WAITOK);
+		kmem_alloc(npoll * sizeof(uhci_soft_qh_t *), KM_SLEEP);
 	if (upipe->u.intr.qhs == NULL)
 		return USBD_NOMEM;
 	/*
 	 * Figure out which offset in the schedule that has most
 	 * bandwidth left over.
 	 */
 #define MOD(i) ((i) & (UHCI_VFRAMELIST_COUNT-1))
 	for (bestoffs = offs = 0, bestbw = ~0; offs < ival; offs++) {
 		for (bw = i = 0; i < npoll; i++)
 			bw += sc->sc_vframes[MOD(i * ival + offs)].bandwidth;
 		if (bw < bestbw) {
 			bestbw = bw;
 			bestoffs = offs;
+		}
+	}
 	DPRINTFN(1, ("uhci_device_setintr: bw=%d offs=%d\n", bestbw, bestoffs));
 	mutex_enter(&sc->sc_lock);
 	for(i = 0; i < npoll; i++) {
 		upipe->u.intr.qhs[i] = sqh = uhci_alloc_sqh(sc);
 		sqh->elink = NULL;
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		sqh->pos = MOD(i * ival + bestoffs);
+	}
 #undef MOD
 	s = splusb();
 	/* Enter QHs into the controller data structures. */
 	for(i = 0; i < npoll; i++)
 		uhci_add_intr(sc, upipe->u.intr.qhs[i]);
-	splx(s);
+	mutex_exit(&sc->sc_lock);
 	DPRINTFN(5, ("uhci_device_setintr: returns %p\n", upipe));
 	return (USBD_NORMAL_COMPLETION);
+}
 /* Open a new pipe. */
 usbd_status
 uhci_open(usbd_pipe_handle pipe)
+{
 	uhci_softc_t *sc = pipe->device->bus->hci_private;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	usb_endpoint_descriptor_t *ed = pipe->endpoint->edesc;
-	usbd_status err;
+	usbd_status err = USBD_NOMEM;
 	int ival;
 	DPRINTFN(1, ("uhci_open: pipe=%p, addr=%d, endpt=%d (%d)\n",
 		     pipe, pipe->device->address,
 		     ed->bEndpointAddress, sc->sc_addr));
 	if (sc->sc_dying)
 		return USBD_IOERROR;
 	upipe->aborting = 0;
 	/* toggle state needed for bulk endpoints */
 	upipe->nexttoggle = pipe->endpoint->datatoggle;
 	if (pipe->device->address == sc->sc_addr) {
 		switch (ed->bEndpointAddress) {
 		case USB_CONTROL_ENDPOINT:
 			pipe->methods = &uhci_root_ctrl_methods;
 			break;
 		case UE_DIR_IN | UHCI_INTR_ENDPT:
 			pipe->methods = &uhci_root_intr_methods;
 			break;
 		default:
 @@ -3240,27 +3308,27 @@ uhci_open(usbd_pipe_handle pipe)
 			pipe->methods = &uhci_device_isoc_methods;
 			return (uhci_setup_isoc(pipe));
 		case UE_BULK:
 			pipe->methods = &uhci_device_bulk_methods;
 			upipe->u.bulk.sqh = uhci_alloc_sqh(sc);
 			if (upipe->u.bulk.sqh == NULL)
 				goto bad;
 			break;
+		}
+	}
 	return (USBD_NORMAL_COMPLETION);
  bad:
-	return (USBD_NOMEM);
+	return USBD_NOMEM;
+}
 /*
  * Data structures and routines to emulate the root hub.
  */
 usb_device_descriptor_t uhci_devd = {
 	USB_DEVICE_DESCRIPTOR_SIZE,
 	UDESC_DEVICE,		/* type */
 	{0x00, 0x01},		/* USB version */
 	UDCLASS_HUB,		/* class */
 	UDSUBCLASS_HUB,		/* subclass */
 	UDPROTO_FSHUB,		/* protocol */
 ,			/* max packet */
 @@ -3405,48 +3473,51 @@ uhci_portreset(uhci_softc_t *sc, int ind
 		return (USBD_TIMEOUT);
+	}
 	sc->sc_isreset = 1;
 	return (USBD_NORMAL_COMPLETION);
+}
 /*
  * Simulate a hardware hub by handling all the necessary requests.
  */
 usbd_status
 uhci_root_ctrl_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * so start it first.
 	 */
 	return (uhci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 usbd_status
 uhci_root_ctrl_start(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usb_device_request_t *req;
 	void *buf = NULL;
 	int port, x;
-	int s, len, value, index, status, change, l, totlen = 0;
+	int len, value, index, status, change, l, totlen = 0;
 	usb_port_status_t ps;
 	usbd_status err;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST))
 		panic("uhci_root_ctrl_transfer: not a request");
 #endif
 	req = &xfer->request;
 	DPRINTFN(2,("uhci_root_ctrl_control type=0x%02x request=%02x\n",
 @@ -3749,29 +3820,29 @@ uhci_root_ctrl_start(usbd_xfer_handle xf
 		default:
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		break;
 	default:
 		err = USBD_IOERROR;
 		goto ret;
+	}
 	xfer->actlen = totlen;
 	err = USBD_NORMAL_COMPLETION;
  ret:
 	xfer->status = err;
-	s = splusb();
+	mutex_enter(&sc->sc_lock);
 	usb_transfer_complete(xfer);
-	splx(s);
+	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a root control request. */
 void
 uhci_root_ctrl_abort(usbd_xfer_handle xfer)
+{
 	/* Nothing to do, all transfers are synchronous. */
+}
 /* Close the root pipe. */
 void
 uhci_root_ctrl_close(usbd_pipe_handle pipe)
 @@ -3792,30 +3863,33 @@ uhci_root_intr_abort(usbd_xfer_handle xf
 		DPRINTF(("uhci_root_intr_abort: remove\n"));
 		xfer->pipe->intrxfer = 0;
+	}
 	xfer->status = USBD_CANCELLED;
 #ifdef DIAGNOSTIC
 	UXFER(xfer)->iinfo.isdone = 1;
 #endif
 	usb_transfer_complete(xfer);
+}
 usbd_status
 uhci_root_intr_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * start first
 	 */
 	return (uhci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 /* Start a transfer on the root interrupt pipe */
 usbd_status
 uhci_root_intr_start(usbd_xfer_handle xfer)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhcivar.h,v 1.48 2010/11/03 22:34:23 dyoung Exp $	*/
+/*	$NetBSD: uhcivar.h,v 1.48.14.1 2011/12/08 08:56:57 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -123,26 +123,30 @@ struct uhci_vframe {
 	uhci_soft_td_t *etd;		/* pointer to last TD */
 	uhci_soft_qh_t *hqh;		/* pointer to dummy QH */
 	uhci_soft_qh_t *eqh;		/* pointer to last QH */
 	u_int bandwidth;		/* max bandwidth used by this frame */
 };
 typedef struct uhci_softc {
 	device_t sc_dev;
 	struct usbd_bus sc_bus;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	bus_size_t sc_size;
 	kmutex_t sc_lock;
 	kmutex_t sc_intr_lock;
 	kcondvar_t sc_softwake_cv;
 	uhci_physaddr_t *sc_pframes;
 	usb_dma_t sc_dma;
 	struct uhci_vframe sc_vframes[UHCI_VFRAMELIST_COUNT];
 	uhci_soft_qh_t *sc_lctl_start;	/* dummy QH for low speed control */
 	uhci_soft_qh_t *sc_lctl_end;	/* last control QH */
 	uhci_soft_qh_t *sc_hctl_start;	/* dummy QH for high speed control */
 	uhci_soft_qh_t *sc_hctl_end;	/* last control QH */
 	uhci_soft_qh_t *sc_bulk_start;	/* dummy QH for bulk */
 	uhci_soft_qh_t *sc_bulk_end;	/* last bulk transfer */
 	uhci_soft_qh_t *sc_last_qh;	/* dummy QH at the end */
 	u_int32_t sc_loops;		/* number of QHs that wants looping */