From owner-p4-projects@FreeBSD.ORG  Mon Dec  8 15:13:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A08381065672; Mon,  8 Dec 2008 15:13:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A180106564A
	for <perforce@FreeBSD.org>; Mon,  8 Dec 2008 15:13:30 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 486DB8FC22
	for <perforce@FreeBSD.org>; Mon,  8 Dec 2008 15:13:30 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB8FDUrc067847
	for <perforce@FreeBSD.org>; Mon, 8 Dec 2008 15:13:30 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB8FDUZo067845
	for perforce@freebsd.org; Mon, 8 Dec 2008 15:13:30 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 8 Dec 2008 15:13:30 GMT
Message-Id: <200812081513.mB8FDUZo067845@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 154341 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Dec 2008 15:13:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=154341

Change 154341 by hselasky@hselasky_laptop001 on 2008/12/08 15:12:49

	
	Do a better job getting non-compliant USB
	devices up and running.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#25 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#36 (text+ko) ====

@@ -1454,7 +1454,11 @@
 	if (err) {
 		DPRINTFN(0, "getting device descriptor "
 		    "at addr %d failed!\n", udev->address);
-		goto done;
+		/* XXX try to re-enumerate the device */
+		err = usb2_req_re_enumerate(udev, &Giant);
+		if (err) {
+			goto done;
+		}
 	}
 	DPRINTF("adding unit addr=%d, rev=%02x, class=%d, "
 	    "subclass=%d, protocol=%d, maxpacket=%d, len=%d, speed=%d\n",

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#25 (text+ko) ====

@@ -613,7 +613,8 @@
 		}
 		USETW(req.wLength, min_len);
 
-		err = usb2_do_request(udev, mtx, &req, desc);
+		err = usb2_do_request_flags(udev, mtx, &req,
+		    desc, 0, NULL, 1000);
 
 		if (err) {
 			if (!retries) {
@@ -1328,6 +1329,7 @@
 	struct usb2_device *parent_hub;
 	usb2_error_t err;
 	uint8_t old_addr;
+	uint8_t do_retry = 1;
 
 	if (udev->flags.usb2_mode != USB_MODE_HOST) {
 		return (USB_ERR_INVAL);
@@ -1337,6 +1339,7 @@
 	if (parent_hub == NULL) {
 		return (USB_ERR_INVAL);
 	}
+retry:
 	err = usb2_req_reset_port(parent_hub, mtx, udev->port_no);
 	if (err) {
 		DPRINTFN(0, "addr=%d, port reset failed\n", old_addr);
@@ -1357,9 +1360,8 @@
 	err = usb2_req_set_address(udev, mtx, old_addr);
 	if (err) {
 		/* XXX ignore any errors! */
-		DPRINTFN(0, "addr=%d, set address failed\n",
+		DPRINTFN(0, "addr=%d, set address failed! (ignored)\n",
 		    old_addr);
-		err = 0;
 	}
 	/* restore device address */
 	udev->address = old_addr;
@@ -1383,6 +1385,14 @@
 		goto done;
 	}
 done:
+	if (err && do_retry) {
+		/* give the USB firmware some time to load */
+		usb2_pause_mtx(mtx, 500);
+		/* no more retries after this retry */
+		do_retry = 0;
+		/* try again */
+		goto retry;
+	}
 	/* restore address */
 	udev->address = old_addr;
 	return (err);