Commit 4ef7b373 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Grant Likely
Browse files

of/flattree: Don't assume HAVE_LMB 



We don't always have lmb available, so make arches provide an
early_init_dt_alloc_memory_arch() to handle the allocation of
memory in the fdt code.

When we don't have lmb.h included, we need asm/page.h for __va.

Signed-off-by: default avatarJeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
parent 9dfbf207

arch/microblaze/kernel/prom.c

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) 
	lmb_add(base, size);

}



u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align)

{

	return lmb_alloc(size, align);

}



#ifdef CONFIG_EARLY_PRINTK

/* MS this is Microblaze specifig function */

static int __init early_init_dt_scan_serial(unsigned long node,

arch/powerpc/kernel/prom.c

+5 −0
Original line number Diff line number Diff line
@@ -510,6 +510,11 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) 
	memstart_addr = min((u64)memstart_addr, base);

}



u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align)

{

	return lmb_alloc(size, align);

}



#ifdef CONFIG_BLK_DEV_INITRD

void __init early_init_dt_setup_initrd_arch(unsigned long start,

		unsigned long end)

drivers/of/fdt.c

+6 −3
Original line number Diff line number Diff line
@@ -10,16 +10,18 @@ 
 */



#include <linux/kernel.h>

#include <linux/lmb.h>

#include <linux/initrd.h>

#include <linux/of.h>

#include <linux/of_fdt.h>



#include <linux/string.h>

#include <linux/errno.h>



#ifdef CONFIG_PPC

#include <asm/machdep.h>

#endif /* CONFIG_PPC */



#include <asm/page.h>



int __initdata dt_root_addr_cells;

int __initdata dt_root_size_cells;
@@ -560,7 +562,8 @@ void __init unflatten_device_tree(void) 
	pr_debug("  size is %lx, allocating...\n", size);



	/* Allocate memory for the expanded device tree */

	mem = lmb_alloc(size + 4, __alignof__(struct device_node));

	mem = early_init_dt_alloc_memory_arch(size + 4,

			__alignof__(struct device_node));

	mem = (unsigned long) __va(mem);



	((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);

include/linux/of_fdt.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node); 
extern int early_init_dt_scan_memory(unsigned long node, const char *uname,

				     int depth, void *data);

extern void early_init_dt_add_memory_arch(u64 base, u64 size);

extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align);

extern u64 dt_mem_next_cell(int s, __be32 **cellp);



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE