• Nick Kossifidis's avatar
    riscv: Don't use va_pa_offset on kdump · a11c07f0
    Nick Kossifidis authored
    On kdump instead of using an intermediate step to relocate the kernel,
    that lives in a "control buffer" outside the current kernel's mapping,
    we jump to the crash kernel directly by calling riscv_kexec_norelocate().
    The current implementation uses va_pa_offset while switching to physical
    addressing, however since we moved the kernel outside the linear mapping
    this won't work anymore since riscv_kexec_norelocate() is part of the
    kernel mapping and we should use kernel_map.va_kernel_pa_offset, and also
    take XIP kernel into account.
    
    We don't really need to use va_pa_offset on riscv_kexec_norelocate, we
    can just set STVEC to the physical address of the new kernel instead and
    let the hart jump to the new kernel on the next instruction after setting
    SATP to zero. This fixes kdump and is also simpler/cleaner.
    
    I tested this on the latest qemu and HiFive Unmatched and works as
    expected.
    
    Fixes: 2bfc6cd8 ("riscv: Move kernel mapping outside of linear mapping")
    Signed-off-by: default avatarNick Kossifidis <mick@ics.forth.gr>
    Reviewed-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
    Cc: stable@vger.kernel.org
    Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
    a11c07f0
kexec_relocate.S 4.38 KB