Commit 7b090e7b authored by Mayuresh Chitale's avatar Mayuresh Chitale Committed by Paul Walmsley
Browse files

riscv: sbi: Prefer SRST shutdown over legacy 



Currently, the sbi_init() always attempts to register the legacy shutdown
function as the sys-off handler which is fine when RISCV_SBI_V01 is not
enabled. However, if RISCV_SBI_V01 is enabled in the kernel and the SBI
v0.1 is not supported by the underlying SBI implementation then the
legacy shutdown fails. Fix this by not registering the legacy shutdown
when SRST shutdown is available.

Fixes: 70ddf86d ("riscv: sbi: Switch to new sys-off handler API")
Signed-off-by: default avatarMayuresh Chitale <mchitale@ventanamicro.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Link: https://patch.msgid.link/20251114065808.304430-1-mchitale@ventanamicro.com


Signed-off-by: default avatarPaul Walmsley <pjw@kernel.org>
parent 91f815b7

arch/riscv/kernel/sbi.c

+5 −1
Original line number Diff line number Diff line
@@ -648,9 +648,9 @@ int sbi_debug_console_read(char *bytes, unsigned int num_bytes) 


void __init sbi_init(void)

{

	bool srst_power_off = false;

	int ret;



	sbi_set_power_off();

	ret = sbi_get_spec_version();

	if (ret > 0)

		sbi_spec_version = ret;
@@ -683,6 +683,7 @@ void __init sbi_init(void) 
		    sbi_probe_extension(SBI_EXT_SRST)) {

			pr_info("SBI SRST extension detected\n");

			register_platform_power_off(sbi_srst_power_off);

			srst_power_off = true;

			sbi_srst_reboot_nb.notifier_call = sbi_srst_reboot;

			sbi_srst_reboot_nb.priority = 192;

			register_restart_handler(&sbi_srst_reboot_nb);
@@ -702,4 +703,7 @@ void __init sbi_init(void) 
		__sbi_send_ipi	= __sbi_send_ipi_v01;

		__sbi_rfence	= __sbi_rfence_v01;

	}



	if (!srst_power_off)

		sbi_set_power_off();

}