 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci.c,v 1.234.2.34 2015/03/01 08:26:55 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.35 2015/03/02 21:52:02 skrll Exp $ */
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum,
  * Jeremy Morse (jeremy.morse@gmail.com), Jared D. McNeill
  * (jmcneill@invisible.ca) and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -43,27 +43,27 @@
 /*
  * TODO:
  * 1) hold off explorations by companion controllers until ehci has started.
+ *
  * 2) The hub driver needs to handle and schedule the transaction translator,
  *    to assign place in frame where different devices get to go. See chapter
  *    on hubs in USB 2.0 for details.
+ *
  * 3) Command failures are not recovered correctly.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.34 2015/03/01 08:26:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.35 2015/03/02 21:52:02 skrll Exp $");
 #include "ohci.h"
 #include "uhci.h"
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 @@ -1008,36 +1008,35 @@ ehci_idone(struct ehci_xfer *ex)
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->ux_pipe;
 	struct ehci_softc *sc = xfer->ux_pipe->up_dev->ud_bus->ub_hcpriv;
 	ehci_soft_qtd_t *sqtd, *lsqtd;
 	uint32_t status = 0, nstatus = 0;
 	int actlen;
 	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
 	KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 	USBHIST_LOG(ehcidebug, "ex=%p", ex, 0, 0, 0);
 #ifdef DIAGNOSTIC
 	if (ex->ex_isdone) {
 		printf("ehci_idone: ex=%p is done!\n", ex);
 #ifdef EHCI_DEBUG
 	if (ex->ex_isdone) {
 		USBHIST_LOGN(ehcidebug, 5, "--- dump start ---", 0, 0, 0, 0);
 		ehci_dump_exfer(ex);
 		USBHIST_LOGN(ehcidebug, 5, "--- dump end ---", 0, 0, 0, 0);
 #endif
 		return;
+	}
-	ex->ex_isdone = 1;
+#endif
 	KASSERT(!ex->ex_isdone);
 	ex->ex_isdone = true;
 #endif
 	if (xfer->ux_status == USBD_CANCELLED ||
 	    xfer->ux_status == USBD_TIMEOUT) {
 		USBHIST_LOG(ehcidebug, "aborted xfer=%p", xfer, 0, 0, 0);
 		return;
+	}
 	USBHIST_LOG(ehcidebug, "xfer=%p, pipe=%p ready", xfer, epipe, 0, 0);
 #ifdef EHCI_DEBUG
 	USBHIST_LOGN(ehcidebug, 5, "--- dump start ---", 0, 0, 0, 0);
 	ehci_dump_sqtds(ex->ex_sqtdstart);
 	USBHIST_LOGN(ehcidebug, 5, "--- dump end ---", 0, 0, 0, 0);
 @@ -1509,47 +1508,42 @@ ehci_shutdown(device_t self, int flags)
 	return true;
+}
 Static usbd_xfer_handle
 ehci_allocx(struct usbd_bus *bus)
+{
 	struct ehci_softc *sc = bus->ub_hcpriv;
 	usbd_xfer_handle xfer;
 	xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct ehci_xfer));
 #ifdef DIAGNOSTIC
-		EXFER(xfer)->ex_isdone = 1;
+		EXFER(xfer)->ex_isdone = true;
 		xfer->ux_state = XFER_BUSY;
 #endif
+	}
 	return xfer;
+}
 Static void
 ehci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
+{
 	struct ehci_softc *sc = bus->ub_hcpriv;
 	KASSERT(xfer->ux_state == XFER_BUSY);
 	KASSERT(EXFER(xfer)->ex_isdone);
 #ifdef DIAGNOSTIC
 	if (xfer->ux_state != XFER_BUSY) {
 		printf("ehci_freex: xfer=%p not busy, 0x%08x\n", xfer,
 		       xfer->ux_state);
 	xfer->ux_state = XFER_FREE;
 	if (!EXFER(xfer)->ex_isdone) {
 		printf("ehci_freex: !isdone\n");
 #endif
 	pool_cache_put(sc->sc_xferpool, xfer);
+}
 Static void
 ehci_get_lock(struct usbd_bus *bus, kmutex_t **lock)
+{
 	struct ehci_softc *sc = bus->ub_hcpriv;
 	*lock = &sc->sc_lock;
+}
 Static void
 @@ -3228,27 +3222,27 @@ ehci_abort_xfer(usbd_xfer_handle xfer, u
 		sqh->qh.qh_qtd.qtd_status = qhstatus;
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(ehci_qh_t, qh_qtd.qtd_status),
 		    sizeof(sqh->qh.qh_qtd.qtd_status),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	} else {
 		USBHIST_LOG(ehcidebug, "no hit", 0, 0, 0, 0);
+	}
 	/*
 	 * Step 4: Execute callback.
 	 */
 #ifdef DIAGNOSTIC
