summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2022-11-26 07:09:19 +0100
committerPalmer Dabbelt <palmer@rivosinc.com>2022-12-09 02:22:53 +0100
commit0c49688174f5347c3f8012e84c0ffa0d2b2890c8 (patch)
treeb64ab8c2728beefcc0de81793c1ce9ea8aea37fc /arch
parentLinux 6.1-rc1 (diff)
downloadlinux-0c49688174f5347c3f8012e84c0ffa0d2b2890c8.tar.xz
linux-0c49688174f5347c3f8012e84c0ffa0d2b2890c8.zip
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: a35707c3d850 ("riscv: add memory-type errata for T-Head") Reviewed-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Samuel Holland <samuel@sholland.org> Link: https://lore.kernel.org/r/20221126060920.65009-1-samuel@sholland.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/riscv/mm/physaddr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/mm/physaddr.c b/arch/riscv/mm/physaddr.c
index 19cf25a74ee2..9b18bda74154 100644
--- a/arch/riscv/mm/physaddr.c
+++ b/arch/riscv/mm/physaddr.c
@@ -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.