hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Jeremy Kerr 2010-02-14 07:13:47 -07:00 committed by Grant Likely
parent 9dfbf20780
commit 4ef7b373df
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/microblaze/kernel/prom.c
View File

@ -55,6 +55,11 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
lmb_add(base, 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 #ifdef CONFIG_EARLY_PRINTK
/* MS this is Microblaze specifig function */ /* MS this is Microblaze specifig function */
static int __init early_init_dt_scan_serial(unsigned long node, static int __init early_init_dt_scan_serial(unsigned long node,

5
arch/powerpc/kernel/prom.c
View File

@ -510,6 +510,11 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
memstart_addr = min((u64)memstart_addr, base); 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 #ifdef CONFIG_BLK_DEV_INITRD
void __init early_init_dt_setup_initrd_arch(unsigned long start, void __init early_init_dt_setup_initrd_arch(unsigned long start,
unsigned long end) unsigned long end)

9
drivers/of/fdt.c
View File

@ -10,16 +10,18 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/lmb.h>
#include <linux/initrd.h> #include <linux/initrd.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/string.h>
#include <linux/errno.h>
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
#include <asm/machdep.h> #include <asm/machdep.h>
#endif /* CONFIG_PPC */ #endif /* CONFIG_PPC */
#include <asm/page.h>
int __initdata dt_root_addr_cells; int __initdata dt_root_addr_cells;
int __initdata dt_root_size_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); pr_debug(" size is %lx, allocating...\n", size);
/* Allocate memory for the expanded device tree */ /* 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); mem = (unsigned long) __va(mem);
((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef); ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);

1
include/linux/of_fdt.h
View File

@ -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, extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
int depth, void *data); int depth, void *data);
extern void early_init_dt_add_memory_arch(u64 base, u64 size); 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); extern u64 dt_mem_next_cell(int s, __be32 **cellp);
/* /*