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

Commit ac21fc2d authored by Rob Herring's avatar Rob Herring Committed by Rich Felker
Browse files

sh: switch to NO_BOOTMEM 



Commit 0fa1c579 ("of/fdt: use memblock_virt_alloc for early alloc")
inadvertently switched the DT unflattening allocations from memblock to
bootmem which doesn't work because the unflattening happens before
bootmem is initialized. Swapping the order of bootmem init and
unflattening could also fix this, but removing bootmem is desired. So
enable NO_BOOTMEM on SH like other architectures have done.

Fixes: 0fa1c579 ("of/fdt: use memblock_virt_alloc for early alloc")
Reported-by: default avatarRich Felker <dalias@libc.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent b9826a49

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config SUPERH 
	select HAVE_IDE if HAS_IOPORT_MAP

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select NO_BOOTMEM

	select ARCH_DISCARD_MEMBLOCK

	select HAVE_OPROFILE

	select HAVE_GENERIC_DMA_COHERENT

arch/sh/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/ioport.h>

#include <linux/init.h>

#include <linux/initrd.h>

#include <linux/bootmem.h>

#include <linux/console.h>

#include <linux/root_dev.h>

#include <linux/utsname.h>

arch/sh/mm/init.c

+6 −62
Original line number Diff line number Diff line
@@ -211,59 +211,15 @@ void __init allocate_pgdat(unsigned int nid) 


	NODE_DATA(nid) = __va(phys);

	memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));



	NODE_DATA(nid)->bdata = &bootmem_node_data[nid];

#endif



	NODE_DATA(nid)->node_start_pfn = start_pfn;

	NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;

}



static void __init bootmem_init_one_node(unsigned int nid)

{

	unsigned long total_pages, paddr;

	unsigned long end_pfn;

	struct pglist_data *p;



	p = NODE_DATA(nid);



	/* Nothing to do.. */

	if (!p->node_spanned_pages)

		return;



	end_pfn = pgdat_end_pfn(p);



	total_pages = bootmem_bootmap_pages(p->node_spanned_pages);



	paddr = memblock_alloc(total_pages << PAGE_SHIFT, PAGE_SIZE);

	if (!paddr)

		panic("Can't allocate bootmap for nid[%d]\n", nid);



	init_bootmem_node(p, paddr >> PAGE_SHIFT, p->node_start_pfn, end_pfn);



	free_bootmem_with_active_regions(nid, end_pfn);



	/*

	 * XXX Handle initial reservations for the system memory node

	 * only for the moment, we'll refactor this later for handling

	 * reservations in other nodes.

	 */

	if (nid == 0) {

		struct memblock_region *reg;



		/* Reserve the sections we're already using. */

		for_each_memblock(reserved, reg) {

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

		}

	}



	sparse_memory_present_with_active_regions(nid);

}



static void __init do_init_bootmem(void)

{

	struct memblock_region *reg;

	int i;



	/* Add active regions with valid PFNs. */

	for_each_memblock(memory, reg) {
@@ -279,9 +235,12 @@ static void __init do_init_bootmem(void) 


	plat_mem_setup();



	for_each_online_node(i)

		bootmem_init_one_node(i);

	for_each_memblock(memory, reg) {

		int nid = memblock_get_region_node(reg);



		memory_present(nid, memblock_region_memory_base_pfn(reg),

			memblock_region_memory_end_pfn(reg));

	}

	sparse_init();

}
@@ -322,7 +281,6 @@ void __init paging_init(void) 
{

	unsigned long max_zone_pfns[MAX_NR_ZONES];

	unsigned long vaddr, end;

	int nid;



	sh_mv.mv_mem_init();
@@ -377,21 +335,7 @@ void __init paging_init(void) 
	kmap_coherent_init();



	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));



	for_each_online_node(nid) {

		pg_data_t *pgdat = NODE_DATA(nid);

		unsigned long low, start_pfn;



		start_pfn = pgdat->bdata->node_min_pfn;

		low = pgdat->bdata->node_low_pfn;



		if (max_zone_pfns[ZONE_NORMAL] < low)

			max_zone_pfns[ZONE_NORMAL] = low;



		printk("Node %u: start_pfn = 0x%lx, low = 0x%lx\n",

		       nid, start_pfn, low);

	}



	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

	free_area_init_nodes(max_zone_pfns);

}

arch/sh/mm/numa.c

+0 −19
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * for more details.

 */

#include <linux/module.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/mm.h>

#include <linux/numa.h>
@@ -26,9 +25,7 @@ EXPORT_SYMBOL_GPL(node_data); 
 */

void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)

{

	unsigned long bootmap_pages;

	unsigned long start_pfn, end_pfn;

	unsigned long bootmem_paddr;



	/* Don't allow bogus node assignment */

	BUG_ON(nid >= MAX_NUMNODES || nid <= 0);
@@ -48,25 +45,9 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) 
					     SMP_CACHE_BYTES, end));

	memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));



	NODE_DATA(nid)->bdata = &bootmem_node_data[nid];

	NODE_DATA(nid)->node_start_pfn = start_pfn;

	NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;



	/* Node-local bootmap */

	bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn);

	bootmem_paddr = memblock_alloc_base(bootmap_pages << PAGE_SHIFT,

				       PAGE_SIZE, end);

	init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT,

			  start_pfn, end_pfn);



	free_bootmem_with_active_regions(nid, end_pfn);



	/* Reserve the pgdat and bootmap space with the bootmem allocator */

	reserve_bootmem_node(NODE_DATA(nid), start_pfn << PAGE_SHIFT,

			     sizeof(struct pglist_data), BOOTMEM_DEFAULT);

	reserve_bootmem_node(NODE_DATA(nid), bootmem_paddr,

			     bootmap_pages << PAGE_SHIFT, BOOTMEM_DEFAULT);



	/* It's up */

	node_set_online(nid);