Module Name: src
Committed By: skrll
Date: Sun Jul 19 11:47:48 UTC 2020
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
src/sys/arch/arm/include: asan.h
Log Message:
Fix RPI boot which needs more early stack
XXX centralise INIT_ARM_STACK_{SHIFT,SIZE}
XXX how to protect against this breaking again?
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/arm/armv6_start.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/include/asan.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/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.20 src/sys/arch/arm/arm/armv6_start.S:1.21
--- src/sys/arch/arm/arm/armv6_start.S:1.20 Fri Jul 10 12:25:08 2020
+++ src/sys/arch/arm/arm/armv6_start.S Sun Jul 19 11:47:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.20 2020/07/10 12:25:08 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.21 2020/07/19 11:47:47 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include <arm/armreg.h>
#include "assym.h"
-#define INIT_ARM_STACK_SHIFT 9
+#define INIT_ARM_STACK_SHIFT 10
#define INIT_ARM_STACK_SIZE (1 << INIT_ARM_STACK_SHIFT)
#if defined(CONSADDR) && defined(CONADDR)
Index: src/sys/arch/arm/include/asan.h
diff -u src/sys/arch/arm/include/asan.h:1.2 src/sys/arch/arm/include/asan.h:1.3
--- src/sys/arch/arm/include/asan.h:1.2 Fri Jul 10 12:45:15 2020
+++ src/sys/arch/arm/include/asan.h Sun Jul 19 11:47:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.2 2020/07/10 12:45:15 skrll Exp $ */
+/* $NetBSD: asan.h,v 1.3 2020/07/19 11:47:48 skrll Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@ kasan_md_unsupported(vaddr_t addr)
* that VA = PA + KERNEL_BASE.
*/
-#define KASAN_NEARLYPAGES 2
+#define KASAN_NEARLYPAGES 3
static bool __md_early __read_mostly;
static size_t __md_nearlypages __attribute__((__section__(".data")));
@@ -165,7 +165,7 @@ kasan_md_shadow_map_page(vaddr_t va)
/*
* Map the init stacks of the BP and APs. We will map the rest in kasan_init.
*/
-#define INIT_ARM_STACK_SHIFT 9
+#define INIT_ARM_STACK_SHIFT 10
#define INIT_ARM_STACK_SIZE (1 << INIT_ARM_STACK_SHIFT)
static void
