From owner-p4-projects@FreeBSD.ORG  Sun Jan 27 13:46:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F310D16A419; Sun, 27 Jan 2008 13:46:40 +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 B812316A417
	for <perforce@FreeBSD.org>; Sun, 27 Jan 2008 13:46:40 +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 A6A2B13C458
	for <perforce@FreeBSD.org>; Sun, 27 Jan 2008 13:46:40 +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 m0RDkeeB082990
	for <perforce@FreeBSD.org>; Sun, 27 Jan 2008 13:46:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RDkeC8082987
	for perforce@freebsd.org; Sun, 27 Jan 2008 13:46:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 27 Jan 2008 13:46:40 GMT
Message-Id: <200801271346.m0RDkeC8082987@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 134192 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, 27 Jan 2008 13:46:41 -0000

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

Change 134192 by hselasky@hselasky_laptop001 on 2008/01/27 13:46:33

	
	Bugfix. Only extend segments if we are multi segmented
	which is defined by the physical memory alignment being
	equal to 1.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#87 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#96 edit

Differences ...

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

@@ -2318,7 +2318,7 @@
 	 * XXX so we need to extend the last segment if we are
 	 * XXX unaligned and cross the segment boundary!
 	 */
-	if (ext_seg) {
+	if (ext_seg && pc->ismultiseg) {
 		(pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE;
 	}
 	if (xfer) {
@@ -2381,6 +2381,7 @@
 	pc->page_offset_end = size;
 	pc->map = map;
 	pc->tag = tag;
+	pc->ismultiseg = (align == 1);
 
 	/* load memory into DMA */
 	if (bus_dmamap_load
@@ -2635,7 +2636,7 @@
 	 * XXX so we need to extend the last segment if we are
 	 * XXX unaligned and cross the segment boundary!
 	 */
-	if (ext_seg) {
+	if (ext_seg && pc->ismultiseg) {
 		(pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE;
 	}
 	if (xfer) {
@@ -2722,6 +2723,7 @@
 	pc->page_offset_end = size;
 	pc->map = map;
 	pc->tag = tag;
+	pc->ismultiseg = (align == 1);
 
 	usbd_pc_alloc_mem_cb(pc, utag->p_seg, seg_count, 0);
 

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

@@ -262,6 +262,7 @@
 	uint32_t page_offset_buf;
 	uint32_t page_offset_end;
 	uint8_t	isread:1;
+	uint8_t ismultiseg:1; /* set if we can have multiple segments */
 };
 
 struct usbd_setup_params {