From owner-p4-projects@FreeBSD.ORG  Sat Apr 12 16:59:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 496FA1065673; Sat, 12 Apr 2008 16:59:35 +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 0C19C1065671
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 16:59:35 +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 E329D8FC1B
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 16:59:34 +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 m3CGxYNb093233
	for <perforce@FreeBSD.org>; Sat, 12 Apr 2008 16:59:34 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3CGxYo1093231
	for perforce@freebsd.org; Sat, 12 Apr 2008 16:59:34 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 12 Apr 2008 16:59:34 GMT
Message-Id: <200804121659.m3CGxYo1093231@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 139911 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 16:59:35 -0000

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

Change 139911 by gonzo@gonzo_jeeves on 2008/04/12 16:58:46

	o Add proper implementation of pmap_mapdev for physical addresses
	    greater then 512M. Implementation and comment come from 
	    arm/arm/pmap.c

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#27 edit

Differences ...

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

@@ -2758,13 +2758,38 @@
  */
 
 /*
- * Note I don't know if any of this will work if pa is above
- * 512Meg.
+ * Map a set of physical memory pages into the kernel virtual
+ * address space. Return a pointer to where it is mapped. This
+ * routine is intended to be used for mapping device memory,
+ * NOT real memory.
  */
 void *
 pmap_mapdev(vm_offset_t pa, vm_size_t size)
 {
-	return ((void *)(MIPS_PHYS_TO_UNCACHED(pa)));
+        vm_offset_t va, tmpva, offset;
+
+	/* 
+	 * KSEG1 maps only first 512M of phys address space. For 
+	 * pa > 0x20000000 we should make proper mapping * using pmap_kenter.
+	 */
+	if (pa + size < MIPS_KSEG0_LARGEST_PHYS)
+		return (void *)MIPS_PHYS_TO_KSEG1(pa);
+	else {
+		offset = pa & PAGE_MASK;
+		size = roundup(size, PAGE_SIZE);
+        
+		va = kmem_alloc_nofault(kernel_map, size);
+		if (!va)
+			panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
+		for (tmpva = va; size > 0;) {
+			pmap_kenter(tmpva, pa);
+			size -= PAGE_SIZE;
+			tmpva += PAGE_SIZE;
+			pa += PAGE_SIZE;
+		}
+	}
+
+	return ((void *)(va + offset));
 }
 
 void