From: mpi <mpi@openbsd.org>
Date: Mon, 15 Jun 2015 16:46:21 +0000 (+0000)
Subject: Bring back r1.78 and r1.79, now that ajactouto@'s regression has
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f210de21131d7de93863cf1a1805b97eb92cd51f;p=openbsd

Bring back r1.78 and r1.79, now that ajactouto@'s regression has
been found: it was a hardware failure.

When a bus is explored, do not probe the ports which status hasn't
changed.  This saves a lot of I/O when attaching/detaching devices
and might help with some timing related problems.
---

diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 83ef8a8f0be..340064c1ab5 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhub.c,v 1.83 2015/02/12 05:07:52 uebayasi Exp $ */
+/*	$OpenBSD: uhub.c,v 1.84 2015/06/15 16:46:21 mpi Exp $ */
 /*	$NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $	*/
 
@@ -57,8 +57,11 @@ struct uhub_softc {
 	struct device		sc_dev;		/* base device */
 	struct usbd_device	*sc_hub;	/* USB device */
 	struct usbd_pipe	*sc_ipipe;	/* interrupt pipe */
-	u_int8_t		*sc_statusbuf;	/* per port status buffer */
-	size_t			sc_statuslen;	/* status bufferlen */
+
+	uint32_t		 sc_status;	/* status from last interrupt */
+	uint8_t			*sc_statusbuf;	/* per port status buffer */
+	size_t			 sc_statuslen;	/* status bufferlen */
+
 	u_char			sc_running;
 };
 #define UHUB_PROTO(sc) ((sc)->sc_hub->ddesc.bDeviceProtocol)
@@ -322,6 +325,8 @@ uhub_attach(struct device *parent, struct device *self, void *aux)
 			printf("%s: port %d power on failed, %s\n",
 			       sc->sc_dev.dv_xname, port,
 			       usbd_errstr(err));
+		/* Make sure we check the port status at least once. */
+		sc->sc_status |= (1 << port);
 	}
 
 	/* Wait for stable power. */
@@ -367,18 +372,24 @@ uhub_explore(struct usbd_device *dev)
 
 	for (port = 1; port <= dev->hub->nports; port++) {
 		up = &dev->hub->ports[port-1];
-		err = usbd_get_port_status(dev, port, &up->status);
-		if (err) {
-			DPRINTF("%s: get port %d status failed, error=%s\n",
-			    sc->sc_dev.dv_xname, port, usbd_errstr(err));
-			continue;
-		}
-		status = UGETW(up->status.wPortStatus);
-		change = UGETW(up->status.wPortChange);
+
 		reconnect = up->reattach;
 		up->reattach = 0;
-		DPRINTF("%s: port %d status=0x%04x change=0x%04x\n",
-		    sc->sc_dev.dv_xname, port, status, change);
+		change = 0;
+		status = 0;
+
+		if ((sc->sc_status & (1 << port)) || reconnect) {
+			sc->sc_status &= ~(1 << port);
+
+			if (usbd_get_port_status(dev, port, &up->status))
+				continue;
+
+			status = UGETW(up->status.wPortStatus);
+			change = UGETW(up->status.wPortChange);
+			DPRINTF("%s: port %d status=0x%04x change=0x%04x\n",
+			    sc->sc_dev.dv_xname, port, status, change);
+		}
+
 		if (change & UPS_C_PORT_ENABLED) {
 			usbd_clear_port_feature(dev, port, UHF_C_PORT_ENABLE);
 			if (change & UPS_C_CONNECT_STATUS) {
@@ -411,6 +422,7 @@ uhub_explore(struct usbd_device *dev)
 
 		/* We have a connect status change, handle it. */
 		usbd_clear_port_feature(dev, port, UHF_C_PORT_CONNECTION);
+
 		/*
 		 * If there is already a device on the port the change status
 		 * must mean that is has disconnected.  Looking at the
@@ -572,6 +584,8 @@ void
 uhub_intr(struct usbd_xfer *xfer, void *addr, usbd_status status)
 {
 	struct uhub_softc *sc = addr;
+	uint32_t stats = 0;
+	int i;
 
 	if (usbd_is_dying(sc->sc_hub))
 		return;
@@ -580,6 +594,11 @@ uhub_intr(struct usbd_xfer *xfer, void *addr, usbd_status status)
 
 	if (status == USBD_STALLED)
 		usbd_clear_endpoint_stall_async(sc->sc_ipipe);
-	else if (status == USBD_NORMAL_COMPLETION)
+	else if (status == USBD_NORMAL_COMPLETION) {
+		for (i = 0; i < xfer->actlen; i++)
+			stats |= (uint32_t)(xfer->buffer[i]) << (i * 8);
+		sc->sc_status |= stats;
+
 		usb_needs_explore(sc->sc_hub, 0);
+	}
 }