Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enlarge the number of L2PTs used for mapping the kernel since our kernels

Browse Source 
have gotten fatter with age and even the stock kernels were bigger than the
code could handle.

Thanks to Jason Mitchell for sending me a Jornada 720 so I could actually
test this.
This commit is contained in:
rafal 2008-04-20 16:19:46 +00:00
parent bd8476b16b
commit 6583c572da
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/arch/hpcarm/hpcarm/hpc_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpc_machdep.c,v 1.83 2008/01/19 13:11:17 chris Exp $ */
/* $NetBSD: hpc_machdep.c,v 1.84 2008/04/20 16:19:46 rafal Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.83 2008/01/19 13:11:17 chris Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.84 2008/04/20 16:19:46 rafal Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@ -153,9 +153,11 @@ extern int pmap_debug_level;
#define KERNEL_PT_VMEM 0 /* Page table for mapping video memory */
#define KERNEL_PT_SYS 1 /* Page table for mapping proc0 zero page */
#define KERNEL_PT_KERNEL 2 /* Page table for mapping kernel */
#define KERNEL_PT_IO 3 /* Page table for mapping IO */
#define KERNEL_PT_VMDATA 4 /* Page tables for mapping kernel VM */
#define KERNEL_PT_IO 2 /* Page table for mapping IO */
#define KERNEL_PT_KERNEL 3 /* Page table for mapping kernel */
#define KERNEL_PT_KERNEL_NUM 4
#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL+KERNEL_PT_KERNEL_NUM)
/* Page tables for mapping kernel VM */
#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
@ -413,8 +415,8 @@ initarm(int argc, char **argv, struct bootinfo *bi)
* so was can get at it. The kernel will occupy the start of it.
* After the kernel/args we allocate some of the fixed page tables
* we need to get the system going.
* We allocate one page directory and 8 page tables and store the
* physical addresses in the kernel_pt_table array.
* We allocate one page directory and NUM_KERNEL_PTS page tables
* and store the physical addresses in the kernel_pt_table array.
* Must remember that neither the page L1 or L2 page tables are the
* same size as a page !
*
@ -425,9 +427,10 @@ initarm(int argc, char **argv, struct bootinfo *bi)
* The start address will be page aligned.
* We allocate the kernel page directory on the first free 16KB
* boundary we find.
* We allocate the kernel page tables on the first 1KB boundary we find.
* We allocate 9 PT's. This means that in the process we
* KNOW that we will encounter at least 1 16KB boundary.
* We allocate the kernel page tables on the first 1KB boundary we
* find. We allocate at least 9 PT's (12 currently). This means
* that in the process we KNOW that we will encounter at least one
* 16KB boundary.
*
* Eventually if the top end of the memory gets used for process L1
* page tables the kernel L1 page table may be moved up there.
@ -523,18 +526,19 @@ initarm(int argc, char **argv, struct bootinfo *bi)
/* Map the L2 pages tables in the L1 page table */
pmap_link_l2pt(l1pagetable, 0x00000000,
&kernel_pt_table[KERNEL_PT_SYS]);
pmap_link_l2pt(l1pagetable, KERNEL_BASE,
&kernel_pt_table[KERNEL_PT_KERNEL]);
for (loop = 0; loop < KERNEL_PT_VMDATA_NUM; ++loop)
#define SAIPIO_BASE 0xd0000000 /* XXX XXX */
pmap_link_l2pt(l1pagetable, SAIPIO_BASE,
&kernel_pt_table[KERNEL_PT_IO]);
for (loop = 0; loop < KERNEL_PT_KERNEL_NUM; loop++)
pmap_link_l2pt(l1pagetable, KERNEL_BASE + loop * 0x00400000,
&kernel_pt_table[KERNEL_PT_KERNEL + loop]);
for (loop = 0; loop < KERNEL_PT_VMDATA_NUM; loop++)
pmap_link_l2pt(l1pagetable, KERNEL_VM_BASE + loop * 0x00400000,
&kernel_pt_table[KERNEL_PT_VMDATA + loop]);
/* update the top of the kernel VM */
pmap_curmaxkvaddr =
KERNEL_VM_BASE + (KERNEL_PT_VMDATA_NUM * 0x00400000);
#define SAIPIO_BASE 0xd0000000 /* XXX XXX */
pmap_link_l2pt(l1pagetable, SAIPIO_BASE,
&kernel_pt_table[KERNEL_PT_IO]);
#ifdef VERBOSE_INIT_ARM
printf("Mapping kernel\n");