Module Name: src
Committed By: skrll
Date: Sat Apr 11 15:29:58 UTC 2015
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Tweak cpu start up slightly and print TTBR for cortex_mmuinfo when
VERBOSE_INIT_ARM
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/rpi/rpi_machdep.c
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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.59 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.60
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.59 Sun Mar 15 22:54:03 2015
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sat Apr 11 15:29:58 2015
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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"
@@ -491,17 +491,22 @@ 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);
