of/fdt: move memreserve and dtb memory reservations into core

Move the /memreserve/ processing and dtb memory reservations into
early_init_fdt_scan_reserved_mem. This converts arm, arm64, and powerpc
as they are the only users of early_init_fdt_scan_reserved_mem.

memblock_reserve is safe to call on the same region twice, so the
reservation check for the dtb in powerpc 32-bit reservations is safe to
remove.

Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>

1 files changed, 0 insertions, 21 deletions

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 51d5352e6ad5..091d428d64ac 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -126,8 +126,6 @@ static void arm64_memory_present(void)
 
 void __init arm64_memblock_init(void)
 {
-        u64 *reserve_map, base, size;
-
         /* Register the kernel text, kernel data and initrd with memblock */
         memblock_reserve(__pa(_text), _end - _text);
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -142,25 +140,6 @@ void __init arm64_memblock_init(void)
         memblock_reserve(__pa(swapper_pg_dir), SWAPPER_DIR_SIZE);
         memblock_reserve(__pa(idmap_pg_dir), IDMAP_DIR_SIZE);
 
-        /* Reserve the dtb region */
-        memblock_reserve(virt_to_phys(initial_boot_params),
-                         be32_to_cpu(initial_boot_params->totalsize));
-
-        /*
-         * Process the reserve map.  This will probably overlap the initrd
-         * and dtb locations which are already reserved, but overlapping
-         * doesn't hurt anything
-         */
-        reserve_map = ((void*)initial_boot_params) +
-                        be32_to_cpu(initial_boot_params->off_mem_rsvmap);
-        while (1) {
-                base = be64_to_cpup(reserve_map++);
-                size = be64_to_cpup(reserve_map++);
-                if (!size)
-                        break;
-                memblock_reserve(base, size);
-        }
-
         early_init_fdt_scan_reserved_mem();
         dma_contiguous_reserve(0);