Wed Apr 19 17:15:18 2017 UTC ()

Pull up following revision(s) (requested by skrll in ticket #1403):
	sys/rump/dev/lib/libugenhc/ugenhc.c: revision 1.25, 1.26
Fix order of outputs in rumpuser_open call.
Now ugenhc works again after a four-year hiatus...
--
Fix bulk xfer buffer with usedma = false.


(snj)

diff -r1.22.2.1 -r1.22.2.2 src/sys/rump/dev/lib/libugenhc/ugenhc.c

--- src/sys/rump/dev/lib/libugenhc/ugenhc.c 2017/04/05 19:54:23	1.22.2.1
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c 2017/04/19 17:15:18	1.22.2.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ugenhc.c,v 1.22.2.1 2017/04/05 19:54:23 snj Exp $	*/
+/*	$NetBSD: ugenhc.c,v 1.22.2.2 2017/04/19 17:15:18 snj Exp $	*/
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  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.
+ *
 @@ -51,27 +51,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This rump driver attaches ugen as a kernel usb host controller.
  * It's still somewhat under the hammer ....
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.2.1 2017/04/05 19:54:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.2.2 2017/04/19 17:15:18 snj Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 @@ -479,27 +479,27 @@ rhscintr(void *arg)
 		xfer->ux_status = USBD_NORMAL_COMPLETION;
 		mutex_enter(&sc->sc_lock);
 		usb_transfer_complete(xfer);
 		mutex_exit(&sc->sc_lock);
 		kpause("ugwait2", false, hz, NULL);
 		/*
 		 * Detect device detach.
 		 */
 		for (;;) {
-			fd = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, &error);
+			error = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, &fd);
 			if (fd == -1)
 				break;
 			error = rumpuser_close(fd);
 			kpause("ugwait2", false, hz/4, NULL);
+		}
 		sc->sc_port_status = ~(UPS_CURRENT_CONNECT_STATUS
 		    | UPS_PORT_ENABLED | UPS_PORT_POWER);
 		sc->sc_port_change = UPS_C_CONNECT_STATUS | UPS_C_PORT_RESET;
 		error = rumpuser_close(sc->sc_ugenfd[UGEN_EPT_CTRL]);
 		sc->sc_ugenfd[UGEN_EPT_CTRL] = -1;
 @@ -593,27 +593,27 @@ rumpusb_device_bulk_start(struct usbd_xf
 	size_t n, done;
 	bool isread;
 	int len, error, endpt;
 	uint8_t *buf;
 	int xfererr = USBD_NORMAL_COMPLETION;
 	int shortval, i;
 	ed = xfer->ux_pipe->up_endpoint->ue_edesc;
 	endpt = ed->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	endpt = UE_GET_ADDR(endpt);
 	KASSERT(endpt < UGEN_NEPTS);
-	buf = KERNADDR(&xfer->ux_dmabuf, 0);
+	buf = xfer->ux_buf;
 	done = 0;
 	if ((ed->bmAttributes & UE_XFERTYPE) == UE_ISOCHRONOUS) {
 		for (i = 0, len = 0; i < xfer->ux_nframes; i++)
 			len += xfer->ux_frlengths[i];
 	} else {
 		KASSERT(xfer->ux_length);
 		len = xfer->ux_length;
+	}
 	shortval = (xfer->ux_flags & USBD_SHORT_XFER_OK) != 0;
 	while (RUSB(xfer)->rusb_status == 0) {
 		if (isread) {
 			struct rumpuser_iovec iov;