 @@ -1,14 +1,14 @@
-/* $NetBSD: aarch64_machdep.c,v 1.36 2019/12/30 15:54:55 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.37 2020/01/08 05:41:07 ryo Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.36 2019/12/30 15:54:55 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.37 2020/01/08 05:41:07 ryo Exp $");
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
 #include "opt_kernhist.h"
 #include "opt_modular.h"
 #include "opt_fdt.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/asan.h>
 #include <sys/bus.h>
 #include <sys/core.h>
 #include <sys/conf.h>
 @@ -89,27 +89,27 @@ const pcu_ops_t * const pcu_ops_md_defs[
 struct vm_map *phys_map;
 #ifdef MODULAR
 vaddr_t module_start, module_end;
 static struct vm_map module_map_store;
 #endif
 /* XXX */
 vaddr_t physical_start;
 vaddr_t physical_end;
 /* filled in before cleaning bss. keep in .data */
 u_long kern_vtopdiff __attribute__((__section__(".data")));
-long kernend_extra;	/* extra memory allocated from round_page(_end[]) */
+long kernend_extra;	/* extra physicalmemory allocated from round_page(_end[]) */
 /* dump configuration */
 int	cpu_dump(void);
 int	cpu_dumpsize(void);
 u_long	cpu_dump_mempagecnt(void);
 uint32_t dumpmag = 0x8fca0101;  /* magic number for savecore */
 int     dumpsize = 0;           /* also for savecore */
 long    dumplo = 0;
 void
 cpu_kernel_vm_init(uint64_t memory_start __unused, uint64_t memory_size __unused)
+{
 @@ -217,27 +217,27 @@ cpu_kernel_vm_init(uint64_t memory_start
 	/*
 	 * at this point, whole kernel image is mapped as "rwx".
 	 * permission should be changed to:
+	 *
 	 *    text     rwx => r-x
 	 *    rodata   rwx => r--
 	 *    data     rwx => rw-
+	 *
 	 * kernel image has mapped by L2 block. (2Mbyte)
 	 */
 	pmapboot_protect(L2_TRUNC_BLOCK(kernstart),
 	    L2_TRUNC_BLOCK(data_start), VM_PROT_WRITE);
 	pmapboot_protect(L2_ROUND_BLOCK(rodata_start),
-	    L2_ROUND_BLOCK(kernend + kernend_extra), VM_PROT_EXECUTE);
+	    L2_ROUND_BLOCK(kernend), VM_PROT_EXECUTE);
 	aarch64_tlbi_all();
 	VPRINTF("%s: kernel phys start %lx end %lx+%lx\n", __func__,
 	    kernstart_phys, kernend_phys, kernend_extra);
 	fdt_add_reserved_memory_range(kernstart_phys,
 	     kernend_phys - kernstart_phys + kernend_extra);
+}
 /*
  * Upper region: 0xffff_ffff_ffff_ffff  Top of virtual memory
 @@ -277,27 +277,27 @@ initarm_common(vaddr_t kvm_base, vsize_t
 	struct pcb *pcb;
 	struct trapframe *tf;
 	psize_t memsize_total;
 	vaddr_t kernstart, kernend;
 	vaddr_t kernstart_l2 __unused, kernend_l2;	/* L2 table 2MB aligned */
 	vaddr_t kernelvmstart;
 	int i;
 	cputype = cpu_idnum();	/* for compatible arm */
 	kernstart = trunc_page((vaddr_t)__kernel_text);
 	kernend = round_page((vaddr_t)_end);
 	kernstart_l2 = L2_TRUNC_BLOCK(kernstart);
