From owner-p4-projects@FreeBSD.ORG  Sun Dec  2 01:23:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8112A16A420; Sun,  2 Dec 2007 01:23:12 +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 311EF16A418
	for <perforce@FreeBSD.org>; Sun,  2 Dec 2007 01:23:12 +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 235E213C43E
	for <perforce@FreeBSD.org>; Sun,  2 Dec 2007 01:23:12 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21NCSH024651
	for <perforce@FreeBSD.org>; Sun, 2 Dec 2007 01:23:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21NCuP024644
	for perforce@freebsd.org; Sun, 2 Dec 2007 01:23:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 2 Dec 2007 01:23:12 GMT
Message-Id: <200712020123.lB21NCuP024644@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 129949 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: Sun, 02 Dec 2007 01:23:12 -0000

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

Change 129949 by hselasky@hselasky_laptop001 on 2007/12/02 01:22:37

	
	Make sure that the alignment is correct when
	allocating DMA memory.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#59 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#59 (text+ko) ====

@@ -2082,6 +2082,16 @@
 	bus_dmamap_t map;
 	void *ptr;
 
+	if (align != 1) {
+		/*
+	         * The alignment must be greater or equal to the "size" else the
+	         * object can be split between two memory pages and we get a
+	         * problem!
+	         */
+		while (align < size) {
+			align *= 2;
+		}
+	}
 	/* get the correct DMA tag */
 	tag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max);
 	if (tag == NULL) {