From owner-svn-src-user@FreeBSD.ORG  Tue Sep 21 23:47:05 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB506106564A;
	Tue, 21 Sep 2010 23:47:05 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9ADCD8FC0A;
	Tue, 21 Sep 2010 23:47:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8LNl59U010240;
	Tue, 21 Sep 2010 23:47:05 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8LNl5S0010238;
	Tue, 21 Sep 2010 23:47:05 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201009212347.o8LNl5S0010238@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Tue, 21 Sep 2010 23:47:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212983 - user/weongyo/usb/sys/dev/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Sep 2010 23:47:05 -0000

Author: weongyo
Date: Tue Sep 21 23:47:05 2010
New Revision: 212983
URL: http://svn.freebsd.org/changeset/base/212983

Log:
  Adds a XXX comment about assertion by USB stack when it handles multiple
  DMA segments.

Modified:
  user/weongyo/usb/sys/dev/usb/usb_busdma.c

Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_busdma.c	Tue Sep 21 23:25:38 2010	(r212982)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c	Tue Sep 21 23:47:05 2010	(r212983)
@@ -449,7 +449,15 @@ usb_pc_common_mem_cb(void *arg, bus_dma_
 	}
 #endif
 	for (i = 1; i < nseg; i++) {
-		pg[i].physaddr = segs[i].ds_addr & ~(USB_PAGE_SIZE - 1);
+		/*
+		 * XXX Currently USB stack has a assumption that after second
+		 * segments always the address would be aligned by
+		 * USB_PAGE_SIZE.  If it's failed, all DMA operations would
+		 * be wrong.
+		 */
+		USB_ASSERT((segs[i].ds_addr & (USB_PAGE_SIZE - 1)) == 0,
+		    ("wrong DMA alignment (%#jx)", segs[i].ds_addr));
+		pg[i].physaddr = segs[i].ds_addr;
 		pg[i].physlen = segs[i].ds_len;
 	}
 done: