From owner-p4-projects@FreeBSD.ORG  Tue Jul 18 22:25:57 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 14C0B16A4E1; Tue, 18 Jul 2006 22:25:57 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CF8B916A4DA
	for <perforce@freebsd.org>; Tue, 18 Jul 2006 22:25:56 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9B32B43D46
	for <perforce@freebsd.org>; Tue, 18 Jul 2006 22:25:56 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6IMPu13038033
	for <perforce@freebsd.org>; Tue, 18 Jul 2006 22:25:56 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6IMPu1h038030
	for perforce@freebsd.org; Tue, 18 Jul 2006 22:25:56 GMT
	(envelope-from cognet@freebsd.org)
Date: Tue, 18 Jul 2006 22:25:56 GMT
Message-Id: <200607182225.k6IMPu1h038030@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101879 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: Tue, 18 Jul 2006 22:25:57 -0000

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

Change 101879 by cognet@cognet on 2006/07/18 22:25:41

	We have to create L1 table for the MCU and the PCI MEM too if we want
	to use pmap_bootstrap() to map that.

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#2 (text+ko) ====

@@ -100,8 +100,9 @@
 
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define	KERNEL_PT_IO		1
-#define KERNEL_PT_BEFOREKERN	2
-#define KERNEL_PT_AFKERNEL	3	/* L2 table for mapping after kernel */
+#define KERNEL_PT_IO_NUM	3
+#define KERNEL_PT_BEFOREKERN	KERNEL_PT_IO + KERNEL_PT_IO_NUM
+#define KERNEL_PT_AFKERNEL	KERNEL_PT_BEFOREKERN + 1	/* L2 table for mapping after kernel */
 #define	KERNEL_PT_AFKERNEL_NUM	9
 
 /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
@@ -348,6 +349,10 @@
 	    &kernel_pt_table[KERNEL_PT_SYS]);
 	pmap_link_l2pt(l1pagetable, IXP425_IO_VBASE,
 	                &kernel_pt_table[KERNEL_PT_IO]);
+	pmap_link_l2pt(l1pagetable, IXP425_MCU_VBASE,
+	    		&kernel_pt_table[KERNEL_PT_IO + 1]);
+	pmap_link_l2pt(l1pagetable, IXP425_PCI_MEM_VBASE,
+	    		&kernel_pt_table[KERNEL_PT_IO + 2]);
 	pmap_link_l2pt(l1pagetable, KERNBASE,
 	    &kernel_pt_table[KERNEL_PT_BEFOREKERN]);
 	pmap_map_chunk(l1pagetable, KERNBASE, SDRAM_START, 0x100000,
@@ -430,9 +435,9 @@
 	 * Fetch the SDRAM start/size from the i80321 SDRAM configration
 	 * registers.
 	 */
+	cninit();
 	memsize = ixp425_sdram_size();
 	physmem = memsize / PAGE_SIZE;
-	cninit();
 
 	/* Set stack for exception handlers */