Call early_fdt_scan_reserved_mem() in place of early_init_fdt_scan_reserved_mem() to carry out the first stage of the reserved memory processing only. The early_fdt_scan_reserved_mem() function is used to scan through the DT and mark all the reserved memory regions as reserved or nomap as needed, as well as allocate the memory required by the dynamically-placed reserved memory regions. The second stage of the reserved memory processing is done by fdt_init_reserved_mem(). This function is used to store the information of the statically-placed reserved memory nodes in the reserved_mem array as well as call the region specific initialization function on all the stored reserved memory regions. The call to fdt_init_reserved_mem() is placed after setup_arch_memory() in preparation for the dynamic allocation of the reserved_mem array using memblock. This is because memblock allocated memory is not writable until after the page tables have been setup on the arc architecture. Signed-off-by: Oreoluwa Babatunde <quic_obabatun@xxxxxxxxxxx> --- arch/arc/kernel/setup.c | 3 +++ arch/arc/mm/init.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index d08a5092c2b4..44f00e8e16cd 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c @@ -15,6 +15,7 @@ #include <linux/cpu.h> #include <linux/of_clk.h> #include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> #include <linux/of.h> #include <linux/cache.h> #include <uapi/linux/mount.h> @@ -523,6 +524,8 @@ void __init setup_arch(char **cmdline_p) setup_processor(); setup_arch_memory(); + fdt_init_reserved_mem(); + /* copy flat DT out of .init and then unflatten it */ unflatten_and_copy_device_tree(); diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index 6a71b23f1383..8cd86259d9ae 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -118,7 +118,7 @@ void __init setup_arch_memory(void) #endif early_init_fdt_reserve_self(); - early_init_fdt_scan_reserved_mem(); + early_fdt_scan_reserved_mem(); memblock_dump_all(); -- 2.17.1
