Module Name: src
Committed By: skrll
Date: Wed Jan 17 20:30:17 UTC 2018
Modified Files:
src/sys/arch/arm/arm32: db_interface.c pmap.c
src/sys/arch/arm/conf: files.arm
src/sys/arch/cats/conf: std.cats
src/sys/arch/epoc32/conf: std.epoc32
src/sys/arch/evbarm/conf: std.hdl_g std.integrator std.integrator_cp
std.iq31244 std.iq80321 std.ixdp425 std.ixm1200 std.mini2440
std.npwr_fc std.smdk2410 std.smdk2800
src/sys/arch/iyonix/conf: std.iyonix
src/sys/arch/shark/conf: std.shark
Log Message:
G/C ARM32_NEW_VM_LAYOUT
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/arm/arm32/db_interface.c
cvs rdiff -u -r1.361 -r1.362 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.136 -r1.137 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/cats/conf/std.cats
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/conf/std.epoc32
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.hdl_g
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/std.integrator
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.integrator_cp
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/std.iq31244
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/std.iq80321 \
src/sys/arch/evbarm/conf/std.smdk2800
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/std.ixdp425
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/std.ixm1200
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.mini2440
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.npwr_fc
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.smdk2410
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/iyonix/conf/std.iyonix
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/conf/std.shark
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/db_interface.c
diff -u src/sys/arch/arm/arm32/db_interface.c:1.56 src/sys/arch/arm/arm32/db_interface.c:1.57
--- src/sys/arch/arm/arm32/db_interface.c:1.56 Fri Jun 30 08:10:50 2017
+++ src/sys/arch/arm/arm32/db_interface.c Wed Jan 17 20:30:16 2018
@@ -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 @@ db_validate_address(vaddr_t addr)
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
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.361 src/sys/arch/arm/arm32/pmap.c:1.362
--- src/sys/arch/arm/arm32/pmap.c:1.361 Wed Nov 1 21:13:26 2017
+++ src/sys/arch/arm/arm32/pmap.c Wed Jan 17 20:30:16 2018
@@ -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 @@ pmap_postinit(void)
* 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.
*/
/*
Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.136 src/sys/arch/arm/conf/files.arm:1.137
--- src/sys/arch/arm/conf/files.arm:1.136 Fri Nov 10 22:07:30 2017
+++ src/sys/arch/arm/conf/files.arm Wed Jan 17 20:30:16 2018
@@ -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 @@ file arch/arm/arm/psci_arm.S psci
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
Index: src/sys/arch/cats/conf/std.cats
diff -u src/sys/arch/cats/conf/std.cats:1.9 src/sys/arch/cats/conf/std.cats:1.10
--- src/sys/arch/cats/conf/std.cats:1.9 Fri Sep 21 14:22:37 2012
+++ src/sys/arch/cats/conf/std.cats Wed Jan 17 20:30:16 2018
@@ -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 EXEC_ELF32
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>"
Index: src/sys/arch/epoc32/conf/std.epoc32
diff -u src/sys/arch/epoc32/conf/std.epoc32:1.1 src/sys/arch/epoc32/conf/std.epoc32:1.2
--- src/sys/arch/epoc32/conf/std.epoc32:1.1 Sun Apr 28 12:11:25 2013
+++ src/sys/arch/epoc32/conf/std.epoc32 Wed Jan 17 20:30:16 2018
@@ -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 @@ options ARM32
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>"
Index: src/sys/arch/evbarm/conf/std.hdl_g
diff -u src/sys/arch/evbarm/conf/std.hdl_g:1.5 src/sys/arch/evbarm/conf/std.hdl_g:1.6
--- src/sys/arch/evbarm/conf/std.hdl_g:1.5 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.hdl_g Wed Jan 17 20:30:16 2018
@@ -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 @@ include "arch/evbarm/conf/std.evbarm"
# 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"
Index: src/sys/arch/evbarm/conf/std.integrator
diff -u src/sys/arch/evbarm/conf/std.integrator:1.18 src/sys/arch/evbarm/conf/std.integrator:1.19
--- src/sys/arch/evbarm/conf/std.integrator:1.18 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.integrator Wed Jan 17 20:30:16 2018
@@ -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 EXEC_AOUT
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"
Index: src/sys/arch/evbarm/conf/std.integrator_cp
diff -u src/sys/arch/evbarm/conf/std.integrator_cp:1.1 src/sys/arch/evbarm/conf/std.integrator_cp:1.2
--- src/sys/arch/evbarm/conf/std.integrator_cp:1.1 Tue Feb 19 10:57:10 2013
+++ src/sys/arch/evbarm/conf/std.integrator_cp Wed Jan 17 20:30:16 2018
@@ -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 EXEC_AOUT
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"
Index: src/sys/arch/evbarm/conf/std.iq31244
diff -u src/sys/arch/evbarm/conf/std.iq31244:1.10 src/sys/arch/evbarm/conf/std.iq31244:1.11
--- src/sys/arch/evbarm/conf/std.iq31244:1.10 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.iq31244 Wed Jan 17 20:30:16 2018
@@ -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 @@ include "arch/evbarm/conf/files.iq31244
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"
Index: src/sys/arch/evbarm/conf/std.iq80321
diff -u src/sys/arch/evbarm/conf/std.iq80321:1.15 src/sys/arch/evbarm/conf/std.iq80321:1.16
--- src/sys/arch/evbarm/conf/std.iq80321:1.15 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.iq80321 Wed Jan 17 20:30:16 2018
@@ -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 @@ include "arch/evbarm/conf/files.iq80321
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"
Index: src/sys/arch/evbarm/conf/std.smdk2800
diff -u src/sys/arch/evbarm/conf/std.smdk2800:1.15 src/sys/arch/evbarm/conf/std.smdk2800:1.16
--- src/sys/arch/evbarm/conf/std.smdk2800:1.15 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.smdk2800 Wed Jan 17 20:30:16 2018
@@ -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 $
#
# standard NetBSD/evbarm for SMDK2800 options
@@ -11,7 +11,6 @@ include "arch/evbarm/conf/files.smdk280
options EXEC_AOUT
options ARM9_CACHE_WRITE_THROUGH # we have problem with WB dcache
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
options SSCOM_S3C2800
Index: src/sys/arch/evbarm/conf/std.ixdp425
diff -u src/sys/arch/evbarm/conf/std.ixdp425:1.12 src/sys/arch/evbarm/conf/std.ixdp425:1.13
--- src/sys/arch/evbarm/conf/std.ixdp425:1.12 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.ixdp425 Wed Jan 17 20:30:16 2018
@@ -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 EXEC_AOUT
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"
Index: src/sys/arch/evbarm/conf/std.ixm1200
diff -u src/sys/arch/evbarm/conf/std.ixm1200:1.14 src/sys/arch/evbarm/conf/std.ixm1200:1.15
--- src/sys/arch/evbarm/conf/std.ixm1200:1.14 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.ixm1200 Wed Jan 17 20:30:16 2018
@@ -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 @@ include "arch/evbarm/conf/files.ixm1200
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"
Index: src/sys/arch/evbarm/conf/std.mini2440
diff -u src/sys/arch/evbarm/conf/std.mini2440:1.3 src/sys/arch/evbarm/conf/std.mini2440:1.4
--- src/sys/arch/evbarm/conf/std.mini2440:1.3 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.mini2440 Wed Jan 17 20:30:16 2018
@@ -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 @@ include "arch/evbarm/conf/files.mini244
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options SSCOM_S3C2440
makeoptions BOARDTYPE="mini2440"
Index: src/sys/arch/evbarm/conf/std.npwr_fc
diff -u src/sys/arch/evbarm/conf/std.npwr_fc:1.6 src/sys/arch/evbarm/conf/std.npwr_fc:1.7
--- src/sys/arch/evbarm/conf/std.npwr_fc:1.6 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.npwr_fc Wed Jan 17 20:30:16 2018
@@ -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 @@ include "arch/evbarm/conf/files.npwr_fc
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"
Index: src/sys/arch/evbarm/conf/std.smdk2410
diff -u src/sys/arch/evbarm/conf/std.smdk2410:1.7 src/sys/arch/evbarm/conf/std.smdk2410:1.8
--- src/sys/arch/evbarm/conf/std.smdk2410:1.7 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.smdk2410 Wed Jan 17 20:30:16 2018
@@ -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 @@ include "arch/evbarm/conf/files.smdk241
options EXEC_AOUT
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options SSCOM_S3C2410
makeoptions BOARDTYPE="smdk2410"
Index: src/sys/arch/iyonix/conf/std.iyonix
diff -u src/sys/arch/iyonix/conf/std.iyonix:1.6 src/sys/arch/iyonix/conf/std.iyonix:1.7
--- src/sys/arch/iyonix/conf/std.iyonix:1.6 Sun Jan 27 12:37:12 2008
+++ src/sys/arch/iyonix/conf/std.iyonix Wed Jan 17 20:30:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.iyonix,v 1.6 2008/01/27 12:37:12 chris Exp $
+# $NetBSD: std.iyonix,v 1.7 2018/01/17 20:30:17 skrll Exp $
#
# standard NetBSD/iyonix for GENERIC options
@@ -13,8 +13,6 @@ options EXEC_SCRIPT
# To support easy transit to ../arch/arm/arm32
options ARM32
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
options ARM_INTR_IMPL="<arch/arm/xscale/i80321_intr.h>"
# We need to configure the PCI bus.
Index: src/sys/arch/shark/conf/std.shark
diff -u src/sys/arch/shark/conf/std.shark:1.10 src/sys/arch/shark/conf/std.shark:1.11
--- src/sys/arch/shark/conf/std.shark:1.10 Sun Mar 12 10:18:07 2017
+++ src/sys/arch/shark/conf/std.shark Wed Jan 17 20:30:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.shark,v 1.10 2017/03/12 10:18:07 martin Exp $
+# $NetBSD: std.shark,v 1.11 2018/01/17 20:30:17 skrll Exp $
#
# standard NetBSD/shark options
@@ -14,8 +14,6 @@ options EXEC_SCRIPT
options ARM32
options _ARM32_NEED_BUS_DMA_BOUNCE
-#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
-
# XXX
options OFW
