riscv: change XIP's kernel_map.size to be size of the entire kernel

commit 57d76bc51fd80824bcc0c84a5b5ec944f1b51edd upstream.

With XIP kernel, kernel_map.size is set to be only the size of data part of
the kernel. This is inconsistent with "normal" kernel, who sets it to be
the size of the entire kernel.

More importantly, XIP kernel fails to boot if CONFIG_DEBUG_VIRTUAL is
enabled, because there are checks on virtual addresses with the assumption
that kernel_map.size is the size of the entire kernel (these checks are in
arch/riscv/mm/physaddr.c).

Change XIP's kernel_map.size to be the size of the entire kernel.

Signed-off-by: Nam Cao <namcao@linutronix.de>
Cc: <stable@vger.kernel.org> # v6.1+
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20240508191917.2892064-1-namcao@linutronix.de
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 7e25606f858aa3a5654f2f165d62c083097f5464..c5c66f53971af04f6f13210e503bb1e9b18266c5 100644 (file)
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -931,7 +931,7 @@ static void __init create_kernel_page_table(pgd_t *pgdir,
                                   PMD_SIZE, PAGE_KERNEL_EXEC);
 
        /* Map the data in RAM */
-       end_va = kernel_map.virt_addr + XIP_OFFSET + kernel_map.size;
+       end_va = kernel_map.virt_addr + kernel_map.size;
        for (va = kernel_map.virt_addr + XIP_OFFSET; va < end_va; va += PMD_SIZE)
                create_pgd_mapping(pgdir, va,
                                   kernel_map.phys_addr + (va - (kernel_map.virt_addr + XIP_OFFSET)),
@@ -1100,7 +1100,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
 
        phys_ram_base = CONFIG_PHYS_RAM_BASE;
        kernel_map.phys_addr = (uintptr_t)CONFIG_PHYS_RAM_BASE;
-       kernel_map.size = (uintptr_t)(&_end) - (uintptr_t)(&_sdata);
+       kernel_map.size = (uintptr_t)(&_end) - (uintptr_t)(&_start);
 
        kernel_map.va_kernel_xip_pa_offset = kernel_map.virt_addr - kernel_map.xiprom;
 #else