* [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode
@ 2022-09-29 7:05 Kai-Heng Feng
2022-09-29 7:05 ` [RESEND PATCH v4 2/2] PM: ACPI: reboot: Reinstate S5 for reboot Kai-Heng Feng
2022-10-04 14:02 ` [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode Rafael J. Wysocki
0 siblings, 2 replies; 3+ messages in thread
From: Kai-Heng Feng @ 2022-09-29 7:05 UTC (permalink / raw)
To: rafael.j.wysocki, lenb
Cc: linux-acpi, Kai-Heng Feng, Dmitry Osipenko, tangmeng,
Luis Chamberlain, Petr Mladek, YueHaibing, linux-kernel
Add SYS_OFF_MODE_RESTART_PREPARE callbacks can be invoked before system
restart.
This is a preparation for next patch.
Suggested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
v4:
- Correct typo in comment.
v3:
- New patch.
include/linux/reboot.h | 8 ++++++++
kernel/reboot.c | 17 +++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index e5d9ef886179c..2b6bb593be5b6 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -105,6 +105,14 @@ enum sys_off_mode {
*/
SYS_OFF_MODE_POWER_OFF,
+ /**
+ * @SYS_OFF_MODE_RESTART_PREPARE:
+ *
+ * Handlers prepare system to be restarted. Handlers are
+ * allowed to sleep.
+ */
+ SYS_OFF_MODE_RESTART_PREPARE,
+
/**
* @SYS_OFF_MODE_RESTART:
*
diff --git a/kernel/reboot.c b/kernel/reboot.c
index 3c35445bf5ad3..3bba88c7ffc6b 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -243,6 +243,17 @@ void migrate_to_reboot_cpu(void)
set_cpus_allowed_ptr(current, cpumask_of(cpu));
}
+/*
+ * Notifier list for kernel code which wants to be called
+ * to prepare system for restart.
+ */
+static BLOCKING_NOTIFIER_HEAD(restart_prep_handler_list);
+
+static void do_kernel_restart_prepare(void)
+{
+ blocking_notifier_call_chain(&restart_prep_handler_list, 0, NULL);
+}
+
/**
* kernel_restart - reboot the system
* @cmd: pointer to buffer containing command to execute for restart
@@ -254,6 +265,7 @@ void migrate_to_reboot_cpu(void)
void kernel_restart(char *cmd)
{
kernel_restart_prepare(cmd);
+ do_kernel_restart_prepare();
migrate_to_reboot_cpu();
syscore_shutdown();
if (!cmd)
@@ -396,6 +408,11 @@ register_sys_off_handler(enum sys_off_mode mode,
handler->list = &power_off_handler_list;
break;
+ case SYS_OFF_MODE_RESTART_PREPARE:
+ handler->list = &restart_prep_handler_list;
+ handler->blocking = true;
+ break;
+
case SYS_OFF_MODE_RESTART:
handler->list = &restart_handler_list;
break;
--
2.37.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [RESEND PATCH v4 2/2] PM: ACPI: reboot: Reinstate S5 for reboot
2022-09-29 7:05 [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode Kai-Heng Feng
@ 2022-09-29 7:05 ` Kai-Heng Feng
2022-10-04 14:02 ` [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode Rafael J. Wysocki
1 sibling, 0 replies; 3+ messages in thread
From: Kai-Heng Feng @ 2022-09-29 7:05 UTC (permalink / raw)
To: rafael.j.wysocki, lenb
Cc: linux-acpi, Kai-Heng Feng, Josef Bacik, Dmitry Osipenko,
Rafael J. Wysocki, linux-kernel
Commit d60cd06331a3 ("PM: ACPI: reboot: Use S5 for reboot") caused Dell
PowerEdge r440 hangs at reboot.
The issue is fixed by commit 2ca1c94ce0b6 ("tg3: Disable tg3 device on
system reboot to avoid triggering AER"), so use the new sysoff API to
reinstate S5 for reboot on ACPI-based systems.
Using S5 for reboot is default behavior under Windows, "A full shutdown
(S5) occurs when a system restart is requested" [1].
[1] https://docs.microsoft.com/en-us/windows/win32/power/system-power-state
Cc: Josef Bacik <josef@toxicpanda.com>
Suggested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
v4:
- Add comment and add more info to commit message.
v3:
- Use new API to invoke ACPI S5.
v2:
- Use do_kernel_power_off_prepare() instead.
drivers/acpi/sleep.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index ad4b2987b3d6e..0b557c0d405ef 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -1088,6 +1088,14 @@ int __init acpi_sleep_init(void)
register_sys_off_handler(SYS_OFF_MODE_POWER_OFF,
SYS_OFF_PRIO_FIRMWARE,
acpi_power_off, NULL);
+
+ /*
+ * Windows uses S5 for reboot, so some BIOSes depend on it to
+ * perform proper reboot.
+ */
+ register_sys_off_handler(SYS_OFF_MODE_RESTART_PREPARE,
+ SYS_OFF_PRIO_FIRMWARE,
+ acpi_power_off_prepare, NULL);
} else {
acpi_no_s5 = true;
}
--
2.37.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode
2022-09-29 7:05 [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode Kai-Heng Feng
2022-09-29 7:05 ` [RESEND PATCH v4 2/2] PM: ACPI: reboot: Reinstate S5 for reboot Kai-Heng Feng
@ 2022-10-04 14:02 ` Rafael J. Wysocki
1 sibling, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2022-10-04 14:02 UTC (permalink / raw)
To: Kai-Heng Feng
Cc: rafael.j.wysocki, lenb, linux-acpi, Dmitry Osipenko, tangmeng,
Luis Chamberlain, Petr Mladek, YueHaibing, linux-kernel
On Thu, Sep 29, 2022 at 9:06 AM Kai-Heng Feng
<kai.heng.feng@canonical.com> wrote:
>
> Add SYS_OFF_MODE_RESTART_PREPARE callbacks can be invoked before system
> restart.
>
> This is a preparation for next patch.
>
> Suggested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Applied as 6.1-rc material along with the [2/2], thanks!
> ---
> v4:
> - Correct typo in comment.
> v3:
> - New patch.
>
> include/linux/reboot.h | 8 ++++++++
> kernel/reboot.c | 17 +++++++++++++++++
> 2 files changed, 25 insertions(+)
>
> diff --git a/include/linux/reboot.h b/include/linux/reboot.h
> index e5d9ef886179c..2b6bb593be5b6 100644
> --- a/include/linux/reboot.h
> +++ b/include/linux/reboot.h
> @@ -105,6 +105,14 @@ enum sys_off_mode {
> */
> SYS_OFF_MODE_POWER_OFF,
>
> + /**
> + * @SYS_OFF_MODE_RESTART_PREPARE:
> + *
> + * Handlers prepare system to be restarted. Handlers are
> + * allowed to sleep.
> + */
> + SYS_OFF_MODE_RESTART_PREPARE,
> +
> /**
> * @SYS_OFF_MODE_RESTART:
> *
> diff --git a/kernel/reboot.c b/kernel/reboot.c
> index 3c35445bf5ad3..3bba88c7ffc6b 100644
> --- a/kernel/reboot.c
> +++ b/kernel/reboot.c
> @@ -243,6 +243,17 @@ void migrate_to_reboot_cpu(void)
> set_cpus_allowed_ptr(current, cpumask_of(cpu));
> }
>
> +/*
> + * Notifier list for kernel code which wants to be called
> + * to prepare system for restart.
> + */
> +static BLOCKING_NOTIFIER_HEAD(restart_prep_handler_list);
> +
> +static void do_kernel_restart_prepare(void)
> +{
> + blocking_notifier_call_chain(&restart_prep_handler_list, 0, NULL);
> +}
> +
> /**
> * kernel_restart - reboot the system
> * @cmd: pointer to buffer containing command to execute for restart
> @@ -254,6 +265,7 @@ void migrate_to_reboot_cpu(void)
> void kernel_restart(char *cmd)
> {
> kernel_restart_prepare(cmd);
> + do_kernel_restart_prepare();
> migrate_to_reboot_cpu();
> syscore_shutdown();
> if (!cmd)
> @@ -396,6 +408,11 @@ register_sys_off_handler(enum sys_off_mode mode,
> handler->list = &power_off_handler_list;
> break;
>
> + case SYS_OFF_MODE_RESTART_PREPARE:
> + handler->list = &restart_prep_handler_list;
> + handler->blocking = true;
> + break;
> +
> case SYS_OFF_MODE_RESTART:
> handler->list = &restart_handler_list;
> break;
> --
> 2.37.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-04 14:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29 7:05 [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode Kai-Heng Feng
2022-09-29 7:05 ` [RESEND PATCH v4 2/2] PM: ACPI: reboot: Reinstate S5 for reboot Kai-Heng Feng
2022-10-04 14:02 ` [RESEND PATCH v4 1/2] kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).