-	kernend_l2 = L2_ROUND_BLOCK(kernend + kernend_extra);
+	kernend_l2 = L2_ROUND_BLOCK(kernend);
 	kernelvmstart = kernend_l2;
 #ifdef MODULAR
 	/*
 	 * aarch64 compiler (gcc & llvm) uses R_AARCH_CALL26/R_AARCH_JUMP26
 	 * for function calling/jumping.
 	 * (at this time, both compilers doesn't support -mlong-calls)
 	 * therefore kernel modules should be loaded within maximum 26bit word,
 	 * or +-128MB from kernel.
 	 */
 #define MODULE_RESERVED_MAX	(1024 * 1024 * 128)
 #define MODULE_RESERVED_SIZE	(1024 * 1024 * 32)	/* good enough? */
 	module_start = kernelvmstart;
 @@ -331,55 +331,55 @@ initarm_common(vaddr_t kvm_base, vsize_t
 		msgbufaddr = bootconfig.dram[i].address +
 		    ptoa(bootconfig.dram[i].pages);
 		break;
+	}
 	KASSERT(msgbufaddr != 0);	/* no space for msgbuf */
 	initmsgbuf((void *)AARCH64_PA_TO_KVA(msgbufaddr), MSGBUFSIZE);
 	VPRINTF(
 	    "------------------------------------------\n"
 	    "kern_vtopdiff         = 0x%016lx\n"
 	    "physical_start        = 0x%016lx\n"
 	    "kernel_start_phys     = 0x%016lx\n"
 	    "kernel_end_phys       = 0x%016lx\n"
 	    "pagetables_start_phys = 0x%016lx\n"
 	    "pagetables_end_phys   = 0x%016lx\n"
 	    "msgbuf                = 0x%016lx\n"
 	    "physical_end          = 0x%016lx\n"
 	    "VM_MIN_KERNEL_ADDRESS = 0x%016lx\n"
 	    "kernel_start_l2       = 0x%016lx\n"
 	    "kernel_start          = 0x%016lx\n"
 	    "kernel_end            = 0x%016lx\n"
 	    "pagetables            = 0x%016lx\n"
 	    "pagetables_end        = 0x%016lx\n"
 	    "kernel_end_l2         = 0x%016lx\n"
 #ifdef MODULAR
 	    "module_start          = 0x%016lx\n"
 	    "module_end            = 0x%016lx\n"
 #endif
 	    "(kernel va area)\n"
 	    "(devmap va area)      = 0x%016lx\n"
 	    "VM_MAX_KERNEL_ADDRESS = 0x%016lx\n"
 	    "------------------------------------------\n",
 	    kern_vtopdiff,
 	    physical_start,
 	    kernstart_phys,
 	    kernend_phys,
 	    round_page(kernend_phys),
 	    round_page(kernend_phys) + kernend_extra,
 	    msgbufaddr,
 	    physical_end,
 	    VM_MIN_KERNEL_ADDRESS,
 	    kernstart_l2,
 	    kernstart,
 	    kernend,
 	    round_page(kernend),
 	    round_page(kernend) + kernend_extra,
 	    kernend_l2,
 #ifdef MODULAR
 	    module_start,
 	    module_end,
 #endif
 	    VM_KERNEL_IO_ADDRESS,
 	    VM_MAX_KERNEL_ADDRESS);
 #ifdef DDB
 	db_machdep_init();
 #endif
 	uvm_md_init();
 @@ -543,27 +543,27 @@ mm_md_kernacc(void *ptr, vm_prot_t prot,
 	vaddr_t kernstart = trunc_page((vaddr_t)__kernel_text);
 	vaddr_t kernend = round_page((vaddr_t)_end);
 	paddr_t kernstart_phys = KERN_VTOPHYS(kernstart);
 	vaddr_t data_start = (vaddr_t)__data_start;
 	vaddr_t rodata_start = (vaddr_t)__rodata_start;
 	vsize_t rosize = kernend - rodata_start;
 	const vaddr_t v = (vaddr_t)ptr;
 #define IN_RANGE(addr,sta,end)	(((sta) <= (addr)) && ((addr) < (end)))
 	*handled = false;
-	if (IN_RANGE(v, kernstart, kernend + kernend_extra)) {
+	if (IN_RANGE(v, kernstart, kernend)) {
 		*handled = true;
 		if ((v < data_start) && (prot & VM_PROT_WRITE))
 			return EFAULT;
 	} else if (IN_RANGE(v, AARCH64_KSEG_START, AARCH64_KSEG_END)) {
 		/*
 		 * if defined PMAP_MAP_POOLPAGE, direct mapped address (KSEG)
 		 * will be appeared as kvm(3) address.
 		 */
 		paddr_t pa = AARCH64_KVA_TO_PA(v);
 		if (in_dram_p(pa, 0)) {
 			*handled = true;
 			if (IN_RANGE(pa, kernstart_phys,
 			    kernstart_phys + rosize) &&

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.49 2019/12/28 17:19:43 jmcneill Exp $	*/
+/*	$NetBSD: locore.S,v 1.50 2020/01/08 05:41:07 ryo Exp $	*/
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,27 +28,27 @@
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_fdt.h"
 #include "opt_kasan.h"
 #include "opt_multiprocessor.h"
 #include <aarch64/asm.h>
 #include <aarch64/hypervisor.h>
 #include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.49 2019/12/28 17:19:43 jmcneill Exp $")
+RCSID("$NetBSD: locore.S,v 1.50 2020/01/08 05:41:07 ryo Exp $")
 #ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
 #define	MAIR_DEVICE_MEM		MAIR_DEVICE_nGnRnE
 #else
 #define	MAIR_DEVICE_MEM		MAIR_DEVICE_nGnRE
 #endif
 #define	MAIR_DEVICE_MEM_SO	MAIR_DEVICE_nGnRnE
 /*#define DEBUG_LOCORE			/* debug print */
 /*#define DEBUG_LOCORE_PRINT_LOCK	/* avoid mixing AP's output */
 /*#define DEBUG_MMU			/* dump MMU table */
 #define LOCORE_EL2
 @@ -838,27 +838,26 @@ init_mmutable:
 	cbnz	x0, init_mmutable_error
 #endif
 	VPRINT("Creating KVA=PA tables\n")
 	mov	x7, x26				/* pr func */
 	adr	x6, bootpage_alloc		/* allocator */
 	mov	x5, xzr				/* flags = 0 */
 	mov	x4, #LX_BLKPAG_ATTR_NORMAL_WB|LX_BLKPAG_AP_RW	/* attr */
 	orr	x4, x4, #LX_BLKPAG_UXN
 	mov	x3, #L2_SIZE			/* blocksize */
 	adr	x1, start			/* pa = start */
 	ADDR	x2, _end
 	sub	x2, x2, x1			/* size = _end - start */
 	add	x2, x2, #BOOTPAGE_ALLOC_MAX	/* for bootpage_alloc() */
 	ldr	x0, =start			/* va */
 	bl	pmapboot_enter
 	cbnz	x0, init_mmutable_error
 	VPRINT("OK\n");
 	mov	x0, xzr
 	b	init_mmutable_done
 init_mmutable_error:
 	mvn	x0, xzr
 init_mmutable_done:
 	ldp	x26, lr, [sp], #16
 	ret