Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm Fix RPI boot which needs more early stack



details:   https://anonhg.NetBSD.org/src/rev/0889196c06ea
branches:  trunk
changeset: 936107:0889196c06ea
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Jul 19 11:47:47 2020 +0000

description:
Fix RPI boot which needs more early stack

XXX centralise INIT_ARM_STACK_{SHIFT,SIZE}
XXX how to protect against this breaking again?

diffstat:

 sys/arch/arm/arm/armv6_start.S |  4 ++--
 sys/arch/arm/include/asan.h    |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 4850d5a21e1c -r 0889196c06ea sys/arch/arm/arm/armv6_start.S
--- a/sys/arch/arm/arm/armv6_start.S    Sun Jul 19 10:38:02 2020 +0000
+++ b/sys/arch/arm/arm/armv6_start.S    Sun Jul 19 11:47:47 2020 +0000
@@ -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)
diff -r 4850d5a21e1c -r 0889196c06ea sys/arch/arm/include/asan.h
--- a/sys/arch/arm/include/asan.h       Sun Jul 19 10:38:02 2020 +0000
+++ b/sys/arch/arm/include/asan.h       Sun Jul 19 11:47:47 2020 +0000
@@ -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 @@
  * 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 @@
 /*
  * 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



Home | Main Index | Thread Index | Old Index