Commit 270522a0 authored Feb 16, 2016 by Ard Biesheuvel Committed by Catalin Marinas Feb 18, 2016

of/fdt: make memblock minimum physical address arch configurable



By default, early_init_dt_add_memory_arch() ignores memory below
the base of the kernel image since it won't be addressable via the
linear mapping. However, this is not appropriate anymore once we
decouple the kernel text mapping from the linear mapping, so archs
may want to drop the low limit entirely. So allow the minimum to be
overridden by setting MIN_MEMBLOCK_ADDR.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent e950631e

drivers/of/fdt.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -976,13 +976,16 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
		}

		#ifdef CONFIG_HAVE_MEMBLOCK
		#ifndef MIN_MEMBLOCK_ADDR
		#define MIN_MEMBLOCK_ADDR __pa(PAGE_OFFSET)
		#endif
		#ifndef MAX_MEMBLOCK_ADDR
		#define MAX_MEMBLOCK_ADDR ((phys_addr_t)~0)
		#endif

		void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
		{
		const u64 phys_offset = __pa(PAGE_OFFSET);
		const u64 phys_offset = MIN_MEMBLOCK_ADDR;

		if (!PAGE_ALIGNED(base)) {
		if (size < PAGE_SIZE - (base & ~PAGE_MASK)) {

Admin message