Module Name: src
Committed By: skrll
Date: Sun Apr 16 14:01:51 UTC 2023
Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c genassym.cf locore.S
pmap.c pmap_machdep.c
src/sys/arch/aarch64/include: asan.h vmparam.h
src/sys/arch/arm/include/arm32: vmparam.h
src/sys/arch/evbarm/fdt: platform.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/aarch64/aarch64/aarch64_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/aarch64/aarch64/genassym.cf
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/aarch64/aarch64/locore.S
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/pmap_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/include/asan.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/aarch64/include/vmparam.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/arm/include/arm32/vmparam.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/fdt/platform.h
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/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.67 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.68
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.67 Fri Apr 7 08:55:29 2023
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Sun Apr 16 14:01:51 2023
@@ -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
Index: src/sys/arch/aarch64/aarch64/genassym.cf
diff -u src/sys/arch/aarch64/aarch64/genassym.cf:1.38 src/sys/arch/aarch64/aarch64/genassym.cf:1.39
--- src/sys/arch/aarch64/aarch64/genassym.cf:1.38 Sat Jun 25 13:24:34 2022
+++ src/sys/arch/aarch64/aarch64/genassym.cf Sun Apr 16 14:01:51 2023
@@ -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
Index: src/sys/arch/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.91 src/sys/arch/aarch64/aarch64/locore.S:1.92
--- src/sys/arch/aarch64/aarch64/locore.S:1.91 Thu Feb 23 14:54:57 2023
+++ src/sys/arch/aarch64/aarch64/locore.S Sun Apr 16 14:01:51 2023
@@ -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 <[email protected]>
@@ -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
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.147 src/sys/arch/aarch64/aarch64/pmap.c:1.148
--- src/sys/arch/aarch64/aarch64/pmap.c:1.147 Sun Oct 30 14:08:09 2022
+++ src/sys/arch/aarch64/aarch64/pmap.c Sun Apr 16 14:01:51 2023
@@ -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 <[email protected]>
@@ -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) {
Index: src/sys/arch/aarch64/aarch64/pmap_machdep.c
diff -u src/sys/arch/aarch64/aarch64/pmap_machdep.c:1.4 src/sys/arch/aarch64/aarch64/pmap_machdep.c:1.5
--- src/sys/arch/aarch64/aarch64/pmap_machdep.c:1.4 Wed Apr 12 06:57:28 2023
+++ src/sys/arch/aarch64/aarch64/pmap_machdep.c Sun Apr 16 14:01:51 2023
@@ -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) ||
Index: src/sys/arch/aarch64/include/asan.h
diff -u src/sys/arch/aarch64/include/asan.h:1.18 src/sys/arch/aarch64/include/asan.h:1.19
--- src/sys/arch/aarch64/include/asan.h:1.18 Thu Apr 29 09:27:29 2021
+++ src/sys/arch/aarch64/include/asan.h Sun Apr 16 14:01:51 2023
@@ -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
Index: src/sys/arch/aarch64/include/vmparam.h
diff -u src/sys/arch/aarch64/include/vmparam.h:1.19 src/sys/arch/aarch64/include/vmparam.h:1.20
--- src/sys/arch/aarch64/include/vmparam.h:1.19 Sat Apr 2 11:16:06 2022
+++ src/sys/arch/aarch64/include/vmparam.h Sun Apr 16 14:01:51 2023
@@ -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)
Index: src/sys/arch/arm/include/arm32/vmparam.h
diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.56 src/sys/arch/arm/include/arm32/vmparam.h:1.57
--- src/sys/arch/arm/include/arm32/vmparam.h:1.56 Thu Oct 8 12:49:06 2020
+++ src/sys/arch/arm/include/arm32/vmparam.h Sun Apr 16 14:01:51 2023
@@ -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_ */
Index: src/sys/arch/evbarm/fdt/platform.h
diff -u src/sys/arch/evbarm/fdt/platform.h:1.10 src/sys/arch/evbarm/fdt/platform.h:1.11
--- src/sys/arch/evbarm/fdt/platform.h:1.10 Sat Dec 12 09:27:31 2020
+++ src/sys/arch/evbarm/fdt/platform.h Sun Apr 16 14:01:51 2023
@@ -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 <[email protected]>
@@ -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