-	exfer->ex_isdone = 1;
+	exfer->ex_isdone = true;
 #endif
 	wake = xfer->ux_hcflags & UXFER_ABORTWAIT;
 	xfer->ux_hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake) {
 		cv_broadcast(&xfer->ux_hccv);
+	}
 	KASSERT(mutex_owned(&sc->sc_lock));
 #undef exfer
+}
 Static void
 @@ -3333,27 +3327,27 @@ ehci_abort_isoc_xfer(usbd_xfer_handle xf
 			usb_syncmem(&sitd->dma,
 			    sitd->offs + offsetof(ehci_sitd_t, sitd_buffer),
 			    sizeof(sitd->sitd.sitd_buffer),
 			    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+		}
+	}
 	sc->sc_softwake = 1;
 	usb_schedsoftintr(&sc->sc_bus);
 	cv_wait(&sc->sc_softwake_cv, &sc->sc_lock);
 #ifdef DIAGNOSTIC
-	exfer->ex_isdone = 1;
+	exfer->ex_isdone = true;
 #endif
 	wake = xfer->ux_hcflags & UXFER_ABORTWAIT;
 	xfer->ux_hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake) {
 		cv_broadcast(&xfer->ux_hccv);
+	}
 done:
 	KASSERT(mutex_owned(&sc->sc_lock));
 	return;
