Unverified Commit cbd34f4b authored Nov 18, 2020 by Atish Patra Committed by Palmer Dabbelt Jan 14, 2021

riscv: Separate memory init from paging init



Currently, we perform some memory init functions in paging init. But,
that will be an issue for NUMA support where DT needs to be flattened
before numa initialization and memblock_present can only be called
after numa initialization.

Move memory initialization related functions to a separate function.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Greentime Hu <greentime.hu@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>

parent ae3c107c

arch/riscv/include/asm/pgtable.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -469,6 +469,7 @@ extern void *dtb_early_va;
		extern uintptr_t dtb_early_pa;
		void setup_bootmem(void);
		void paging_init(void);
		void misc_mem_init(void);

		#define FIRST_USER_ADDRESS 0

arch/riscv/kernel/setup.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,7 @@ void __init setup_arch(char **cmdline_p)
		else
		pr_err("No DTB found in kernel mappings\n");
		#endif
		misc_mem_init();

		sbi_init();

arch/riscv/mm/init.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -649,8 +649,12 @@ void mark_rodata_ro(void)
		void __init paging_init(void)
		{
		setup_vm_final();
		sparse_init();
		setup_zero_page();
		}

		void __init misc_mem_init(void)
		{
		sparse_init();
		zone_sizes_init();
		}