Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch G/C ARM32_NEW_VM_LAYOUT
details: https://anonhg.NetBSD.org/src/rev/bccfb9c4c1a9
branches: trunk
changeset: 829119:bccfb9c4c1a9
user: skrll <skrll%NetBSD.org@localhost>
date: Wed Jan 17 20:30:16 2018 +0000
description:
G/C ARM32_NEW_VM_LAYOUT
diffstat:
sys/arch/arm/arm32/db_interface.c | 8 ++------
sys/arch/arm/arm32/pmap.c | 13 ++-----------
sys/arch/arm/conf/files.arm | 4 ++--
sys/arch/cats/conf/std.cats | 4 +---
sys/arch/epoc32/conf/std.epoc32 | 4 +---
sys/arch/evbarm/conf/std.hdl_g | 4 +---
sys/arch/evbarm/conf/std.integrator | 4 +---
sys/arch/evbarm/conf/std.integrator_cp | 4 +---
sys/arch/evbarm/conf/std.iq31244 | 4 +---
sys/arch/evbarm/conf/std.iq80321 | 4 +---
sys/arch/evbarm/conf/std.ixdp425 | 4 +---
sys/arch/evbarm/conf/std.ixm1200 | 4 +---
sys/arch/evbarm/conf/std.mini2440 | 4 +---
sys/arch/evbarm/conf/std.npwr_fc | 4 +---
sys/arch/evbarm/conf/std.smdk2410 | 4 +---
sys/arch/evbarm/conf/std.smdk2800 | 3 +--
sys/arch/iyonix/conf/std.iyonix | 4 +---
sys/arch/shark/conf/std.shark | 4 +---
18 files changed, 21 insertions(+), 63 deletions(-)
diffs (truncated from 347 to 300 lines):
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/arm/arm32/db_interface.c
--- a/sys/arch/arm/arm32/db_interface.c Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/arm/arm32/db_interface.c Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.56 2017/06/30 08:10:50 skrll Exp $ */
+/* $NetBSD: db_interface.c,v 1.57 2018/01/17 20:30:16 skrll Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.56 2017/06/30 08:10:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.57 2018/01/17 20:30:16 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -203,11 +203,7 @@
struct pmap *pmap;
if (!p || !p->p_vmspace || !p->p_vmspace->vm_map.pmap ||
-#ifndef ARM32_NEW_VM_LAYOUT
- addr >= VM_MAXUSER_ADDRESS
-#else
addr >= VM_MIN_KERNEL_ADDRESS
-#endif
)
pmap = pmap_kernel();
else
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/arm/arm32/pmap.c Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.361 2017/11/01 21:13:26 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.362 2018/01/17 20:30:16 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
#include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.361 2017/11/01 21:13:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.362 2018/01/17 20:30:16 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -6573,15 +6573,6 @@
* Note that the following routines are used by board-specific initialisation
* code to configure the initial kernel page tables.
*
- * If ARM32_NEW_VM_LAYOUT is *not* defined, they operate on the assumption that
- * L2 page-table pages are 4KB in size and use 4 L1 slots. This mimics the
- * behaviour of the old pmap, and provides an easy migration path for
- * initial bring-up of the new pmap on existing ports. Fortunately,
- * pmap_bootstrap() compensates for this hackery. This is only a stop-gap and
- * will be deprecated.
- *
- * If ARM32_NEW_VM_LAYOUT *is* defined, these functions deal with 1KB L2 page
- * tables.
*/
/*
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/arm/conf/files.arm Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm,v 1.136 2017/11/10 22:07:30 matt Exp $
+# $NetBSD: files.arm,v 1.137 2018/01/17 20:30:16 skrll Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defflag ARM32
@@ -105,7 +105,7 @@
defflag PMAP_DEBUG
# New PMAP options
-defflag opt_arm32_pmap.h ARM32_NEW_VM_LAYOUT PMAPCOUNTERS
+defflag opt_arm32_pmap.h PMAPCOUNTERS
PMAP_STEAL_MEMORY PMAP_NEED_ALLOC_POOLPAGE
PMAP_TLB
defparam opt_arm32_pmap.h PGSHIFT
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/cats/conf/std.cats
--- a/sys/arch/cats/conf/std.cats Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/cats/conf/std.cats Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.cats,v 1.9 2012/09/21 14:22:37 matt Exp $
+# $NetBSD: std.cats,v 1.10 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/cats options
@@ -14,6 +14,4 @@
options ARM32
options _ARM32_NEED_BUS_DMA_BOUNCE
-#options ARM32_NEW_VM_LAYOUT # Not yet supported
-
options ARM_INTR_IMPL="<arm/footbridge/footbridge_intr.h>"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/epoc32/conf/std.epoc32
--- a/sys/arch/epoc32/conf/std.epoc32 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/epoc32/conf/std.epoc32 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.epoc32,v 1.1 2013/04/28 12:11:25 kiyohara Exp $
+# $NetBSD: std.epoc32,v 1.2 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/epoc32 options
@@ -16,6 +16,4 @@
makeoptions KERNEL_BASE_PHYS="0xc0030000"
makeoptions LOADADDRESS="0xc0030000"
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options ARM_INTR_IMPL="<machine/intr.h>"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.hdl_g
--- a/sys/arch/evbarm/conf/std.hdl_g Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.hdl_g Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.hdl_g,v 1.5 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.hdl_g,v 1.6 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for I-O DATA HDL-G options
@@ -8,8 +8,6 @@
# Pull in HDL-G config definitions.
include "arch/evbarm/conf/files.hdl_g"
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
makeoptions BOARDTYPE="hdlg"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.hdl_g"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.integrator
--- a/sys/arch/evbarm/conf/std.integrator Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.integrator Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.integrator,v 1.18 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.integrator,v 1.19 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/integrator options
@@ -12,8 +12,6 @@
options _ARM32_NEED_BUS_DMA_BOUNCE
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
makeoptions BOARDTYPE="integrator"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.integrator"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.integrator_cp
--- a/sys/arch/evbarm/conf/std.integrator_cp Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.integrator_cp Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.integrator_cp,v 1.1 2013/02/19 10:57:10 skrll Exp $
+# $NetBSD: std.integrator_cp,v 1.2 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/integrator options
@@ -12,8 +12,6 @@
options _ARM32_NEED_BUS_DMA_BOUNCE
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
makeoptions BOARDTYPE="integrator"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.integrator_cp"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.iq31244
--- a/sys/arch/evbarm/conf/std.iq31244 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.iq31244 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.iq31244,v 1.10 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.iq31244,v 1.11 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for IQ31244 options
@@ -10,8 +10,6 @@
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options KERNEL_BASE_EXT=0xc0000000
makeoptions BOARDTYPE="iq31244"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.iq80321
--- a/sys/arch/evbarm/conf/std.iq80321 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.iq80321 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.iq80321,v 1.15 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.iq80321,v 1.16 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for IQ80321 options
@@ -10,8 +10,6 @@
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options KERNEL_BASE_EXT=0xc0000000
makeoptions BOARDTYPE="iq80321"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.ixdp425
--- a/sys/arch/evbarm/conf/std.ixdp425 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.ixdp425 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.ixdp425,v 1.12 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.ixdp425,v 1.13 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for IXDP425 options
@@ -12,8 +12,6 @@
options COM_PXA2X0 # Enable IXP Uart support in com(4)
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ixdp425"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.ixm1200
--- a/sys/arch/evbarm/conf/std.ixm1200 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.ixm1200 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.ixm1200,v 1.14 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.ixm1200,v 1.15 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for IXM1200 options
@@ -10,8 +10,6 @@
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xC0200000"
makeoptions BOARDTYPE="ixm1200"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.mini2440
--- a/sys/arch/evbarm/conf/std.mini2440 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.mini2440 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.mini2440,v 1.3 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.mini2440,v 1.4 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for MINI2440 options
@@ -10,8 +10,6 @@
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options SSCOM_S3C2440
makeoptions BOARDTYPE="mini2440"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.npwr_fc
--- a/sys/arch/evbarm/conf/std.npwr_fc Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.npwr_fc Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.npwr_fc,v 1.6 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.npwr_fc,v 1.7 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for IQ80321 options
@@ -10,8 +10,6 @@
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options KERNEL_BASE_EXT=0xc0000000
makeoptions BOARDTYPE="iq80321"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.smdk2410
--- a/sys/arch/evbarm/conf/std.smdk2410 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.smdk2410 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.smdk2410,v 1.7 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.smdk2410,v 1.8 2018/01/17 20:30:16 skrll Exp $
#
# standard NetBSD/evbarm for SMDK2410 options
@@ -10,8 +10,6 @@
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options SSCOM_S3C2410
makeoptions BOARDTYPE="smdk2410"
diff -r 71738310c4c8 -r bccfb9c4c1a9 sys/arch/evbarm/conf/std.smdk2800
--- a/sys/arch/evbarm/conf/std.smdk2800 Wed Jan 17 17:41:38 2018 +0000
+++ b/sys/arch/evbarm/conf/std.smdk2800 Wed Jan 17 20:30:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.smdk2800,v 1.15 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.smdk2800,v 1.16 2018/01/17 20:30:16 skrll Exp $
Home |
Main Index |
Thread Index |
Old Index