Skip to contentSkip to conversation

riscv: sbi: Switch to new sys-off handler API

PATCH In review Andrew Davis 2 participants 2 messages Aug 13, 2025 – Aug 14, 2025 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 riscv: sbi: Switch to new sys-off handler API

Kernel now supports chained power-off handlers. Use register_platform_power_off() that registers a platform level power-off handler. Legacy pm_power_off() will be removed once all drivers and archs are converted to the new sys-off API.

---
 arch/riscv/kernel/sbi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kernel/sbi.c +2 -2
index 53836a9235e32..5e8cde0552643 100644
@@ -148,7 +148,7 @@ static int __sbi_rfence_v01(int fid, const struct cpumask *cpu_mask,
 
 static void sbi_set_power_off(void)
 {
-	pm_power_off = sbi_shutdown;
+	register_platform_power_off(sbi_shutdown);
 }
 #else
 static void __sbi_set_timer_v01(uint64_t stime_value)
@@ -682,7 +682,7 @@ void __init sbi_init(void)
 		if (sbi_spec_version >= sbi_mk_version(0, 3) &&
 		    sbi_probe_extension(SBI_EXT_SRST)) {
 			pr_info("SBI SRST extension detected\n");
-			pm_power_off = sbi_srst_power_off;
+			register_platform_power_off(sbi_srst_power_off);
 			sbi_srst_reboot_nb.notifier_call = sbi_srst_reboot;
 			sbi_srst_reboot_nb.priority = 192;
 			register_restart_handler(&sbi_srst_reboot_nb);
Signature · 1 line
2.39.2
reviewer Tested-by Reviewed-by on v1 1/1
#1 lore raw

Hi Andrew,

Quoted 24 lines · Andrew Davis

Kernel now supports chained power-off handlers. Use register_platform_power_off() that registers a platform level power-off handler. Legacy pm_power_off() will be removed once all drivers and archs are converted to the new sys-off API.

---
  arch/riscv/kernel/sbi.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kernel/sbi.c +1 -1
index 53836a9235e32..5e8cde0552643 100644
@@ -148,7 +148,7 @@ static int __sbi_rfence_v01(int fid, const struct cpumask *cpu_mask,
 
  static void sbi_set_power_off(void)
  {
-	pm_power_off = sbi_shutdown;
+	register_platform_power_off(sbi_shutdown);
  }
  #else
  static void __sbi_set_timer_v01(uint64_t stime_value)

arch/riscv/kernel/sbi.c void __init sbi_init(void) · line 688

Quoted 8 lines
arch/riscv/kernel/sbi.c +1 -1
@@ -682,7 +682,7 @@ void __init sbi_init(void)
  		if (sbi_spec_version >= sbi_mk_version(0, 3) &&
  		    sbi_probe_extension(SBI_EXT_SRST)) {
  			pr_info("SBI SRST extension detected\n");
-			pm_power_off = sbi_srst_power_off;
+			register_platform_power_off(sbi_srst_power_off);
  			sbi_srst_reboot_nb.notifier_call = sbi_srst_reboot;
  			sbi_srst_reboot_nb.priority = 192;
  			register_restart_handler(&sbi_srst_reboot_nb);

I'll take that for 6.18.

Thanks,

Alex