Unverified Commit 0c496881 authored by Samuel Holland's avatar Samuel Holland Committed by Palmer Dabbelt
Browse files

riscv: Fix crash during early errata patching 



The patch function for the T-Head PBMT errata calls __pa_symbol() before
relocation. This crashes when CONFIG_DEBUG_VIRTUAL is enabled, because
__pa_symbol() forwards to __phys_addr_symbol(), and __phys_addr_symbol()
checks against the absolute kernel start/end address.

Fix this by checking against the kernel map instead of a symbol address.

Fixes: a35707c3 ("riscv: add memory-type errata for T-Head")
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Link: https://lore.kernel.org/r/20221126060920.65009-1-samuel@sholland.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 9abf2313

arch/riscv/mm/physaddr.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ EXPORT_SYMBOL(__virt_to_phys); 
phys_addr_t __phys_addr_symbol(unsigned long x)

{

	unsigned long kernel_start = kernel_map.virt_addr;

	unsigned long kernel_end = (unsigned long)_end;

	unsigned long kernel_end = kernel_start + kernel_map.size;



	/*

	 * Boundary checking aginst the kernel image mapping.