From 368ac411a25221d0b6d791e77edb07d09cfc0873 Mon Sep 17 00:00:00 2001
From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Date: Wed, 12 Jan 2022 15:59:23 +0300
Subject: [PATCH] riscv: sbi: Use sys-off handler
Replace restart handler with sys-off handler. Restart handler might
deprecated once all users are switched to sys-off handler, this allows
removes some boilerplate code and provides more features.
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
arch/riscv/kernel/sbi.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c
index 1c2cc5775385f..c3d981c872dae 100644
--- a/arch/riscv/kernel/sbi.c
+++ b/arch/riscv/kernel/sbi.c
@@ -559,24 +559,26 @@ static void sbi_srst_reset(unsigned long type, unsigned long reason)
__func__, type, reason);
}
-static int sbi_srst_reboot(struct notifier_block *this,
- unsigned long mode, void *cmd)
+static void sbi_srst_reboot(struct restart_data *data)
{
- sbi_srst_reset((mode == REBOOT_WARM || mode == REBOOT_SOFT) ?
+ sbi_srst_reset((data->mode == REBOOT_WARM || data->mode == REBOOT_SOFT) ?
SBI_SRST_RESET_TYPE_WARM_REBOOT :
SBI_SRST_RESET_TYPE_COLD_REBOOT,
SBI_SRST_RESET_REASON_NONE);
- return NOTIFY_DONE;
}
-static struct notifier_block sbi_srst_reboot_nb;
-
-static void sbi_srst_power_off(void)
+static void sbi_srst_power_off(struct power_off_data *data)
{
sbi_srst_reset(SBI_SRST_RESET_TYPE_SHUTDOWN,
SBI_SRST_RESET_REASON_NONE);
}
+static struct sys_off_handler sbi_sys_off = {
+ .power_off_cb = sbi_srst_power_off,
+ .restart_cb = sbi_srst_reboot,
+ .restart_priority = RESTART_PRIO_HIGH,
+};
+
/**
* sbi_probe_extension() - Check if an SBI extension ID is supported or not.
* @extid: The extension ID to be probed.
@@ -683,10 +685,7 @@ void __init sbi_init(void)
if ((sbi_spec_version >= sbi_mk_version(0, 3)) &&
(sbi_probe_extension(SBI_EXT_SRST) > 0)) {
pr_info("SBI SRST extension detected\n");
- pm_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);
+ register_sys_off_handler(&sbi_sys_off);
}
} else {
__sbi_set_timer = __sbi_set_timer_v01;
--
GitLab