mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-21 06:50:25 +00:00
3f7023171d
When a crashkernel is launched on RISC-V, the entry to purgatory is
done by trapping via the stvec CSR. From riscv_kexec_norelocate():
| ...
| /*
| * Switch to physical addressing
| * This will also trigger a jump to CSR_STVEC
| * which in this case is the address of the new
| * kernel.
| */
| csrw CSR_STVEC, a2
| csrw CSR_SATP, zero
stvec requires that the address is 4B aligned, which was not the case,
e.g.:
| Loaded purgatory at 0xffffc000
| kexec_file: kexec_file_load: type:1, start:0xffffd232 head:0x4 flags:0x6
The address 0xffffd232 not 4B aligned.
Correct by adding proper function alignment.
With this change, crashkernels loaded with kexec-file will be able to
properly enter the purgatory.
Fixes: 736e30af58 ("RISC-V: Add purgatory")
Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20250328085313.1193815-1-bjorn@kernel.org
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
42 lines
644 B
ArmAsm
42 lines
644 B
ArmAsm
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* purgatory: Runs between two kernels
|
|
*
|
|
* Copyright (C) 2022 Huawei Technologies Co, Ltd.
|
|
*
|
|
* Author: Li Zhengyu (lizhengyu3@huawei.com)
|
|
*
|
|
*/
|
|
#include <asm/asm.h>
|
|
#include <linux/linkage.h>
|
|
|
|
.text
|
|
|
|
.align 2
|
|
SYM_CODE_START(purgatory_start)
|
|
|
|
lla sp, .Lstack
|
|
mv s0, a0 /* The hartid of the current hart */
|
|
mv s1, a1 /* Phys address of the FDT image */
|
|
|
|
jal purgatory
|
|
|
|
/* Start new image. */
|
|
mv a0, s0
|
|
mv a1, s1
|
|
ld a2, riscv_kernel_entry
|
|
jr a2
|
|
SYM_CODE_END(purgatory_start)
|
|
|
|
.align 4
|
|
.rept 256
|
|
.quad 0
|
|
.endr
|
|
.Lstack:
|
|
|
|
.data
|
|
|
|
.align LGREG
|
|
SYM_DATA(riscv_kernel_entry, .quad 0)
|
|
|
|
.end
|