[src/trunk]: src/sys/arch/arm/arm32 ARM_MMU_EXTENDED support.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0f2dbc3ed43d
branches:  trunk
changeset: 328183:0f2dbc3ed43d
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Mar 28 21:56:45 2014 +0000

description:
ARM_MMU_EXTENDED support.

diffstat:

 sys/arch/arm/arm32/arm32_kvminit.c |  28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 6820155e75f0 -r 0f2dbc3ed43d sys/arch/arm/arm32/arm32_kvminit.c
--- a/sys/arch/arm/arm32/arm32_kvminit.c        Fri Mar 28 21:56:02 2014 +0000
+++ b/sys/arch/arm/arm32/arm32_kvminit.c        Fri Mar 28 21:56:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_kvminit.c,v 1.24 2014/03/05 02:17:21 matt Exp $  */
+/*     $NetBSD: arm32_kvminit.c,v 1.25 2014/03/28 21:56:45 matt Exp $  */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -122,7 +122,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.24 2014/03/05 02:17:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.25 2014/03/28 21:56:45 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -371,7 +371,7 @@
 {
        struct bootmem_info * const bmi = &bootmem_info;
 #ifdef MULTIPROCESSOR
-       const size_t cpu_num = arm_cpu_max + 1;
+       const size_t cpu_num = arm_cpu_max;
 #else
        const size_t cpu_num = 1;
 #endif
@@ -903,11 +903,12 @@
         * tables.
         */
 
-#if defined(VERBOSE_INIT_ARM) && 0
+#if defined(VERBOSE_INIT_ARM)
        printf("TTBR0=%#x", armreg_ttbr_read());
 #ifdef _ARM_ARCH_6
-       printf(" TTBR1=%#x TTBCR=%#x",
-           armreg_ttbr1_read(), armreg_ttbcr_read());
+       printf(" TTBR1=%#x TTBCR=%#x CONTEXTIDR=%#x",
+           armreg_ttbr1_read(), armreg_ttbcr_read(),
+           armreg_contextidr_read());
 #endif
        printf("\n");
 #endif
@@ -931,6 +932,7 @@
        /*
         * TTBCR should have been initialized by the MD start code.
         */
+       KASSERT((armreg_contextidr_read() & 0xff) == 0);
        KASSERT(armreg_ttbcr_read() == __SHIFTIN(1, TTBCR_S_N));
        /*
         * Disable lookups via TTBR0 until there is an activated pmap.
@@ -951,6 +953,20 @@
 #else
        printf(" (TTBR0=%#x)", armreg_ttbr_read());
 #endif
+#endif
+
+#ifdef MULTIPROCESSOR
+       /*
+        * Kick the secondaries to load the TTB.  After which they'll go
+        * back to sleep to wait for the final kick so they will hatch.
+        */
+#ifdef VERBOSE_INIT_ARM
+       printf(" hatchlings");
+#endif
+       cpu_boot_secondary_processors();
+#endif
+
+#ifdef VERBOSE_INIT_ARM
        printf(" OK\n");
 #endif
 }