Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Reduce differences between ARM32_NEW_VM_LAYOUT and ...
details: https://anonhg.NetBSD.org/src/rev/51abfae2b1bd
branches: trunk
changeset: 546629:51abfae2b1bd
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat May 03 03:49:03 2003 +0000
description:
Reduce differences between ARM32_NEW_VM_LAYOUT and not; always pass
the start and end of the kernel managed virtual address space to
pmap_bootstrap() in the new pmap.
diffstat:
sys/arch/acorn32/acorn32/rpc_machdep.c | 7 ++++---
sys/arch/arm/arm32/pmap_new.c | 22 ++++++----------------
sys/arch/arm/include/arm32/pmap.h | 8 ++------
sys/arch/cats/cats/cats_machdep.c | 5 +++--
sys/arch/evbarm/adi_brh/brh_machdep.c | 5 +++--
sys/arch/evbarm/integrator/integrator_machdep.c | 5 +++--
sys/arch/evbarm/iq80310/iq80310_machdep.c | 5 +++--
sys/arch/evbarm/iq80321/iq80321_machdep.c | 5 +++--
sys/arch/evbarm/ixm1200/ixm1200_machdep.c | 7 ++++---
sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c | 5 +++--
sys/arch/hpcarm/hpcarm/hpc_machdep.c | 5 +++--
sys/arch/netwinder/netwinder/netwinder_machdep.c | 5 +++--
sys/arch/shark/ofw/ofw.c | 5 +++--
13 files changed, 43 insertions(+), 46 deletions(-)
diffs (truncated from 301 to 300 lines):
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.51 2003/05/02 23:22:33 thorpej Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.52 2003/05/03 03:49:03 thorpej Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -56,7 +56,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.51 2003/05/02 23:22:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.52 2003/05/03 03:49:03 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -1013,7 +1013,8 @@
#ifndef ARM32_PMAP_NEW
pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, kernel_ptpt);
#else
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
#endif
console_flush();
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/arm/arm32/pmap_new.c
--- a/sys/arch/arm/arm32/pmap_new.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/arm/arm32/pmap_new.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_new.c,v 1.8 2003/05/02 21:54:38 thorpej Exp $ */
+/* $NetBSD: pmap_new.c,v 1.9 2003/05/03 03:49:03 thorpej Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -210,7 +210,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_new.c,v 1.8 2003/05/02 21:54:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_new.c,v 1.9 2003/05/03 03:49:03 thorpej Exp $");
#ifdef PMAP_DEBUG
#define PDEBUG(_lev_,_stat_) \
@@ -3792,11 +3792,7 @@
*/
#define PMAP_STATIC_L2_SIZE 16
void
-#ifndef ARM32_NEW_VM_LAYOUT
-pmap_bootstrap(pd_entry_t *kernel_l1pt)
-#else
-pmap_bootstrap(pd_entry_t *kernel_l1pt, vaddr_t avail)
-#endif
+pmap_bootstrap(pd_entry_t *kernel_l1pt, vaddr_t vstart, vaddr_t vend)
{
static struct l1_ttable static_l1;
static struct l2_dtable static_l2[PMAP_STATIC_L2_SIZE];
@@ -3914,17 +3910,11 @@
* now we allocate the "special" VAs which are used for tmp mappings
* by the pmap (and other modules). we allocate the VAs by advancing
* virtual_avail (note that there are no pages mapped at these VAs).
- */
-#ifndef ARM32_NEW_VM_LAYOUT
- virtual_avail = KERNEL_VM_BASE;
- virtual_end = KERNEL_VM_BASE + KERNEL_VM_SIZE;
-#else
- /*
+ *
* Managed KVM space start from wherever initarm() tells us.
*/
- virtual_avail = avail;
- virtual_end = avail + KERNEL_VM_SIZE;
-#endif
+ virtual_avail = vstart;
+ virtual_end = vend;
pmap_alloc_specials(&virtual_avail, 1, &csrcp, &csrc_pte);
pmap_set_pt_cache_mode(kernel_l1pt, (vaddr_t)csrc_pte);
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.70 2003/04/28 15:57:24 scw Exp $ */
+/* $NetBSD: pmap.h,v 1.71 2003/05/03 03:49:04 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -298,11 +298,7 @@
/*
* New pmap
*/
-#ifdef ARM32_NEW_VM_LAYOUT
-void pmap_bootstrap(pd_entry_t *, vaddr_t);
-#else
-void pmap_bootstrap(pd_entry_t *);
-#endif
+void pmap_bootstrap(pd_entry_t *, vaddr_t, vaddr_t);
int pmap_fault_fixup(pmap_t, vaddr_t, vm_prot_t, int);
boolean_t pmap_get_pde_pte(pmap_t, vaddr_t, pd_entry_t **, pt_entry_t **);
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/cats/cats/cats_machdep.c
--- a/sys/arch/cats/cats/cats_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/cats/cats/cats_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.43 2003/05/03 03:29:06 thorpej Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.44 2003/05/03 03:49:05 thorpej Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -800,7 +800,8 @@
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
printf("irq ");
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/evbarm/adi_brh/brh_machdep.c
--- a/sys/arch/evbarm/adi_brh/brh_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/evbarm/adi_brh/brh_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.8 2003/05/03 03:29:07 thorpej Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.9 2003/05/03 03:49:05 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -795,7 +795,8 @@
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
printf("irq ");
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/evbarm/integrator/integrator_machdep.c
--- a/sys/arch/evbarm/integrator/integrator_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/evbarm/integrator/integrator_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: integrator_machdep.c,v 1.34 2003/05/03 03:29:08 thorpej Exp $ */
+/* $NetBSD: integrator_machdep.c,v 1.35 2003/05/03 03:49:05 thorpej Exp $ */
/*
* Copyright (c) 2001,2002 ARM Ltd
@@ -784,7 +784,8 @@
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
printf("irq ");
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/evbarm/iq80310/iq80310_machdep.c
--- a/sys/arch/evbarm/iq80310/iq80310_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.52 2003/05/03 03:29:09 thorpej Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.53 2003/05/03 03:49:06 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -771,7 +771,8 @@
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
printf("irq ");
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/evbarm/iq80321/iq80321_machdep.c
--- a/sys/arch/evbarm/iq80321/iq80321_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/evbarm/iq80321/iq80321_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.21 2003/05/03 03:29:09 thorpej Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.22 2003/05/03 03:49:06 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -781,7 +781,8 @@
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
printf("irq ");
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/evbarm/ixm1200/ixm1200_machdep.c
--- a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.18 2003/05/03 03:29:09 thorpej Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.19 2003/05/03 03:49:06 thorpej Exp $ */
#undef DEBUG_BEFOREMMU
/*
* Copyright (c) 2002, 2003
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.18 2003/05/03 03:29:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.19 2003/05/03 03:49:06 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -669,7 +669,8 @@
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
printf("irq ");
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.5 2003/05/03 03:29:10 thorpej Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.6 2003/05/03 03:49:07 thorpej Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -811,7 +811,8 @@
LEDSTEP();
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
LEDSTEP();
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/hpcarm/hpcarm/hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc_machdep.c,v 1.64 2003/05/03 03:29:10 thorpej Exp $ */
+/* $NetBSD: hpc_machdep.c,v 1.65 2003/05/03 03:49:07 thorpej Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -689,7 +689,8 @@
}
/* Boot strap pmap telling it where the kernel page table is */
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
if (cputype == CPU_ID_SA110)
rpc_sa110_cc_setup();
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/netwinder/netwinder/netwinder_machdep.c
--- a/sys/arch/netwinder/netwinder/netwinder_machdep.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/netwinder/netwinder/netwinder_machdep.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.48 2003/05/03 03:29:11 thorpej Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.49 2003/05/03 03:49:07 thorpej Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -788,7 +788,8 @@
/* Boot strap pmap telling it where the kernel page table is */
printf("pmap ");
- pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va);
+ pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
printf("irq ");
diff -r c81ff789cb6e -r 51abfae2b1bd sys/arch/shark/ofw/ofw.c
--- a/sys/arch/shark/ofw/ofw.c Sat May 03 03:29:06 2003 +0000
+++ b/sys/arch/shark/ofw/ofw.c Sat May 03 03:49:03 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.26 2003/05/03 03:29:12 thorpej Exp $ */
+/* $NetBSD: ofw.c,v 1.27 2003/05/03 03:49:08 thorpej Exp $ */
/*
* Copyright 1997
@@ -956,7 +956,8 @@
}
/* Initialize pmap module. */
- pmap_bootstrap((pd_entry_t *)proc0_ttbbase.pv_va);
+ pmap_bootstrap((pd_entry_t *)proc0_ttbbase.pv_va, KERNEL_VM_BASE,
+ KERNEL_VM_BASE + KERNEL_VM_SIZE);
}
Home |
Main Index |
Thread Index |
Old Index