Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b9cb846 authored by Rob Herring's avatar Rob Herring Committed by Joonwoo Park
Browse files

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: default avatarRob Herring <robh@kernel.org>
Tested-by: default avatarMichal 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: default avatarGrant Likely <grant.likely@linaro.org>
Tested-by: default avatarStephen Chivers <schivers@csc.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Git-commit: d1552ce449eb0a8d2f0bd6599da3a8a3d7f77a84
[joonwoop@codeaurora.org: fixed trivial merge conflict.]
Signed-off-by: default avatarJoonwoo Park <joonwoop@codeaurora.org>
parent 917e2cf8

arch/arm/include/asm/prom.h

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#ifdef CONFIG_OF



extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);

extern void arm_dt_memblock_reserve(void);

extern void __init arm_dt_init_cpu_maps(void);



#else /* CONFIG_OF */
@@ -26,7 +25,6 @@ static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys) 
	return NULL;

}



static inline void arm_dt_memblock_reserve(void) { }

static inline void arm_dt_init_cpu_maps(void) { }



#endif /* CONFIG_OF */

arch/arm/kernel/devtree.c

+0 −27
Original line number Diff line number Diff line
@@ -31,33 +31,6 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) 
	return alloc_bootmem_align(size, align);

}



void __init arm_dt_memblock_reserve(void)

{

	u64 *reserve_map, base, size;



	if (!initial_boot_params)

		return;



	/* 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 overlaping

	 * 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);

	}

}



/*

 * arm_dt_init_cpu_maps - Function retrieves cpu nodes from the device tree

 * and builds the cpu logical map array containing MPIDR values related to

arch/arm/mm/init.c

+0 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ void __init arm_memblock_init(const struct machine_desc *mdesc) 
#endif



	arm_mm_memblock_reserve();

	arm_dt_memblock_reserve();



	/* reserve any platform specific memblock areas */

	if (mdesc->reserve)

arch/arm64/mm/init.c

+0 −21
Original line number Diff line number Diff line
@@ -132,8 +132,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
@@ -153,25 +151,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);

arch/powerpc/kernel/prom.c

+2 −15
Original line number Diff line number Diff line
@@ -563,10 +563,8 @@ static void __init early_reserve_mem(void) 
	reserve_map = (u64 *)(((unsigned long)initial_boot_params) +

					initial_boot_params->off_mem_rsvmap);



	/* before we do anything, lets reserve the dt blob */

	self_base = __pa((unsigned long)initial_boot_params);

	self_size = initial_boot_params->totalsize;

	memblock_reserve(self_base, self_size);

	/* Look for the new "reserved-regions" property in the DT */

	early_reserve_mem_dt();



#ifdef CONFIG_BLK_DEV_INITRD

	/* then reserve the initrd, if any */
@@ -590,23 +588,12 @@ static void __init early_reserve_mem(void) 
			size_32 = *(reserve_map_32++);

			if (size_32 == 0)

				break;

			/* skip if the reservation is for the blob */

			if (base_32 == self_base && size_32 == self_size)

				continue;

			DBG("reserving: %x -> %x\n", base_32, size_32);

			memblock_reserve(base_32, size_32);

		}

		return;

	}

#endif

	while (1) {

		base = *(reserve_map++);

		size = *(reserve_map++);

		if (size == 0)

			break;

		DBG("reserving: %llx -> %llx\n", base, size);

		memblock_reserve(base, size);

	}

}



void __init early_init_devtree(void *params)