 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohci.c,v 1.254.2.41 2016/01/09 21:45:20 skrll Exp $	*/
+/*	$NetBSD: ohci.c,v 1.254.2.42 2016/01/10 10:16:00 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2005, 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) at
  * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca)
  * and Matthew R. Green (mrg@eterna.com.au).
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -31,27 +31,27 @@
  * 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 Open Host Controller driver.
+ *
  * OHCI spec: http://www.compaq.com/productinfo/development/openhci.html
  * USB spec: http://www.usb.org/developers/docs/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.41 2016/01/09 21:45:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.42 2016/01/10 10:16:00 skrll Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
 @@ -1517,31 +1517,31 @@ ohci_softintr(void *v)
+		}
 		callout_stop(&xfer->ux_callout);
 		len = std->len;
 		if (std->td.td_cbp != 0)
 			len -= O32TOH(std->td.td_be) -
 			       O32TOH(std->td.td_cbp) + 1;
 		DPRINTFN(10, "len=%d, flags=0x%x", len, std->flags, 0, 0);
 		if (std->flags & OHCI_ADD_LEN)
 			xfer->ux_actlen += len;
 		cc = OHCI_TD_GET_CC(O32TOH(std->td.td_flags));
 		if (cc == OHCI_CC_NO_ERROR) {
 			ohci_hash_rem_td(sc, std);
 			if (std->flags & OHCI_CALL_DONE) {
 				xfer->ux_status = USBD_NORMAL_COMPLETION;
 				usb_transfer_complete(xfer);
+			}
 			ohci_hash_rem_td(sc, std);
 		} else {
 			/*
 			 * Endpoint is halted.  First unlink all the TDs
 			 * belonging to the failed transfer, and then restart
 			 * the endpoint.
 			 */
 			ohci_soft_td_t *p, *n;
 			opipe = OHCI_PIPE2OPIPE(xfer->ux_pipe);
 			DPRINTFN(15, "error cc=%d",
 			    OHCI_TD_GET_CC(O32TOH(std->td.td_flags)), 0, 0, 0);
 			/* remove xfer's TDs from the hash */
 @@ -1676,27 +1676,30 @@ ohci_device_intr_done(struct usbd_xfer *
 	    (UE_GET_DIR(xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress) == UE_DIR_IN);
 	OHCIHIST_FUNC(); OHCIHIST_CALLED();
 	DPRINTFN(10, "xfer=%p, actlen=%d", xfer, xfer->ux_actlen, 0, 0);
 	KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 	usb_syncmem(&xfer->ux_dmabuf, 0, xfer->ux_length,
 	    isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
 	if (xfer->ux_pipe->up_repeat) {
 	    	ohci_soft_td_t *data, *last, *tail;
 		int len = xfer->ux_length;
-	    	/* Use "tail" TD and loan our first TD to next transfer */
+		/*
 		 * Use the pipe "tail" TD as our first and loan our first TD
 		 * to the next transfer.
 		 */
 		data = opipe->tail.td;
 		opipe->tail.td = ox->ox_stds[0];
 		ox->ox_stds[0] = data;
 		ohci_reset_std_chain(sc, xfer, len, isread, data, &last);
 		tail = opipe->tail.td;	/* point at sentinel */
 		memset(&tail->td, 0, sizeof(tail->td));
 		tail->nexttd = NULL;
 		tail->xfer = NULL;
 		usb_syncmem(&tail->dma, tail->offs, sizeof(tail->td),
 		    BUS_DMASYNC_PREWRITE);
 		/* We want interrupt at the end of the transfer. */
 @@ -2718,78 +2721,76 @@ ohci_root_intr_close(struct usbd_pipe *p
 	OHCIHIST_FUNC(); OHCIHIST_CALLED();
 	sc->sc_intrxfer = NULL;
+}
 /************************/
 int
 ohci_device_ctrl_init(struct usbd_xfer *xfer)
+{
 	struct ohci_xfer *ox = OHCI_XFER2OXFER(xfer);
 	usb_device_request_t *req = &xfer->ux_request;
 	ohci_softc_t *sc = OHCI_XFER2SC(xfer);
-	ohci_soft_td_t *stat, *tail;
+	ohci_soft_td_t *stat, *setup;
 	int isread = req->bmRequestType & UT_READ;
 	int len = xfer->ux_bufsize;
 	int err = ENOMEM;
 	OHCIHIST_FUNC(); OHCIHIST_CALLED();
-	/* The TD for setup will be a 'tail' from elsewhere */
+	setup = ohci_alloc_std(sc);
-	stat = ohci_alloc_std(sc);
+	if (setup == NULL) {
 	if (stat == NULL) {
 		goto bad1;
+	}
-	tail = ohci_alloc_std(sc);
+	stat = ohci_alloc_std(sc);
-	if (tail == NULL) {
+	if (stat == NULL) {
 		goto bad2;
+	}
 	tail->xfer = NULL;
 	ox->ox_setup = setup;
 	ox->ox_stat = stat;
 	ox->ox_tdtail = tail;
 	ox->ox_nstd = 0;
 	/* Set up data transaction */
 	if (len != 0) {
 		err = ohci_alloc_std_chain(sc, xfer, len, isread);
 		if (err) {
 			goto bad3;
+		}
+	}
 	return 0;
  bad3:
 	ohci_free_std(sc, tail);
  bad2:
 	ohci_free_std(sc, stat);
  bad2:
 	ohci_free_std(sc, setup);
  bad1:
 	return err;
+}
 void
 ohci_device_ctrl_fini(struct usbd_xfer *xfer)
+{
 	struct ohci_xfer *ox = OHCI_XFER2OXFER(xfer);
 	ohci_softc_t *sc = OHCI_XFER2SC(xfer);
 	struct ohci_pipe *opipe = OHCI_PIPE2OPIPE(xfer->ux_pipe);
 	OHCIHIST_FUNC(); OHCIHIST_CALLED();
 	DPRINTFN(8, "xfer %p nstd %d", xfer, ox->ox_nstd, 0, 0);
 	mutex_enter(&sc->sc_lock);
-	if (ox->ox_tdtail != opipe->tail.td) {
+	if (ox->ox_setup != opipe->tail.td) {
-		ohci_free_std_locked(sc, ox->ox_tdtail);
+		ohci_free_std_locked(sc, ox->ox_setup);
+	}
 	for (size_t i = 0; i < ox->ox_nstd; i++) {
 		ohci_soft_td_t *std = ox->ox_stds[i];
 		if (std == NULL)
 			break;
 		ohci_free_std_locked(sc, std);
+	}
 	ohci_free_std_locked(sc, ox->ox_stat);
 	mutex_exit(&sc->sc_lock);
 	if (ox->ox_nstd) {
 		const size_t sz = sizeof(ohci_soft_td_t *) * ox->ox_nstd;
 		kmem_free(ox->ox_stds, sz);
 @@ -2835,30 +2836,36 @@ ohci_device_ctrl_start(struct usbd_xfer
 	isread = req->bmRequestType & UT_READ;
 	len = UGETW(req->wLength);
 	DPRINTF("xfer=%p len=%d, addr=%d, endpt=%d", xfer, len, dev->ud_addr,
 	    opipe->pipe.up_endpoint->ue_edesc->bEndpointAddress);
 	DPRINTF("type=0x%02x, request=0x%02x, wValue=0x%04x, wIndex=0x%04x",
 	    req->bmRequestType, req->bRequest, UGETW(req->wValue),
 	    UGETW(req->wIndex));
 	/* Need to take lock here for pipe->tail.td */
 	mutex_enter(&sc->sc_lock);
 	/*
 	 * Use the pipe "tail" TD as our first and loan our first TD to the
 	 * next transfer
 	 */
 	setup = opipe->tail.td;
 	opipe->tail.td = ox->ox_setup;
 	ox->ox_setup = setup;
 	stat = ox->ox_stat;
-	tail = ox->ox_tdtail;
+	tail = opipe->tail.td;	/* point at sentinel */
 	opipe->tail.td = tail;
 	sed = opipe->sed;
 	KASSERTMSG(OHCI_ED_GET_FA(O32TOH(sed->ed.ed_flags)) == dev->ud_addr,
 	    "address ED %d pipe %d\n",
 	    OHCI_ED_GET_FA(O32TOH(sed->ed.ed_flags)), dev->ud_addr);
 	KASSERTMSG(OHCI_ED_GET_MAXP(O32TOH(sed->ed.ed_flags)) ==
 	    UGETW(opipe->pipe.up_endpoint->ue_edesc->wMaxPacketSize),
 	    "MPL ED %d pipe %d\n",
 	    OHCI_ED_GET_MAXP(O32TOH(sed->ed.ed_flags)),
 	    UGETW(opipe->pipe.up_endpoint->ue_edesc->wMaxPacketSize));
 	/* next will point to data if len != 0 */
 @@ -3115,27 +3122,30 @@ ohci_device_bulk_start(struct usbd_xfer
 	KASSERT(!(xfer->ux_rqflags & URQ_REQUEST));
 	len = xfer->ux_length;
 	endpt = xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	sed = opipe->sed;
 	DPRINTFN(4, "xfer=%p len=%d isread=%d flags=%d", xfer, len, isread,
 	    xfer->ux_flags);
 	DPRINTFN(4, "endpt=%d", endpt, 0, 0, 0);
 	mutex_enter(&sc->sc_lock);
-	/* Use "tail" TD and loan our first TD to next transfer */
+	/*
 	 * Use the pipe "tail" TD as our first and loan our first TD to the
 	 * next transfer
 	 */
 	data = opipe->tail.td;
 	opipe->tail.td = ox->ox_stds[0];
 	ox->ox_stds[0] = data;
 	ohci_reset_std_chain(sc, xfer, len, isread, data, &last);
 	tail = opipe->tail.td;	/* point at sentinel */
 	memset(&tail->td, 0, sizeof(tail->td));
 	tail->nexttd = NULL;
 	tail->xfer = NULL;
 	usb_syncmem(&tail->dma, tail->offs, sizeof(tail->td),
 	    BUS_DMASYNC_PREWRITE);
 	xfer->ux_hcpriv = data;
 @@ -3309,27 +3319,30 @@ ohci_device_intr_start(struct usbd_xfer
 		return USBD_IOERROR;
 	DPRINTFN(3, "xfer=%p len=%d flags=%d priv=%p", xfer, xfer->ux_length,
 	    xfer->ux_flags, xfer->ux_priv);
 	KASSERT(!(xfer->ux_rqflags & URQ_REQUEST));
 	len = xfer->ux_length;
 	endpt = xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	mutex_enter(&sc->sc_lock);
-	/* Use "tail" TD and loan our first TD to next transfer */
+	/*
 	 * Use the pipe "tail" TD as our first and loan our first TD to the
 	 * next transfer.
 	 */
 	data = opipe->tail.td;
 	opipe->tail.td = ox->ox_stds[0];
 	ox->ox_stds[0] = data;
 	ohci_reset_std_chain(sc, xfer, len, isread, data, &last);
 	tail = opipe->tail.td;	/* point at sentinel */
 	memset(&tail->td, 0, sizeof(tail->td));
 	tail->nexttd = NULL;
 	tail->xfer = NULL;
 	usb_syncmem(&tail->dma, tail->offs, sizeof(tail->td),
 	    BUS_DMASYNC_PREWRITE);
 	xfer->ux_hcpriv = data;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohcivar.h,v 1.55.6.11 2015/12/06 15:39:35 skrll Exp $	*/
+/*	$NetBSD: ohcivar.h,v 1.55.6.12 2016/01/10 10:16:00 skrll 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:
  * 1. Redistributions of source code must retain the above copyright
 @@ -136,48 +136,41 @@ typedef struct ohci_softc {
 	uint32_t sc_intre;
 	u_int sc_overrun_cnt;
 	struct timeval sc_overrun_ntc;
 	struct callout sc_tmo_rhsc;
 	device_t sc_child;
 	char sc_dying;
 } ohci_softc_t;
 struct ohci_xfer {
 	struct usbd_xfer xfer;
 	struct usb_task abort_task;
-	/*
+	/* ctrl */
-	 * The TD/iTD that is used to terminate the chain and is borrowed
+	ohci_soft_td_t *ox_setup;
-	 * by the next transfer for its first TD
+	ohci_soft_td_t *ox_stat;
 	 */
 	union {
 		ohci_soft_td_t *ox_tdtail;
 		ohci_soft_itd_t *ox_itdtail;
 	};
 	union {
 		/* ctrl/bulk/intr */
 		struct {
 			ohci_soft_td_t **ox_stds;
 			size_t ox_nstd;
 		};
 		/* isoc */
 		struct {
 			ohci_soft_itd_t **ox_sitds;
 			size_t ox_nsitd;
 		};
 	};
 	/* ctrl */
 	ohci_soft_td_t *ox_stat;
 };
 #define OHCI_BUS2SC(bus)	((bus)->ub_hcpriv)
 #define OHCI_PIPE2SC(pipe)	OHCI_BUS2SC((pipe)->up_dev->ud_bus)
 #define OHCI_XFER2SC(xfer)	OHCI_BUS2SC((xfer)->ux_bus)
 #define OHCI_XFER2OXFER(xfer)	((struct ohci_xfer *)(xfer))
 #define OHCI_PIPE2OPIPE(pipe)	((struct ohci_pipe *)(pipe))
 int		ohci_init(ohci_softc_t *);
 int		ohci_intr(void *);
 int		ohci_detach(ohci_softc_t *, int);
 bool		ohci_shutdown(device_t, int);