Messages in this thread Patch in this message | | | From | Tang Chen <> | Subject | [PATCH v2 3/9] x86, dma: Support allocate memory from bottom upwards in dma_contiguous_reserve(). | Date | Wed, 11 Sep 2013 18:07:31 +0800 |
| |
During early boot, if the bottom up mode is set, just try allocating bottom up from the end of kernel image, and if that fails, do normal top down allocation.
So in function dma_contiguous_reserve(), we add the above logic.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> Reviewed-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> --- drivers/base/dma-contiguous.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 6c9cdaa..3b4e031 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -260,17 +260,28 @@ int __init dma_declare_contiguous(struct device *dev, phys_addr_t size, goto err; } } else { + phys_addr_t addr; + + if (memblock_direction_bottom_up()) { + addr = memblock_alloc_bottom_up( + MEMBLOCK_ALLOC_ACCESSIBLE, + limit, size, alignment); + if (addr) + goto success; + } + /* * Use __memblock_alloc_base() since * memblock_alloc_base() panic()s. */ - phys_addr_t addr = __memblock_alloc_base(size, alignment, limit); + addr = __memblock_alloc_base(size, alignment, limit); if (!addr) { base = -ENOMEM; goto err; - } else { - base = addr; } + +success: + base = addr; } /* -- 1.7.1
| |