Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bfc2862 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

memblock: introduce memblock_alloc_range() 



This introduces memblock_alloc_range() which allocates memblock from the
specified range of physical address.  I would like to use this function
to specify the location of CMA.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Don Dutile <ddutile@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36746436

include/linux/memblock.h

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ static inline bool memblock_bottom_up(void) { return false; } 
#define MEMBLOCK_ALLOC_ANYWHERE	(~(phys_addr_t)0)

#define MEMBLOCK_ALLOC_ACCESSIBLE	0



phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,

					phys_addr_t start, phys_addr_t end);

phys_addr_t memblock_alloc_base(phys_addr_t size, phys_addr_t align,

				phys_addr_t max_addr);

phys_addr_t __memblock_alloc_base(phys_addr_t size, phys_addr_t align,

mm/memblock.c

+17 −4
Original line number Diff line number Diff line
@@ -1033,22 +1033,35 @@ int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size, 
}

#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */



static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,

					phys_addr_t align, phys_addr_t max_addr,

					int nid)

static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,

					phys_addr_t align, phys_addr_t start,

					phys_addr_t end, int nid)

{

	phys_addr_t found;



	if (!align)

		align = SMP_CACHE_BYTES;



	found = memblock_find_in_range_node(size, align, 0, max_addr, nid);

	found = memblock_find_in_range_node(size, align, start, end, nid);

	if (found && !memblock_reserve(found, size))

		return found;



	return 0;

}



phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,

					phys_addr_t start, phys_addr_t end)

{

	return memblock_alloc_range_nid(size, align, start, end, NUMA_NO_NODE);

}



static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,

					phys_addr_t align, phys_addr_t max_addr,

					int nid)

{

	return memblock_alloc_range_nid(size, align, 0, max_addr, nid);

}



phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int nid)

{

	return memblock_alloc_base_nid(size, align, MEMBLOCK_ALLOC_ACCESSIBLE, nid);