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

Commit 101646a2 authored by Rob Herring's avatar Rob Herring Committed by Michal Simek
Browse files

microblaze: switch to NO_BOOTMEM 



Microblaze doesn't set CONFIG_NO_BOOTMEM and so memblock_virt_alloc()
doesn't work for CONFIG_HAVE_MEMBLOCK && !CONFIG_NO_BOOTMEM.

Similar change was already done by others architectures
"ARM: mm: Remove bootmem code and switch to NO_BOOTMEM"
(sha1: 84f452b1)
or
"openrisc: Consolidate setup to use memblock instead of bootmem"
(sha1: 266c7fad)
or
"parisc: Drop bootmem and switch to memblock"
(sha1: 4fe9e1d9)
or
"powerpc: Remove bootmem allocator"
(sha1: 10239733)
or
"s390/mm: Convert bootmem to memblock"
(sha1: 50be6345)
or
"sparc64: Convert over to NO_BOOTMEM."
(sha1: 625d693e)
or
"xtensa: drop sysmem and switch to memblock"
(sha1: 0e46c111)

Issue was introduced by:
"of/fdt: use memblock_virt_alloc for early alloc"
(sha1: 0fa1c579)

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Tested-by: default avatarAlvaro Gamez Machado <alvaro.gamez@hazent.com>
Tested-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent cd4dfee6

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config MICROBLAZE 
	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select NO_BOOTMEM

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_OPROFILE

arch/microblaze/mm/init.c

+6 −50
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ int mem_init_done; 
#ifndef CONFIG_MMU

unsigned int __page_offset;

EXPORT_SYMBOL(__page_offset);



#else

static int init_bootmem_done;

#endif /* CONFIG_MMU */



char *klimit = _end;
@@ -117,7 +114,6 @@ static void __init paging_init(void) 


void __init setup_memory(void)

{

	unsigned long map_size;

	struct memblock_region *reg;



#ifndef CONFIG_MMU
@@ -174,17 +170,6 @@ void __init setup_memory(void) 
	pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn);

	pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn);



	/*

	 * Find an area to use for the bootmem bitmap.

	 * We look for the first area which is at least

	 * 128kB in length (128kB is enough for a bitmap

	 * for 4GB of memory, using 4kB pages), plus 1 page

	 * (in case the address isn't page-aligned).

	 */

	map_size = init_bootmem_node(NODE_DATA(0),

		PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn);

	memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size);



	/* Add active regions with valid PFNs */

	for_each_memblock(memory, reg) {

		unsigned long start_pfn, end_pfn;
@@ -196,32 +181,9 @@ void __init setup_memory(void) 
				  &memblock.memory, 0);

	}



	/* free bootmem is whole main memory */

	free_bootmem_with_active_regions(0, max_low_pfn);



	/* reserve allocate blocks */

	for_each_memblock(reserved, reg) {

		unsigned long top = reg->base + reg->size - 1;



		pr_debug("reserved - 0x%08x-0x%08x, %lx, %lx\n",

			 (u32) reg->base, (u32) reg->size, top,

						memory_start + lowmem_size - 1);



		if (top <= (memory_start + lowmem_size - 1)) {

			reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);

		} else if (reg->base < (memory_start + lowmem_size - 1)) {

			unsigned long trunc_size = memory_start + lowmem_size -

								reg->base;

			reserve_bootmem(reg->base, trunc_size, BOOTMEM_DEFAULT);

		}

	}



	/* XXX need to clip this if using highmem? */

	sparse_memory_present_with_active_regions(0);



#ifdef CONFIG_MMU

	init_bootmem_done = 1;

#endif

	paging_init();

}
@@ -398,19 +360,13 @@ asmlinkage void __init mmu_init(void) 
/* This is only called until mem_init is done. */

void __init *early_get_page(void)

{

	void *p;

	if (init_bootmem_done) {

		p = alloc_bootmem_pages(PAGE_SIZE);

	} else {

	/*

	 * Mem start + kernel_tlb -> here is limit

	 * because of mem mapping from head.S

	 */

		p = __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE,

	return __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE,

				memory_start + kernel_tlb));

}

	return p;

}



#endif /* CONFIG_MMU */