From owner-p4-projects@FreeBSD.ORG  Mon Sep 24 13:19:06 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1602416A420; Mon, 24 Sep 2007 13:19:06 +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 C51FE16A417
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2007 13:19:05 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AA64413C457
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2007 13:19:05 +0000 (UTC)
	(envelope-from gonzo@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 l8ODJ5qq058367
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2007 13:19:05 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8ODJ5XT058364
	for perforce@freebsd.org; Mon, 24 Sep 2007 13:19:05 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 24 Sep 2007 13:19:05 GMT
Message-Id: <200709241319.l8ODJ5XT058364@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126769 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: Mon, 24 Sep 2007 13:19:06 -0000

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

Change 126769 by gonzo@gonzo_jeeves on 2007/09/24 13:18:31

	o Use KSEG1 address for request of BUS_DMA_COHERENT region.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#7 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#7 (text+ko) ====

@@ -448,8 +448,7 @@
 		void *tmpaddr = (void *)*vaddr;
 
 		if (tmpaddr) {
-			tmpaddr = (void *)((vm_offset_t)(tmpaddr) +
-			    ((vm_offset_t)*vaddr & PAGE_MASK));
+			tmpaddr = MIPS_PHYS_TO_KSEG1(vtophys(tmpaddr));
 			newmap->origbuffer = *vaddr;
 			newmap->allocbuffer = tmpaddr;
 			mips_dcache_wbinv_range((vm_offset_t)*vaddr,
@@ -474,7 +473,6 @@
 		KASSERT(map->allocbuffer == vaddr,
 		    ("Trying to freeing the wrong DMA buffer"));
 		vaddr = map->origbuffer;
-		/* XXXMIPS: arm_unmap_nocache(map->allocbuffer, dmat->maxsize); */
 	}
         if (dmat->maxsize <= PAGE_SIZE)
 		free(vaddr, M_DEVBUF);