On Tue, Mar 13, 2012 at 3:18 AM, David Miller <davem@xxxxxxxxxxxxx> wrote: > I'm only saying that you should design your stuff such that an > architecture with such features could easily hook into it using this > kind facility. How about this? diff --git a/include/linux/memblock.h b/include/linux/memblock.h index a6bb102..7335cf7 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -59,6 +59,8 @@ int memblock_add(phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_free(phys_addr_t base, phys_addr_t size); int memblock_reserve(phys_addr_t base, phys_addr_t size); +phys_addr_t memblock_reserve_by_name(const char *name, + phys_addr_t size, phys_addr_t align); #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, @@ -246,6 +248,11 @@ static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) return 0; } +phys_addr_t memblock_reserve_by_name(const char *name, + phys_addr_t size, phys_addr_t align) +{ + return 0; +} #endif /* CONFIG_HAVE_MEMBLOCK */ #endif /* __KERNEL__ */ diff --git a/mm/memblock.c b/mm/memblock.c index 99f2855..2ab4559 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -519,6 +519,38 @@ int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) return memblock_add_region(_rgn, base, size, MAX_NUMNODES); } +#define RESERVE_SEARCH_END 0xfe000000 +#define RESERVE_SEARCH_JUMP (16*1024*1024) + +/** + * Find a well-defined location for the given memory area and reserve it. + * The generic version just scans through memory looking for an available + * area, and ignores the name. An arch-specific version could request a + * named area from the bootloader (eg. prom_retain()) in the hopes of + * getting a region guaranteed not to be messed up by the bootloader. + */ +phys_addr_t __init_memblock memblock_reserve_by_name(const char *name, + phys_addr_t size, phys_addr_t align) +{ + unsigned long where; + + for (where = RESERVE_SEARCH_END - align; + where >= RESERVE_SEARCH_JUMP; + where -= RESERVE_SEARCH_JUMP) { + where &= ~(roundup_pow_of_two(align) - 1); + if (memblock_find_in_range(where, where + size, + size, align) != 0) { + memblock_reserve(where, size); + printk(KERN_INFO "memblock(%s): " + "reserved %lu @ 0x%08lx\n", + name, (unsigned long)size, + (unsigned long)where); + return where; + } + } + return 0; +} + /** * __next_free_mem_range - next function for for_each_free_mem_range() * @idx: pointer to u64 loop variable -- 1.7.7.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>