[src/trunk]: src/sys/arch Rename VM_KERNEL_IO_ADDRESS to VM_KERNEL_IO_BASE to...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d8bb3c4f0c3
branches:  trunk
changeset: 374273:8d8bb3c4f0c3
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Apr 16 14:01:51 2023 +0000

description:
Rename VM_KERNEL_IO_ADDRESS to VM_KERNEL_IO_BASE to match RISC-V

It's less letters, matches other similar variables and will help with
sharing code between the two architectures.

NFCI.

diffstat:

 sys/arch/aarch64/aarch64/aarch64_machdep.c |  6 +++---
 sys/arch/aarch64/aarch64/genassym.cf       |  4 ++--
 sys/arch/aarch64/aarch64/locore.S          |  6 +++---
 sys/arch/aarch64/aarch64/pmap.c            |  8 ++++----
 sys/arch/aarch64/aarch64/pmap_machdep.c    |  8 ++++----
 sys/arch/aarch64/include/asan.h            |  4 ++--
 sys/arch/aarch64/include/vmparam.h         |  8 ++++----
 sys/arch/arm/include/arm32/vmparam.h       |  8 ++++----
 sys/arch/evbarm/fdt/platform.h             |  4 ++--
 9 files changed, 28 insertions(+), 28 deletions(-)

diffs (219 lines):

diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/aarch64/aarch64/aarch64_machdep.c
--- a/sys/arch/aarch64/aarch64/aarch64_machdep.c        Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/aarch64/aarch64/aarch64_machdep.c        Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.67 2023/04/07 08:55:29 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.68 2023/04/16 14:01:51 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.67 2023/04/07 08:55:29 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.68 2023/04/16 14:01:51 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
@@ -356,7 +356,7 @@ initarm_common(vaddr_t kvm_base, vsize_t
            module_end,
 #endif
            VM_KERNEL_VM_BASE,
-           VM_KERNEL_IO_ADDRESS,
+           VM_KERNEL_IO_BASE,
            VM_MAX_KERNEL_ADDRESS);
 
 #ifdef DDB
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/aarch64/aarch64/genassym.cf
--- a/sys/arch/aarch64/aarch64/genassym.cf      Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/aarch64/aarch64/genassym.cf      Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.38 2022/06/25 13:24:34 jmcneill Exp $
+# $NetBSD: genassym.cf,v 1.39 2023/04/16 14:01:51 skrll Exp $
 #-
 # Copyright (c) 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -69,7 +69,7 @@ define        __HAVE_FAST_SOFTINTS    1
 define MAXCPUS                 MAXCPUS
 define VM_MIN_KERNEL_ADDRESS   VM_MIN_KERNEL_ADDRESS
 define VM_MAX_KERNEL_ADDRESS   VM_MAX_KERNEL_ADDRESS
-define VM_KERNEL_IO_ADDRESS    VM_KERNEL_IO_ADDRESS
+define VM_KERNEL_IO_BASE       VM_KERNEL_IO_BASE
 define VM_KERNEL_IO_SIZE       VM_KERNEL_IO_SIZE
 define AARCH64_DIRECTMAP_START AARCH64_DIRECTMAP_START
 define AARCH64_DIRECTMAP_MASK  AARCH64_DIRECTMAP_MASK
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.91 2023/02/23 14:54:57 riastradh Exp $    */
+/*     $NetBSD: locore.S,v 1.92 2023/04/16 14:01:51 skrll Exp $        */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -38,7 +38,7 @@
 #include <aarch64/hypervisor.h>
 #include "assym.h"
 
-RCSID("$NetBSD: locore.S,v 1.91 2023/02/23 14:54:57 riastradh Exp $")
+RCSID("$NetBSD: locore.S,v 1.92 2023/04/16 14:01:51 skrll Exp $")
 
 #ifdef AARCH64_DEVICE_MEM_NONPOSTED
 #define        MAIR_DEVICE_MEM         MAIR_DEVICE_nGnRnE
@@ -1037,7 +1037,7 @@ sctlr_pac:
            0)
 
 .L_devmap_addr:
-       .quad   VM_KERNEL_IO_ADDRESS
+       .quad   VM_KERNEL_IO_BASE
 
        .data
 
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/aarch64/aarch64/pmap.c
--- a/sys/arch/aarch64/aarch64/pmap.c   Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/aarch64/aarch64/pmap.c   Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.147 2022/10/30 14:08:09 riastradh Exp $     */
+/*     $NetBSD: pmap.c,v 1.148 2023/04/16 14:01:51 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.147 2022/10/30 14:08:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.148 2023/04/16 14:01:51 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
@@ -375,8 +375,8 @@ pmap_devmap_bootstrap(vaddr_t l0pt, cons
                    table[i].pd_va);
                va = table[i].pd_va;
 
-               KASSERT((VM_KERNEL_IO_ADDRESS <= va) &&
-                   (va < (VM_KERNEL_IO_ADDRESS + VM_KERNEL_IO_SIZE)));
+               KASSERT((VM_KERNEL_IO_BASE <= va) &&
+                   (va < (VM_KERNEL_IO_BASE + VM_KERNEL_IO_SIZE)));
 
                /* update and check virtual_devmap_addr */
                if (virtual_devmap_addr == 0 || virtual_devmap_addr > va) {
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/aarch64/aarch64/pmap_machdep.c
--- a/sys/arch/aarch64/aarch64/pmap_machdep.c   Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/aarch64/aarch64/pmap_machdep.c   Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_machdep.c,v 1.4 2023/04/12 06:57:28 skrll Exp $   */
+/*     $NetBSD: pmap_machdep.c,v 1.5 2023/04/16 14:01:51 skrll Exp $   */
 
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #define __PMAP_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.4 2023/04/12 06:57:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.5 2023/04/16 14:01:51 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -718,8 +718,8 @@ pmap_devmap_bootstrap(vaddr_t l0pt, cons
                    table[i].pd_va);
                va = table[i].pd_va;
 
