From owner-p4-projects@FreeBSD.ORG  Sat Apr 12 17:01:37 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8ADBC1065670; Sat, 12 Apr 2008 17:01:37 +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 4D3A1106567E
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 17:01:37 +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 2FDB88FC14
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 17:01:37 +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 m3CH1bYQ093351
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 17:01:37 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CH1bWE093349
	for perforce@freebsd.org; Sat, 12 Apr 2008 17:01:37 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 12 Apr 2008 17:01:37 GMT
Message-Id: <200804121701.m3CH1bWE093349@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 139912 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, 12 Apr 2008 17:01:38 -0000

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

Change 139912 by gonzo@gonzo_jeeves on 2008/04/12 17:00:57

	o Use pmap_mapdev to map memory resource to KVA properly. Code obtained 
	    from FreeBSD/arm.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#7 edit

Differences ...

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

@@ -368,9 +368,16 @@
 	 * in the uncached MIPS KSEG1 segment.
 	 */
 	if (type == SYS_RES_MEMORY) {
-		void *vaddr;
+                caddr_t vaddr = 0;
+                u_int32_t paddr;
+                u_int32_t psize;
+                u_int32_t poffs;
+                
+                paddr = rman_get_start(r);
+                psize = rman_get_size(r);
+                poffs = paddr - trunc_page(paddr);
+                vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs;
 
-		vaddr = (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(r));
 		rman_set_virtual(r, vaddr);
 		rman_set_bustag(r, MIPS_BUS_SPACE_MEM);
 #ifdef TARGET_OCTEON