| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | /* $NetBSD: bcm53xx_machdep.c,v 1.6 2012/10/23 23:16:05 matt Exp $ */ | | 1 | /* $NetBSD: bcm53xx_machdep.c,v 1.7 2013/06/30 22:02:56 matt Exp $ */ |
| 2 | | | 2 | |
| 3 | /*- | | 3 | /*- |
| 4 | * Copyright (c) 2012 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 2012 The NetBSD Foundation, Inc. |
| 5 | * All rights reserved. | | 5 | * All rights reserved. |
| 6 | * | | 6 | * |
| 7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
| 8 | * by Matt Thomas of 3am Software Foundry. | | 8 | * by Matt Thomas of 3am Software Foundry. |
| 9 | * | | 9 | * |
| 10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
| 11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
| 12 | * are met: | | 12 | * are met: |
| 13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
| 14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -23,27 +23,27 @@ | | | @@ -23,27 +23,27 @@ |
| 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 29 | * POSSIBILITY OF SUCH DAMAGE. | | 29 | * POSSIBILITY OF SUCH DAMAGE. |
| 30 | */ | | 30 | */ |
| 31 | | | 31 | |
| 32 | #define CCA_PRIVATE | | 32 | #define CCA_PRIVATE |
| 33 | #define IDM_PRIVATE | | 33 | #define IDM_PRIVATE |
| 34 | | | 34 | |
| 35 | #include <sys/cdefs.h> | | 35 | #include <sys/cdefs.h> |
| 36 | __KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.6 2012/10/23 23:16:05 matt Exp $"); | | 36 | __KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.7 2013/06/30 22:02:56 matt Exp $"); |
| 37 | | | 37 | |
| 38 | #include "opt_evbarm_boardtype.h" | | 38 | #include "opt_evbarm_boardtype.h" |
| 39 | #include "opt_broadcom.h" | | 39 | #include "opt_broadcom.h" |
| 40 | #include "opt_kgdb.h" | | 40 | #include "opt_kgdb.h" |
| 41 | #include "com.h" | | 41 | #include "com.h" |
| 42 | #include "pci.h" | | 42 | #include "pci.h" |
| 43 | #include "bcmrng_ccb.h" | | 43 | #include "bcmrng_ccb.h" |
| 44 | | | 44 | |
| 45 | #include <sys/param.h> | | 45 | #include <sys/param.h> |
| 46 | #include <sys/bus.h> | | 46 | #include <sys/bus.h> |
| 47 | #include <sys/atomic.h> | | 47 | #include <sys/atomic.h> |
| 48 | #include <sys/device.h> | | 48 | #include <sys/device.h> |
| 49 | #include <sys/kernel.h> | | 49 | #include <sys/kernel.h> |
| @@ -228,28 +228,28 @@ initarm(void *arg) | | | @@ -228,28 +228,28 @@ initarm(void *arg) |
| 228 | | | 228 | |
| 229 | /* Talk to the user */ | | 229 | /* Talk to the user */ |
| 230 | printf("\nNetBSD/evbarm (" ___STRING(EVBARM_BOARDTYPE) ") booting ...\n"); | | 230 | printf("\nNetBSD/evbarm (" ___STRING(EVBARM_BOARDTYPE) ") booting ...\n"); |
| 231 | | | 231 | |
| 232 | bootargs[0] = '\0'; | | 232 | bootargs[0] = '\0'; |
| 233 | | | 233 | |
| 234 | #if defined(VERBOSE_INIT_ARM) || 1 | | 234 | #if defined(VERBOSE_INIT_ARM) || 1 |
| 235 | printf("initarm: Configuring system"); | | 235 | printf("initarm: Configuring system"); |
| 236 | #ifdef MULTIPROCESSOR | | 236 | #ifdef MULTIPROCESSOR |
| 237 | printf(" (%u cpu%s, hatched %#x)", | | 237 | printf(" (%u cpu%s, hatched %#x)", |
| 238 | arm_cpu_max + 1, arm_cpu_max + 1 ? "s" : "", | | 238 | arm_cpu_max + 1, arm_cpu_max + 1 ? "s" : "", |
| 239 | arm_cpu_hatched); | | 239 | arm_cpu_hatched); |
| 240 | #endif | | 240 | #endif |
| 241 | printf(", CLIDR=%010o CTR=%#x", | | 241 | printf(", CLIDR=%010o CTR=%#x PMUSERSR=%#x", |
| 242 | armreg_clidr_read(), armreg_ctr_read()); | | 242 | armreg_clidr_read(), armreg_ctr_read(), armreg_pmuserenr_read()); |
| 243 | printf("\n"); | | 243 | printf("\n"); |
| 244 | #endif | | 244 | #endif |
| 245 | | | 245 | |
| 246 | psize_t memsize = bcm53xx_memprobe(); | | 246 | psize_t memsize = bcm53xx_memprobe(); |
| 247 | #ifdef MEMSIZE | | 247 | #ifdef MEMSIZE |
| 248 | if ((memsize >> 20) > MEMSIZE) | | 248 | if ((memsize >> 20) > MEMSIZE) |
| 249 | memsize = MEMSIZE*1024*1024; | | 249 | memsize = MEMSIZE*1024*1024; |
| 250 | #endif | | 250 | #endif |
| 251 | const bool bigmem_p = (memsize >> 20) > 256; | | 251 | const bool bigmem_p = (memsize >> 20) > 256; |
| 252 | | | 252 | |
| 253 | arm32_bootmem_init(KERN_VTOPHYS(KERNEL_BASE), memsize, | | 253 | arm32_bootmem_init(KERN_VTOPHYS(KERNEL_BASE), memsize, |
| 254 | (paddr_t)KERNEL_BASE_phys); | | 254 | (paddr_t)KERNEL_BASE_phys); |
| 255 | | | 255 | |