Commit 8f73d4b7 authored Aug 20, 2014 by Geert Uytterhoeven Committed by Grant Likely Sep 08, 2014

of: Fix memory block alignment in early_init_dt_add_memory_arch()



If a memory block is not aligned to PAGE_SIZE, its base address must be
rounded up, not down, and its size must be reduced.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Grant Likely <grant.likely@linaro.org>

parent 7dbe5849

drivers/of/fdt.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -928,7 +928,11 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
		void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
		{
		const u64 phys_offset = __pa(PAGE_OFFSET);
		base &= PAGE_MASK;

		if (!PAGE_ALIGNED(base)) {
		size -= PAGE_SIZE - (base & ~PAGE_MASK);
		base = PAGE_ALIGN(base);
		}
		size &= PAGE_MASK;

		if (base > MAX_PHYS_ADDR) {