From owner-p4-projects@FreeBSD.ORG Wed Aug 11 18:26:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD170106573F; Wed, 11 Aug 2010 18:26:03 +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 5CBFF1065EBC for ; Wed, 11 Aug 2010 18:26:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 385098FC1E for ; Wed, 11 Aug 2010 18:25:59 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPxLB084061 for ; Wed, 11 Aug 2010 18:25:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPxVe084057 for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Aug 2010 18:25:59 GMT Message-Id: <201008111825.o7BIPxVe084057@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2010 18:26:06 -0000 http://p4web.freebsd.org/@@182151?ac=10 Change 182151 by hselasky@hselasky_laptop001 on 2010/08/09 20:17:26 USB controller (XHCI): - we also need to check if the ISOC transfer is queued to far in the future alike the OHCI driver. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#24 (text+ko) ==== @@ -1687,7 +1687,8 @@ y = XHCI_MFINDEX_GET(x - xfer->endpoint->isoc_next); if ((xfer->endpoint->is_synced == 0) || - (y < (xfer->nframes << shift))) { + (y < (xfer->nframes << shift)) || + (XHCI_MFINDEX_GET(-y) >= (128 * 8))) { /* * If there is data underflow or the pipe * queue is empty we schedule the transfer a