p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Vinayak Menon 2016-02-22 19:15:44 +05:30 committed by Rob Herring
parent 6b22b3d161
commit e53b50c0cb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/of/of_reserved_mem.c
View File

@ -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 align, phys_addr_t start, phys_addr_t end, bool nomap,
phys_addr_t *res_base) phys_addr_t *res_base)
{ {
phys_addr_t base;
/* /*
* We use __memblock_alloc_base() because memblock_alloc_base() * We use __memblock_alloc_base() because memblock_alloc_base()
* panic()s on allocation failure. * 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) if (!base)
return -ENOMEM; return -ENOMEM;