This is a note to let you know that I've just added the patch titled Revert "riscv: kdump: fix crashkernel reserving problem on RISC-V" to the 6.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-riscv-kdump-fix-crashkernel-reserving-problem-on-risc-v.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From xingmingzheng@xxxxxxxxxxx Tue Apr 30 09:53:50 2024 From: Mingzheng Xing <xingmingzheng@xxxxxxxxxxx> Date: Tue, 30 Apr 2024 11:24:03 +0800 Subject: Revert "riscv: kdump: fix crashkernel reserving problem on RISC-V" To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, stable@xxxxxxxxxxxxxxx Cc: Baoquan He <bhe@xxxxxxxxxx>, Mingzheng Xing <xingmingzheng@xxxxxxxxxxx>, Chen Jiahao <chenjiahao16@xxxxxxxxxx> Message-ID: <20240430032403.19562-1-xingmingzheng@xxxxxxxxxxx> From: Mingzheng Xing <xingmingzheng@xxxxxxxxxxx> This reverts commit 1d6cd2146c2b58bc91266db1d5d6a5f9632e14c0 which was mistakenly added into v6.6.y and the commit corresponding to the 'Fixes:' tag is invalid. For more information, see link [1]. This will result in the loss of Crashkernel data in /proc/iomem, and kdump failed: ``` Memory for crashkernel is not reserved Please reserve memory by passing"crashkernel=Y@X" parameter to kernel Then try to loading kdump kernel ``` After revert, kdump works fine. Tested on QEMU riscv. Link: https://lore.kernel.org/linux-riscv/ZSiQRDGLZk7lpakE@MiWiFi-R3L-srv [1] Cc: Baoquan He <bhe@xxxxxxxxxx> Cc: Chen Jiahao <chenjiahao16@xxxxxxxxxx> Signed-off-by: Mingzheng Xing <xingmingzheng@xxxxxxxxxxx> Acked-by: Baoquan He <bhe@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/riscv/kernel/setup.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -173,6 +173,19 @@ static void __init init_resources(void) if (ret < 0) goto error; +#ifdef CONFIG_KEXEC_CORE + if (crashk_res.start != crashk_res.end) { + ret = add_resource(&iomem_resource, &crashk_res); + if (ret < 0) + goto error; + } + if (crashk_low_res.start != crashk_low_res.end) { + ret = add_resource(&iomem_resource, &crashk_low_res); + if (ret < 0) + goto error; + } +#endif + #ifdef CONFIG_CRASH_DUMP if (elfcorehdr_size > 0) { elfcorehdr_res.start = elfcorehdr_addr; Patches currently in stable-queue which might be from xingmingzheng@xxxxxxxxxxx are queue-6.6/revert-riscv-kdump-fix-crashkernel-reserving-problem-on-risc-v.patch