PERFORCE change 101879 for review

[Olivier Houchard]

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

Change 101879 by cognet at 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 */