Commit e53b50c0 authored Feb 22, 2016 by Vinayak Menon Committed by Rob Herring Mar 03, 2016

of: alloc anywhere from memblock if range not specified



early_init_dt_alloc_reserved_memory_arch passes end as 0 to
__memblock_alloc_base, when limits are not specified. But
__memblock_alloc_base takes end value of 0 as MEMBLOCK_ALLOC_ACCESSIBLE
and limits the end to memblock.current_limit. This results in regions
never being placed in HIGHMEM area, for e.g. CMA.
Let __memblock_alloc_base allocate from anywhere in memory if limits are
not specified.

Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>

parent 6b22b3d1

drivers/of/of_reserved_mem.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -32,11 +32,13 @@ int __init __weak early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
		phys_addr_t align, phys_addr_t start, phys_addr_t end, bool nomap,
		phys_addr_t *res_base)
		{
		phys_addr_t base;
		/*
		* We use __memblock_alloc_base() because memblock_alloc_base()
		* panic()s on allocation failure.
		*/
		phys_addr_t base = __memblock_alloc_base(size, align, end);
		end = !end ? MEMBLOCK_ALLOC_ANYWHERE : end;
		base = __memblock_alloc_base(size, align, end);
		if (!base)
		return -ENOMEM;