From: Palmer Dabbelt Date: Fri, 4 Feb 2022 21:13:37 +0000 (-0800) Subject: riscv/mm: Add XIP_FIXUP for phys_ram_base X-Git-Tag: v6.1-rc5~1860^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b1c70aa8ed8249608bb991380cb8ff423edf49e;p=platform%2Fkernel%2Flinux-starfive.git riscv/mm: Add XIP_FIXUP for phys_ram_base This manifests as a crash early in boot on VexRiscv. Signed-off-by: Myrtle Shah [Palmer: split commit] Fixes: 6d7f91d914bc ("riscv: Get rid of CONFIG_PHYS_RAM_BASE in kernel physical address conversion") Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt --- diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index cf4d018..eecfaca 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -522,6 +522,7 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size) } #ifdef CONFIG_XIP_KERNEL +#define phys_ram_base (*(phys_addr_t *)XIP_FIXUP(&phys_ram_base)) extern char _xiprom[], _exiprom[], __data_loc; /* called from head.S with MMU off */