 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_machdep.c,v 1.32 2018/08/05 14:02:36 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.33 2018/08/23 22:34:03 jmcneill 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.32 2018/08/05 14:02:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.33 2018/08/23 22:34:03 jmcneill Exp $");
 #include "opt_machdep.h"
 #include "opt_bootconfig.h"
 #include "opt_ddb.h"
 #include "opt_md.h"
 #include "opt_arm_debug.h"
 #include "opt_multiprocessor.h"
 #include "opt_cpuoptions.h"
 #include "ukbd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -203,39 +203,45 @@ fdt_add_reserved_memory_range(uint64_t a
 	int error = extent_free(fdt_memory_ext, start,
 	     end - start, EX_NOWAIT);
 	if (error != 0)
 		printf("MEM ERROR: res %" PRIx64 "-%" PRIx64 " failed: %d\n",
 		    start, end, error);
 	else
 		VPRINTF("MEM: res %" PRIx64 "-%" PRIx64 "\n", start, end);
+}
 /*
  * Exclude memory ranges from memory config from the device tree
  */
 static void
-fdt_add_reserved_memory(uint64_t max_addr)
+fdt_add_reserved_memory(uint64_t min_addr, uint64_t max_addr)
+{
 	uint64_t addr, size;
 	int index, error;
 	const int num = fdt_num_mem_rsv(fdtbus_get_data());
 	for (index = 0; index <= num; index++) {
 		error = fdt_get_mem_rsv(fdtbus_get_data(), index,
 		    &addr, &size);
 		if (error != 0 || size == 0)
 			continue;
 		if (addr + size <= min_addr)
 			continue;
 		if (addr >= max_addr)
 			continue;
 		if (addr < min_addr) {
 			size -= (min_addr - addr);
 			addr = min_addr;
+		}
 		if (addr + size > max_addr)
 			size = max_addr - addr;
 		fdt_add_reserved_memory_range(addr, size);
+	}
+}
 /*
  * Define usable memory regions.
  */
 static void
 fdt_build_bootconfig(uint64_t mem_start, uint64_t mem_end)
+{
 	const int memory = OF_finddevice("/memory");
 @@ -253,27 +259,27 @@ fdt_build_bootconfig(uint64_t mem_start,
 		if (addr >= mem_end || size == 0)
 			continue;
 		if (addr + size > mem_end)
 			size = mem_end - addr;
 		error = extent_alloc_region(fdt_memory_ext, addr, size,
 		    EX_NOWAIT);
 		if (error != 0)
 			printf("MEM ERROR: add %" PRIx64 "-%" PRIx64 " failed: %d\n",
 			    addr, addr + size, error);
 		VPRINTF("MEM: add %" PRIx64 "-%" PRIx64 "\n", addr, addr + size);
+	}
-	fdt_add_reserved_memory(mem_end);
+	fdt_add_reserved_memory(mem_start, mem_end);
 	const uint64_t initrd_size = initrd_end - initrd_start;
 	if (initrd_size > 0)
 		fdt_add_reserved_memory_range(initrd_start, initrd_size);
 	VPRINTF("Usable memory:\n");
 	bc->dramblocks = 0;
 	LIST_FOREACH(er, &fdt_memory_ext->ex_regions, er_link) {
 		VPRINTF("  %lx - %lx\n", er->er_start, er->er_end);
 		bc->dram[bc->dramblocks].address = er->er_start;
 		bc->dram[bc->dramblocks].pages =
 		    (er->er_end - er->er_start) / PAGE_SIZE;
 		bc->dramblocks++;