Module Name:    src
Committed By:   skrll
Date:           Wed Feb  6 13:28:08 UTC 2019

Modified Files:
        src/sys/arch/arm/arm32: arm32_kvminit.c

Log Message:
Make sure the start stacks are covered by the new translation tables.
They *might* get placed after ARM_BOOTSTRAP_LxPT by the linker.

AP startup uses VA sp in cpu_init_secondary_processor


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/arm32/arm32_kvminit.c

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/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.51 src/sys/arch/arm/arm32/arm32_kvminit.c:1.52
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.51	Wed Feb  6 13:22:54 2019
+++ src/sys/arch/arm/arm32/arm32_kvminit.c	Wed Feb  6 13:28:08 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm32_kvminit.c,v 1.51 2019/02/06 13:22:54 skrll Exp $	*/
+/*	$NetBSD: arm32_kvminit.c,v 1.52 2019/02/06 13:28:08 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -127,7 +127,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.51 2019/02/06 13:22:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.52 2019/02/06 13:28:08 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -190,12 +190,12 @@ arm32_bootmem_init(paddr_t memstart, psi
 	 */
 #if defined(__HAVE_GENERIC_START)
 	extern char KERNEL_BASE_virt[];
-	extern char ARM_BOOTSTRAP_LxPT[];
+	extern char const __stop__init_memory[];
 
 	VPRINTF("%s: kern_vtopdiff=%#lx\n", __func__, kern_vtopdiff);
 
 	vaddr_t kstartva = trunc_page((vaddr_t)KERNEL_BASE_virt);
-	vaddr_t kendva = round_page((vaddr_t)ARM_BOOTSTRAP_LxPT + L1_TABLE_SIZE);
+	vaddr_t kendva = round_page((vaddr_t)__stop__init_memory);
 
 	kernelstart = KERN_VTOPHYS(kstartva);
 

Reply via email to