Sat Apr 11 15:29:58 2015 UTC ()

Tweak cpu start up slightly and print TTBR for cortex_mmuinfo when
VERBOSE_INIT_ARM


(skrll)

diff -r1.59 -r1.60 src/sys/arch/evbarm/rpi/rpi_machdep.c

--- src/sys/arch/evbarm/rpi/Attic/rpi_machdep.c 2015/03/15 22:54:03	1.59
+++ src/sys/arch/evbarm/rpi/Attic/rpi_machdep.c 2015/04/11 15:29:58	1.60

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpi_machdep.c,v 1.59 2015/03/15 22:54:03 joerg Exp $	*/
+/*	$NetBSD: rpi_machdep.c,v 1.60 2015/04/11 15:29:58 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 FOUNDATION OR CONTRIBUTORS
  * 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: rpi_machdep.c,v 1.59 2015/03/15 22:54:03 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.60 2015/04/11 15:29:58 skrll 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_rpi.h"
 #include "opt_vcprop.h"
 #include "sdhc.h"
 #include "bcmdwctwo.h"
 #include "bcmspi.h"
 @@ -481,37 +481,42 @@ rpi_bootparams(void)
 	if (vcprop_tag_success_p(&vb.vbt_cmdline.tag))
 		printf("%s: cmdline      %s\n", __func__,
 		    vb.vbt_cmdline.cmdline);
 #endif
+}
 static void
 rpi_bootstrap(void)
+{
 #if defined(BCM2836)
 	arm_cpu_max = 4;
 	extern int cortex_mmuinfo;
 	bus_space_tag_t iot = &bcm2835_bs_tag;
 	bus_space_handle_t ioh = BCM2836_ARM_LOCAL_VBASE;
 #ifdef VERBOSE_INIT_ARM
 	printf("%s: %d cpus present\n", __func__, arm_cpu_max);
 #endif
 	extern void cortex_mpstart(void);
 	cortex_mmuinfo = armreg_ttbr_read();
 #ifdef VERBOSE_INIT_ARM
 	printf("%s: cortex_mmuinfo %x\n", __func__, cortex_mmuinfo);
 #endif
 	extern void cortex_mpstart(void);
 	for (size_t i = 1; i < arm_cpu_max; i++) {
 		bus_space_tag_t iot = &bcm2835_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);
 		int timeout = 20;
 		while (timeout-- > 0) {
 			uint32_t val;
 			val = bus_space_read_4(iot, ioh,
 			    BCM2836_LOCAL_MAILBOX3_CLRN(i));
 			if (val == 0)
 				break;
+		}