From owner-p4-projects@FreeBSD.ORG  Mon Aug 25 20:54:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44DCC106570B; Mon, 25 Aug 2008 20:54:41 +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 06CBE10656FB
	for <perforce@FreeBSD.org>; Mon, 25 Aug 2008 20:54:41 +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 DCF2A8FC15
	for <perforce@FreeBSD.org>; Mon, 25 Aug 2008 20:54:40 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKseY8003492
	for <perforce@FreeBSD.org>; Mon, 25 Aug 2008 20:54:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKsea3003490
	for perforce@freebsd.org; Mon, 25 Aug 2008 20:54:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 25 Aug 2008 20:54:40 GMT
Message-Id: <200808252054.m7PKsea3003490@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 148446 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, 25 Aug 2008 20:54:41 -0000

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

Change 148446 by hselasky@hselasky_laptop001 on 2008/08/25 20:54:16

	
	Some bugfixes:
	
	1) "usb2_transfer_timeout_ms" must be called with usb2_mtx locked.
	2) Fix regression: If the pipe is stalled we should return from
	starting the transfer. This only affects USB device side mode.
	3) Simplify dma-delay logic.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#22 edit

Differences ...

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

@@ -1312,13 +1312,8 @@
 		usb2_transfer_dequeue(xfer);
 		mtx_unlock(xfer->usb2_mtx);
 	}
-	if (xfer->flags_int.bdma_enable) {
-		/* no need for DMA delay */
-		xfer->flags_int.did_dma_delay = 1;
-	} else {
-		/* clear "did_dma_delay" flag */
-		xfer->flags_int.did_dma_delay = 0;
-	}
+	/* clear "did_dma_delay" flag */
+	xfer->flags_int.did_dma_delay = 0;
 
 	/* clear "did_close" flag */
 	xfer->flags_int.did_close = 0;
@@ -2115,7 +2110,14 @@
 				    &udev->cs_msg[0], &(udev->cs_msg[1]))) {
 					/* ignore */
 				}
+			} else {
+				/* should not happen */
+				DPRINTFN(0, "No stall handler!\n");
 			}
+			/*
+			 * We get started again when the stall is cleared!
+			 */
+			return;
 		}
 	}
 	/*
@@ -2230,9 +2232,13 @@
 		DPRINTFN(3, "DMA delay, %u ms, "
 		    "on %p\n", temp, xfer);
 
-		usb2_transfer_timeout_ms(xfer,
-		    &usb2_dma_delay_done_cb, temp);
-		return (1);		/* wait for new callback */
+		if (temp != 0) {
+			mtx_lock(xfer->usb2_mtx);
+			usb2_transfer_timeout_ms(xfer,
+			    &usb2_dma_delay_done_cb, temp);
+			mtx_unlock(xfer->usb2_mtx);
+			return (1);	/* wait for new callback */
+		}
 	}
 	/* check actual number of frames */
 	if (xfer->aframes > xfer->nframes) {