+}
 @@ -3603,31 +3597,29 @@ ehci_device_request(usbd_xfer_handle xfe
 	stat->xfer = xfer;
 	stat->len = 0;
 	usb_syncmem(&stat->dma, stat->offs, sizeof(stat->qtd),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef EHCI_DEBUG
 	USBHIST_LOGN(ehcidebug, 5, "dump:", 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
 	ehci_dump_sqtds(setup);
 #endif
 	exfer->ex_sqtdstart = setup;
 	exfer->ex_sqtdend = stat;
 	KASSERT(exfer->ex_isdone);
 #ifdef DIAGNOSTIC
-	if (!exfer->ex_isdone) {
+	exfer->ex_isdone = false;
 		printf("ehci_device_request: not done, exfer=%p\n", exfer);
 	exfer->ex_isdone = 0;
 #endif
 	/* Insert qTD in QH list. */
 	ehci_set_qh_qtd(sqh, setup); /* also does usb_syncmem(sqh) */
 	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
 		callout_reset(&xfer->ux_callout, mstohz(xfer->ux_timeout),
 		    ehci_timeout, xfer);
+	}
 	ehci_add_intr_list(sc, exfer);
 	xfer->ux_status = USBD_IN_PROGRESS;
 	mutex_exit(&sc->sc_lock);
 #ifdef EHCI_DEBUG
 @@ -3738,31 +3730,29 @@ ehci_device_bulk_start(usbd_xfer_handle
 		return err;
+	}
 #ifdef EHCI_DEBUG
 	USBHIST_LOGN(ehcidebug, 5, "--- dump start ---", 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
 	ehci_dump_sqtds(data);
 	USBHIST_LOGN(ehcidebug, 5, "--- dump end ---", 0, 0, 0, 0);
 #endif
 	/* Set up interrupt info. */
 	exfer->ex_sqtdstart = data;
 	exfer->ex_sqtdend = dataend;
 	KASSERT(exfer->ex_isdone);
 #ifdef DIAGNOSTIC
-	if (!exfer->ex_isdone) {
+	exfer->ex_isdone = false;
 		printf("ehci_device_bulk_start: not done, ex=%p\n", exfer);
 	exfer->ex_isdone = 0;
 #endif
 	ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */
 	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
 		callout_reset(&xfer->ux_callout, mstohz(xfer->ux_timeout),
 		    ehci_timeout, xfer);
+	}
 	ehci_add_intr_list(sc, exfer);
 	xfer->ux_status = USBD_IN_PROGRESS;
 	mutex_exit(&sc->sc_lock);
 #ifdef EHCI_DEBUG
 	USBHIST_LOGN(ehcidebug, 5, "data(2)", 0, 0, 0, 0);
 @@ -3926,31 +3916,29 @@ ehci_device_intr_start(usbd_xfer_handle
 		return err;
+	}
 #ifdef EHCI_DEBUG
 	USBHIST_LOGN(ehcidebug, 5, "--- dump start ---", 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
 	ehci_dump_sqtds(data);
 	USBHIST_LOGN(ehcidebug, 5, "--- dump end ---", 0, 0, 0, 0);
 #endif
 	/* Set up interrupt info. */
 	exfer->ex_sqtdstart = data;
 	exfer->ex_sqtdend = dataend;
 	KASSERT(exfer->ex_isdone);
 #ifdef DIAGNOSTIC
-	if (!exfer->ex_isdone) {
+	exfer->ex_isdone = false;
 		printf("ehci_device_intr_start: not done, ex=%p\n", exfer);
 	exfer->ex_isdone = 0;
 #endif
 	ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */
 	if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
 		callout_reset(&xfer->ux_callout, mstohz(xfer->ux_timeout),
 		    ehci_timeout, xfer);
+	}
 	ehci_add_intr_list(sc, exfer);
 	xfer->ux_status = USBD_IN_PROGRESS;
 	mutex_exit(&sc->sc_lock);
 #ifdef EHCI_DEBUG
 	USBHIST_LOGN(ehcidebug, 5, "data(2)", 0, 0, 0, 0);
 @@ -4029,34 +4017,29 @@ ehci_device_intr_done(usbd_xfer_handle x
 		sqh = epipe->sqh;
 		err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer,
 		    &data, &dataend);
 		if (err) {
 			USBHIST_LOG(ehcidebug, "no memory", 0, 0, 0, 0);
 			xfer->ux_status = err;
 			return;
+		}
 		/* Set up interrupt info. */
 		exfer->ex_sqtdstart = data;
 		exfer->ex_sqtdend = dataend;
 		KASSERT(exfer->ex_isdone);
 #ifdef DIAGNOSTIC
-		if (!exfer->ex_isdone) {
+		exfer->ex_isdone = false;
 			USBHIST_LOG(ehcidebug, "marked not done, ex = %p",
 				exfer, 0, 0, 0);
 			printf("ehci_device_intr_done: not done, ex=%p\n",
 			    exfer);
 		exfer->ex_isdone = 0;
 #endif
 		ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */
 		if (xfer->ux_timeout && !sc->sc_bus.ub_usepolling) {
 			callout_reset(&xfer->ux_callout,
 			    mstohz(xfer->ux_timeout), ehci_timeout, xfer);
+		}
 		xfer->ux_status = USBD_IN_PROGRESS;
 	} else if (xfer->ux_status != USBD_NOMEM && ehci_active_intr_list(ex)) {
 		ehci_del_intr_list(sc, ex); /* remove from active list */
 		ehci_free_sqtd_chain(sc, ex->ex_sqtdstart, NULL);
 		endpt = epipe->pipe.up_endpoint->ue_edesc->bEndpointAddress;
 @@ -4125,31 +4108,30 @@ ehci_device_fs_isoc_start(usbd_xfer_hand
 	/*
 	 * To avoid complication, don't allow a request right now that'll span
 	 * the entire frame table. To within 4 frames, to allow some leeway
 	 * on either side of where the hc currently is.
 	 */
 	if (epipe->pipe.up_endpoint->ue_edesc->bInterval *
 			xfer->ux_nframes >= sc->sc_flsize - 4) {
 		printf("ehci: isoc descriptor requested that spans the entire"
 		    "frametable, too many frames\n");
 		return USBD_INVAL;
+	}
 	KASSERT(!(xfer->ux_rqflags & URQ_REQUEST));
 	KASSERT(exfer->ex_isdone);
 #ifdef DIAGNOSTIC
-	if (!exfer->ex_isdone)
+	exfer->ex_isdone = false;
 		printf("ehci_device_fs_isoc_start: not done, ex = %p\n", exfer);
 	exfer->ex_isdone = 0;
 #endif
 	/*
 	 * Step 1: Allocate and initialize sitds.
 	 */
 	i = epipe->pipe.up_endpoint->ue_edesc->bInterval;
 	if (i > 16 || i == 0) {
 		/* Spec page 271 says intervals > 16 are invalid */
 		USBHIST_LOG(ehcidebug, "bInterval %d invalid", 0, 0, 0, 0);
 		return USBD_INVAL;
+	}
 @@ -4442,34 +4424,29 @@ ehci_device_isoc_start(usbd_xfer_handle
 	 * To avoid complication, don't allow a request right now that'll span
 	 * the entire frame table. To within 4 frames, to allow some leeway
 	 * on either side of where the hc currently is.
 	 */
 	if ((1 << (epipe->pipe.up_endpoint->ue_edesc->bInterval)) *
 			xfer->ux_nframes >= (sc->sc_flsize - 4) * 8) {
 		USBHIST_LOG(ehcidebug,
 		    "isoc descriptor spans entire frametable", 0, 0, 0, 0);
 		printf("ehci: isoc descriptor requested that spans the entire frametable, too many frames\n");
 		return USBD_INVAL;
+	}
 	KASSERT(!(xfer->ux_rqflags & URQ_REQUEST));
 	KASSERT(exfer->ex_isdone);
 #ifdef DIAGNOSTIC
-	if (!exfer->ex_isdone) {
+	exfer->ex_isdone = false;
 		USBHIST_LOG(ehcidebug, "marked not done, ex = %p", exfer,
 , 0, 0);
 		printf("ehci_device_isoc_start: not done, ex = %p\n", exfer);
 	exfer->ex_isdone = 0;
 #endif
 	/*
 	 * Step 1: Allocate and initialize itds, how many do we need?
 	 * One per transfer if interval >= 8 microframes, fewer if we use
 	 * multiple microframes per frame.
 	 */
 	i = epipe->pipe.up_endpoint->ue_edesc->bInterval;
 	if (i > 16 || i == 0) {
 		/* Spec page 271 says intervals > 16 are invalid */
 		USBHIST_LOG(ehcidebug, "bInterval %d invalid", i, 0, 0, 0);
 		return USBD_INVAL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehcivar.h,v 1.42.14.9 2015/02/01 08:29:46 skrll Exp $ */
+/*	$NetBSD: ehcivar.h,v 1.42.14.10 2015/03/02 21:52:02 skrll Exp $ */
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * 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.
 @@ -101,27 +101,27 @@ struct ehci_xfer {
 			ehci_soft_qtd_t *ex_sqtdend;
 		};
 		/* isoc */
 		struct {
 			ehci_soft_itd_t *ex_itdstart;
 			ehci_soft_itd_t *ex_itdend;
 		};
 		/* split isoc */
 		struct {
 			ehci_soft_sitd_t *ex_sitdstart;
 			ehci_soft_sitd_t *ex_sitdend;
 		};
 	};
-	int ex_isdone;	/* used only when DIAGNOSTIC is defined */
+	bool ex_isdone;	/* used only when DIAGNOSTIC is defined */
 };
 #define EXFER(xfer) ((struct ehci_xfer *)(xfer))
 /* Information about an entry in the interrupt list. */
 struct ehci_soft_islot {
 	ehci_soft_qh_t *sqh;	/* Queue Head. */
 };
 #define EHCI_FRAMELIST_MAXCOUNT	1024
 #define EHCI_IPOLLRATES		8 /* Poll rates (1ms, 2, 4, 8 .. 128) */
 #define EHCI_INTRQHS		((1 << EHCI_IPOLLRATES) - 1)
 #define EHCI_MAX_POLLRATE	(1 << (EHCI_IPOLLRATES - 1))
 #define EHCI_IQHIDX(lev, pos) \