diff mbox series

riscv: XIP: fix build for rv32

Message ID 20210327194800.23622-1-vitaly.wool@konsulko.com (mailing list archive)
State New, archived
Headers show
Series riscv: XIP: fix build for rv32 | expand

Commit Message

Vitaly Wool March 27, 2021, 7:48 p.m. UTC 
32-bit RISC-V uses folded page tables by default, so we should
follow that in the XIP-specific part of init too.

Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.com>
Reported-by: kernel test robot <lkp@intel.com>
---
 arch/riscv/mm/init.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index fe583c2aa5a2..8c0eeaae67a3 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -481,6 +481,7 @@  asmlinkage void __init setup_vm(uintptr_t dtb_pa)
 #endif
 
 #ifdef CONFIG_XIP_KERNEL
+#ifndef __PAGETABLE_PMD_FOLDED
 	create_pgd_mapping(trampoline_pg_dir, XIP_VIRT_ADDR_START,
 			   (uintptr_t)xip_pmd, PGDIR_SIZE, PAGE_TABLE);
 	for (va = XIP_VIRT_ADDR_START;
@@ -493,7 +494,16 @@  asmlinkage void __init setup_vm(uintptr_t dtb_pa)
 
 	create_pgd_mapping(early_pg_dir, XIP_VIRT_ADDR_START,
 			   (uintptr_t)xip_pmd, PGDIR_SIZE, PAGE_TABLE);
-#endif
+#else
+	for (va = XIP_VIRT_ADDR_START;
+	     va < XIP_VIRT_ADDR_START + xiprom_sz;
+	     va += map_size) {
+		create_pgd_mapping(early_pg_dir, va,
+				   xiprom + (va - XIP_VIRT_ADDR_START),
+				   map_size, PAGE_KERNEL_EXEC);
+	}
+#endif /* __PAGETABLE_PMD_FOLDED */
+#endif /* CONFIG_XIP_KERNEL */
 
 	/*
 	 * Setup early PGD covering entire kernel which will allows