Unverified Commit ca0cb9a6 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

riscv/mm: Add XIP_FIXUP for riscv_pfn_base 



This manifests as a crash early in boot on VexRiscv.

Signed-off-by: default avatarMyrtle Shah <gatecat@ds0.me>
[Palmer: split commit]
Fixes: 44c92257 ("RISC-V: enable XIP")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 4b1c70aa

arch/riscv/mm/init.c

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static pmd_t __maybe_unused early_dtb_pmd[PTRS_PER_PMD] __initdata __aligned(PAG 


#ifdef CONFIG_XIP_KERNEL

#define pt_ops			(*(struct pt_alloc_ops *)XIP_FIXUP(&pt_ops))

#define riscv_pfn_base         (*(unsigned long  *)XIP_FIXUP(&riscv_pfn_base))

#define trampoline_pg_dir      ((pgd_t *)XIP_FIXUP(trampoline_pg_dir))

#define fixmap_pte             ((pte_t *)XIP_FIXUP(fixmap_pte))

#define early_pg_dir           ((pgd_t *)XIP_FIXUP(early_pg_dir))