From owner-p4-projects@FreeBSD.ORG  Sat Nov  8 09:10:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B2921065679; Sat,  8 Nov 2008 09:10:55 +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 0F8651065674
	for <perforce@FreeBSD.org>; Sat,  8 Nov 2008 09:10:55 +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 F26538FC13
	for <perforce@FreeBSD.org>; Sat,  8 Nov 2008 09:10:54 +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 mA89Ajr5048176
	for <perforce@FreeBSD.org>; Sat, 8 Nov 2008 09:10:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA89AgTZ048172
	for perforce@freebsd.org; Sat, 8 Nov 2008 09:10:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Nov 2008 09:10:42 GMT
Message-Id: <200811080910.mA89AgTZ048172@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 152649 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: Sat, 08 Nov 2008 09:10:55 -0000

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

Change 152649 by hselasky@hselasky_laptop001 on 2008/11/08 09:09:50

	
	Fix a serious BUSDMA bug: The initial virtual page offset is 
	not retained on the bounce pages, which is what the EHCI and
	the OHCI expects.

Affected files ...

.. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#10 (text+ko) ====

@@ -938,7 +938,8 @@
 		if (op & BUS_DMASYNC_PREWRITE) {
 			while (bpage != NULL) {
 				bcopy((void *)bpage->datavaddr,
-				      (void *)bpage->vaddr,
+				      (void *)(bpage->vaddr + 
+				       ((vm_offset_t)(bpage->datavaddr) & PAGE_MASK)),
 				      bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
@@ -947,7 +948,8 @@
 
 		if (op & BUS_DMASYNC_POSTREAD) {
 			while (bpage != NULL) {
-				bcopy((void *)bpage->vaddr,
+				bcopy((void *)(bpage->vaddr +
+				       ((vm_offset_t)(bpage->datavaddr) & PAGE_MASK)),
 				      (void *)bpage->datavaddr,
 				      bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
@@ -1149,7 +1151,7 @@
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);
-	return (bpage->busaddr);
+	return (bpage->busaddr + ((vm_offset_t)vaddr & PAGE_MASK));
 }
 
 static void