riscv/mm: Add XIP_FIXUP for phys_ram_base

palmer-dabbelt · palmer-dabbelt · commit 4b1c70aa8ed8 · 2022-02-04T13:18:56.000-08:00
This manifests as a crash early in boot on VexRiscv. Signed-off-by: Myrtle Shah <gatecat@ds0.me> [Palmer: split commit] Fixes: 6d7f91d ("riscv: Get rid of CONFIG_PHYS_RAM_BASE in kernel physical address conversion") Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -522,6 +522,7 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`#ifdef CONFIG_XIP_KERNEL`
	`525`	`+#define phys_ram_base ((phys_addr_t )XIP_FIXUP(&phys_ram_base))`
`525`	`526`	`extern char _xiprom[], _exiprom[], __data_loc;`
`526`	`527`
`527`	`528`	`/* called from head.S with MMU off */`