-               KASSERT((VM_KERNEL_IO_ADDRESS <= va) &&
-                   (va < (VM_KERNEL_IO_ADDRESS + VM_KERNEL_IO_SIZE)));
+               KASSERT((VM_KERNEL_IO_BASE <= va) &&
+                   (va < (VM_KERNEL_IO_BASE + VM_KERNEL_IO_SIZE)));
 
                /* update and check virtual_devmap_addr */
                if ((virtual_devmap_addr == 0) ||
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/aarch64/include/asan.h
--- a/sys/arch/aarch64/include/asan.h   Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/aarch64/include/asan.h   Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asan.h,v 1.18 2021/04/29 09:27:29 skrll Exp $  */
+/*     $NetBSD: asan.h,v 1.19 2023/04/16 14:01:51 skrll Exp $  */
 
 /*
  * Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -61,7 +61,7 @@ static inline bool
 kasan_md_unsupported(vaddr_t addr)
 {
        return (addr < VM_MIN_KERNEL_ADDRESS) ||
-           (addr >= VM_KERNEL_IO_ADDRESS);
+           (addr >= VM_KERNEL_IO_BASE);
 }
 
 static paddr_t
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/aarch64/include/vmparam.h
--- a/sys/arch/aarch64/include/vmparam.h        Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/aarch64/include/vmparam.h        Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.19 2022/04/02 11:16:06 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.20 2023/04/16 14:01:51 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -151,11 +151,11 @@
  * last 254MB of kernel vm area (0xfffffffff0000000-0xffffffffffe00000)
  * may be used for devmap.  see aarch64/pmap.c:pmap_devmap_*
  */
-#define VM_KERNEL_IO_ADDRESS   0xfffffffff0000000L
-#define VM_KERNEL_IO_SIZE      (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
+#define VM_KERNEL_IO_BASE      0xfffffffff0000000L
+#define VM_KERNEL_IO_SIZE      (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_BASE)
 
 #define VM_KERNEL_VM_BASE      (0xffffc00040000000L)
-#define VM_KERNEL_VM_SIZE      (VM_KERNEL_IO_ADDRESS - VM_KERNEL_VM_BASE)
+#define VM_KERNEL_VM_SIZE      (VM_KERNEL_IO_BASE - VM_KERNEL_VM_BASE)
 
 /* virtual sizes (bytes) for various kernel submaps */
 #define USRIOSIZE              (PAGE_SIZE / 8)
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/arm/include/arm32/vmparam.h
--- a/sys/arch/arm/include/arm32/vmparam.h      Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/arm/include/arm32/vmparam.h      Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.56 2020/10/08 12:49:06 he Exp $  */
+/*     $NetBSD: vmparam.h,v 1.57 2023/04/16 14:01:51 skrll Exp $       */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -131,7 +131,7 @@
 #define VM_KERNEL_KASAN_END    (VM_KERNEL_KASAN_BASE + VM_KERNEL_KASAN_SIZE)
 #define VM_KERNEL_VM_END       VM_KERNEL_KASAN_BASE
 #else
-#define VM_KERNEL_VM_END       VM_KERNEL_IO_ADDRESS
+#define VM_KERNEL_VM_END       VM_KERNEL_IO_BASE
 #endif
 
 #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
@@ -146,8 +146,8 @@
 #define VM_KERNEL_ADDR_SIZE    (VM_KERNEL_VM_END - KERNEL_BASE)
 #define VM_KERNEL_VM_SIZE      (VM_KERNEL_VM_END - VM_KERNEL_VM_BASE)
 
-#define VM_KERNEL_IO_ADDRESS   0xf0000000
-#define VM_KERNEL_IO_SIZE      (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
+#define VM_KERNEL_IO_BASE      0xf0000000
+#define VM_KERNEL_IO_SIZE      (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_BASE)
 #endif
 
 #endif /* _ARM_ARM32_VMPARAM_H_ */
diff -r 6feb0ec65322 -r 8d8bb3c4f0c3 sys/arch/evbarm/fdt/platform.h
--- a/sys/arch/evbarm/fdt/platform.h    Sun Apr 16 11:18:25 2023 +0000
+++ b/sys/arch/evbarm/fdt/platform.h    Sun Apr 16 14:01:51 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.h,v 1.10 2020/12/12 09:27:31 skrll Exp $ */
+/* $NetBSD: platform.h,v 1.11 2023/04/16 14:01:51 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #ifndef _EVBARM_FDT_PLATFORM_H
 #define _EVBARM_FDT_PLATFORM_H
 
-#define KERNEL_IO_VBASE                VM_KERNEL_IO_ADDRESS
+#define KERNEL_IO_VBASE                VM_KERNEL_IO_BASE
 #define KERNEL_IO_VSIZE                VM_KERNEL_IO_SIZE
 
 #define KERNEL_VM_BASE         VM_KERNEL_VM_BASE