 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_machdep.c,v 1.4.2.1 2017/06/06 16:26:53 snj Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.4.2.2 2017/06/14 04:54:21 snj Exp $ */
 /*-
  * Copyright (c) 2015-2017 Jared 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: fdt_machdep.c,v 1.4.2.1 2017/06/06 16:26:53 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.4.2.2 2017/06/14 04:54:21 snj Exp $");
 #include "opt_machdep.h"
 #include "opt_ddb.h"
 #include "opt_md.h"
 #include "opt_arm_debug.h"
 #include "opt_multiprocessor.h"
 #include "opt_cpuoptions.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 @@ -129,26 +129,54 @@ fdt_printn(u_int n, int base)
 	do {
 		fdt_putchar(*--p);
 	} while (p > buf);
+}
 #define DPRINTF(...)		printf(__VA_ARGS__)
 #define DPRINT(x)		fdt_putstr(x)
 #define DPRINTN(x,b)		fdt_printn((x), (b))
 #else
 #define DPRINTF(...)
 #define DPRINT(x)
 #define DPRINTN(x,b)
 #endif
 /*
  * Get the first physically contiguous region of memory.
  */
 static void
 fdt_get_memory(uint64_t *paddr, uint64_t *psize)
+{
 	const int memory = OF_finddevice("/memory");
 	uint64_t cur_addr, cur_size;
 	int index;
 	/* Assume the first entry is the start of memory */
 	if (fdtbus_get_reg64(memory, 0, paddr, psize) != 0)
 		panic("Cannot determine memory size");
 	DPRINTF("FDT /memory [%d] @ 0x%" PRIx64 " size 0x%" PRIx64 "\n",
 , *paddr, *psize);
 	/* If subsequent entries follow the previous one, append them. */
 	for (index = 1;
 	     fdtbus_get_reg64(memory, index, &cur_addr, &cur_size) == 0;
 	     index++) {
 		DPRINTF("FDT /memory [%d] @ 0x%" PRIx64 " size 0x%" PRIx64 "\n",
 		    index, cur_addr, cur_size);
 		if (*paddr + *psize == cur_addr)
 			*psize += cur_size;
+	}
+}
 u_int
 initarm(void *arg)
+{
 	const struct arm_platform *plat;
 	uint64_t memory_addr, memory_size;
 	psize_t ram_size = 0;
 	/* Load FDT */
 	const uint8_t *fdt_addr_r = (const uint8_t *)uboot_args[2];
 	int error = fdt_check_header(fdt_addr_r);
 	if (error == 0) {
 		error = fdt_move(fdt_addr_r, fdt_data, sizeof(fdt_data));
 		if (error != 0)
 @@ -209,29 +237,27 @@ initarm(void *arg)
 	char mi_bootargs[] = BOOT_ARGS;
 	parse_mi_bootargs(mi_bootargs);
 #endif
 	DPRINTF("KERNEL_BASE=0x%x, "
 		"KERNEL_VM_BASE=0x%x, "
 		"KERNEL_VM_BASE - KERNEL_BASE=0x%x, "
 		"KERNEL_BASE_VOFFSET=0x%x\n",
 		KERNEL_BASE,
 		KERNEL_VM_BASE,
 		KERNEL_VM_BASE - KERNEL_BASE,
 		KERNEL_BASE_VOFFSET);
-	const int memory = OF_finddevice("/memory");
+	fdt_get_memory(&memory_addr, &memory_size);
 	if (fdtbus_get_reg64(memory, 0, &memory_addr, &memory_size) != 0)
 		panic("Cannot determine memory size");
 #if !defined(_LP64)
 	/* Cannot map memory above 4GB */
 	if (memory_addr + memory_size > 0x100000000)
 		memory_size = 0x100000000 - memory_addr;
 #endif
 	ram_size = (bus_size_t)memory_size;
 #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 	const bool mapallmem_p = true;
 #ifndef PMAP_NEED_ALLOC_POOLPAGE
 	if (ram_size > KERNEL_VM_BASE - KERNEL_BASE) {