From: Vinayak Menon Date: Mon, 22 Feb 2016 13:45:44 +0000 (+0530) Subject: of: alloc anywhere from memblock if range not specified X-Git-Tag: v3.16.35~152 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30e88eae818cbd31aedaf32aa3d11267a6f01287;p=thirdparty%2Fkernel%2Fstable.git of: alloc anywhere from memblock if range not specified commit e53b50c0cbe392c946807abf7d07615a3c588642 upstream. 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 Signed-off-by: Vinayak Menon Signed-off-by: Rob Herring Signed-off-by: Ben Hutchings --- diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 86f284f0960e2..848f32c15de8f 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -31,11 +31,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;