From owner-svn-src-all@FreeBSD.ORG  Sun Feb  8 21:08:00 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD695106564A;
	Sun,  8 Feb 2009 21:08:00 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B7498FC19;
	Sun,  8 Feb 2009 21:08:00 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n18L80SC034417;
	Sun, 8 Feb 2009 21:08:00 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n18L80vC034416;
	Sun, 8 Feb 2009 21:08:00 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200902082108.n18L80vC034416@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sun, 8 Feb 2009 21:08:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188336 - head/sys/dev/usb2/controller
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2009 21:08:01 -0000

Author: thompsa
Date: Sun Feb  8 21:08:00 2009
New Revision: 188336
URL: http://svn.freebsd.org/changeset/base/188336

Log:
  The NRL value in the queue head must be zero for interrupt transfers. This was
  diagnosed using a USB analyser obtained through a FreeBSD Foundation grant.
  
  Thanks to:	FreeBSD Foundation

Modified:
  head/sys/dev/usb2/controller/ehci2.c

Modified: head/sys/dev/usb2/controller/ehci2.c
==============================================================================
--- head/sys/dev/usb2/controller/ehci2.c	Sun Feb  8 20:52:09 2009	(r188335)
+++ head/sys/dev/usb2/controller/ehci2.c	Sun Feb  8 21:08:00 2009	(r188336)
@@ -1892,7 +1892,9 @@ ehci_setup_standard_chain(struct usb2_xf
 
 	if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
 		qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) |
-		    EHCI_QH_DTC | EHCI_QH_SET_NRL(8));
+		    EHCI_QH_DTC);
+		if (methods != &ehci_device_intr_methods)
+			qh_endp |= EHCI_QH_SET_NRL(8);
 	} else {
 
 		if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {