 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm283x_platform.c,v 1.6 2018/06/27 11:12:14 ryo Exp $	*/
+/*	$NetBSD: bcm283x_platform.c,v 1.7 2018/07/09 06:21:46 ryo Exp $	*/
 /*-
  * Copyright (c) 2017 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -17,27 +17,27 @@
  * 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 AUTHOR 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(0, "$NetBSD: bcm283x_platform.c,v 1.6 2018/06/27 11:12:14 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.7 2018/07/09 06:21:46 ryo Exp $");
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_evbarm_boardtype.h"
 #include "opt_kgdb.h"
 #include "opt_fdt.h"
 #include "opt_rpi.h"
 #include "opt_vcprop.h"
 #include "sdhc.h"
 #include "bcmsdhost.h"
 @@ -764,55 +764,89 @@ bcm2836_bootparams(void)
+{
 	const paddr_t pa = BCM2836_PERIPHERALS_BUS_TO_PHYS(BCM2835_ARMMBOX_BASE);
 	const bus_space_tag_t iot = &bcm2836_bs_tag;
 	const bus_space_handle_t ioh = BCM2835_IOPHYSTOVIRT(pa);
 	bcm283x_bootparams(iot, ioh);
+}
 static void
 bcm2836_bootstrap(void)
+{
 #define RPI_CPU_MAX	4
-#ifdef MULTIPROCESSOR
+#ifdef VERBOSE_INIT_ARM
-	extern int cortex_mmuinfo;
+#define DPRINTF(...)	printf(__VA_ARGS__)
 #else
 #define DPRINTF(...)
 #endif
 #ifdef MULTIPROCESSOR
 	arm_cpu_max = RPI_CPU_MAX;
 	DPRINTF("%s: %d cpus present\n", __func__, arm_cpu_max);
 #ifdef __arm__
 	extern int cortex_mmuinfo;
 	cortex_mmuinfo = armreg_ttbr_read();
-#ifdef VERBOSE_INIT_ARM
+	DPRINTF("%s: cortex_mmuinfo %x\n", __func__, cortex_mmuinfo);
 	printf("%s: %d cpus present\n", __func__, arm_cpu_max);
 	printf("%s: cortex_mmuinfo %x\n", __func__, cortex_mmuinfo);
 #endif
 #endif /* MULTIPROCESSOR */
 #ifdef __aarch64__
 	/*
 	 * XXX: use psci_fdt_bootstrap()
 	 */
 	extern void aarch64_mpstart(void);
 	for (int i = 1; i < RPI_CPU_MAX; i++) {
 		/*
 		 * Reference:
 		 *   armstubs/armstub8.S
 		 *   in https://github.com/raspberrypi/tools
 		 */
 		volatile uint64_t *cpu_release_addr;
 #define RPI3_ARMSTUB8_SPINADDR_BASE	0x000000d8
 		cpu_release_addr =
 		    AARCH64_PA_TO_KVA(RPI3_ARMSTUB8_SPINADDR_BASE + i * 8);
 		*cpu_release_addr = aarch64_kern_vtophys(aarch64_mpstart);
 		/* need flush cache. secondary processors are cache disabled */
 		cpu_dcache_wb_range(cpu_release_addr, sizeof(cpu_release_addr));
 		__asm __volatile("sev" ::: "memory");
 #if defined(VERBOSE_INIT_ARM) && defined(EARLYCONS)
 		/* wait secondary processor's debug output */
 		gtmr_delay(100000);
 #endif
+	}
 #endif /* __aarch64__ */
-#ifndef __aarch64__
+#ifdef __arm__
 	/*
 	 * Even if no options MULTIPROCESSOR,
 	 * It is need to initialize the secondary CPU,
 	 * and go into wfi loop (cortex_mpstart),
 	 * otherwise system would be freeze...
 	 */
 	extern void cortex_mpstart(void);
 	for (size_t i = 1; i < RPI_CPU_MAX; i++) {
 		bus_space_tag_t iot = &bcm2836_bs_tag;
 		bus_space_handle_t ioh = BCM2836_ARM_LOCAL_VBASE;
 		bus_space_write_4(iot, ioh,
 		    BCM2836_LOCAL_MAILBOX3_SETN(i),
 		    (uint32_t)cortex_mpstart);
+	}
 #endif
 #ifdef MULTIPROCESSOR
 	/* Wake up AP in case firmware has placed it in WFE state */
 	__asm __volatile("sev" ::: "memory");
 	for (int loop = 0; loop < 16; loop++) {
 		if (arm_cpu_hatched == __BITS(arm_cpu_max - 1, 1))
 			break;
 		gtmr_delay(10000);
+	}
 	for (size_t i = 1; i < arm_cpu_max; i++) {
 		if ((arm_cpu_hatched & (1 << i)) == 0) {
 			printf("%s: warning: cpu%zu failed to hatch\n",