From owner-svn-src-user@FreeBSD.ORG  Mon Apr  5 21:33:33 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 83E09106567B;
	Mon,  5 Apr 2010 21:33:33 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 744258FC0A;
	Mon,  5 Apr 2010 21:33:33 +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 o35LXXQU050634;
	Mon, 5 Apr 2010 21:33:33 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o35LXXc2050632;
	Mon, 5 Apr 2010 21:33:33 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004052133.o35LXXc2050632@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 5 Apr 2010 21:33:33 +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: r206213 - user/jmallett/octeon/sys/mips/mips
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: Mon, 05 Apr 2010 21:33:33 -0000

Author: jmallett
Date: Mon Apr  5 21:33:33 2010
New Revision: 206213
URL: http://svn.freebsd.org/changeset/base/206213

Log:
  Use XKPHYS for mapdev on N64.

Modified:
  user/jmallett/octeon/sys/mips/mips/pmap.c

Modified: user/jmallett/octeon/sys/mips/mips/pmap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/pmap.c	Mon Apr  5 20:51:30 2010	(r206212)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Mon Apr  5 21:33:33 2010	(r206213)
@@ -2945,6 +2945,9 @@ pmap_clear_reference(vm_page_t m)
 void *
 pmap_mapdev(vm_offset_t pa, vm_size_t size)
 {
+#if defined(__mips_n64)
+	return ((void *)MIPS_PHYS_TO_XKPHYS(MIPS_XKPHYS_CCA_UC, pa));
+#else
         vm_offset_t va, tmpva, offset;
 
 	/* 
@@ -2970,11 +2973,13 @@ pmap_mapdev(vm_offset_t pa, vm_size_t si
 	}
 
 	return ((void *)(va + offset));
+#endif
 }
 
 void
 pmap_unmapdev(vm_offset_t va, vm_size_t size)
 {
+#if !defined(__mips_n64)
 	vm_offset_t base, offset, tmpva;
 
 	/* If the address is within KSEG1 then there is nothing to do */
@@ -2987,6 +2992,7 @@ pmap_unmapdev(vm_offset_t va, vm_size_t 
 	for (tmpva = base; tmpva < base + size; tmpva += PAGE_SIZE)
 		pmap_kremove(tmpva);
 	kmem_free(kernel_map, base, size);
+#endif
 }
 
 /*