From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Russell King <linux@armlinux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Guo Ren <guoren@kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Greg Ungerer <gerg@linux-m68k.org>,
Joshua Thompson <funaho@jurai.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Sebastian Reichel <sre@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Greentime Hu <green.hu@gmail.com>,
Vincent Chen <deanbo422@gmail.com>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Helge Deller <deller@gmx.de>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>,
Stefano Stabellini <sstabellini@kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Len Brown <lenb@kernel.org>,
Santosh Shilimkar <ssantosh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Pavel Machek <pavel@ucw.cz>,
Lee Jones <lee.jones@linaro.org>,
Andrew Morton <akpm@linux-foundation.org>,
Guenter Roeck <linux@roeck-us.net>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
alankao@andestech.com,
"K . C . Kuen-Chern Lin" <kclin@andestech.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org,
linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org,
linux-sh@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org,
linux-tegra@vger.kernel.org
Subject: [PATCH v4 23/25] ACPI: power: Switch to sys-off handler API
Date: Fri, 26 Nov 2021 21:00:59 +0300 [thread overview]
Message-ID: <20211126180101.27818-24-digetx@gmail.com> (raw)
In-Reply-To: <20211126180101.27818-1-digetx@gmail.com>
Switch to sys-off API that replaces legacy pm_power_off callbacks.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/acpi/sleep.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index eaa47753b758..2e613fddd614 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -47,19 +47,11 @@ static void acpi_sleep_tts_switch(u32 acpi_state)
}
}
-static int tts_notify_reboot(struct notifier_block *this,
- unsigned long code, void *x)
+static void tts_reboot_prepare(struct reboot_prep_data *data)
{
acpi_sleep_tts_switch(ACPI_STATE_S5);
- return NOTIFY_DONE;
}
-static struct notifier_block tts_notifier = {
- .notifier_call = tts_notify_reboot,
- .next = NULL,
- .priority = 0,
-};
-
static int acpi_sleep_prepare(u32 acpi_state)
{
#ifdef CONFIG_ACPI_SLEEP
@@ -1020,7 +1012,7 @@ static void acpi_sleep_hibernate_setup(void)
static inline void acpi_sleep_hibernate_setup(void) {}
#endif /* !CONFIG_HIBERNATION */
-static void acpi_power_off_prepare(void)
+static void acpi_power_off_prepare(struct power_off_prep_data *data)
{
/* Prepare to power off the system */
acpi_sleep_prepare(ACPI_STATE_S5);
@@ -1028,7 +1020,7 @@ static void acpi_power_off_prepare(void)
acpi_os_wait_events_complete();
}
-static void acpi_power_off(void)
+static void acpi_power_off(struct power_off_data *data)
{
/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
pr_debug("%s called\n", __func__);
@@ -1036,6 +1028,11 @@ static void acpi_power_off(void)
acpi_enter_sleep_state(ACPI_STATE_S5);
}
+static struct sys_off_handler acpi_sys_off_handler = {
+ .power_off_priority = POWEROFF_PRIO_FIRMWARE,
+ .reboot_prepare_cb = tts_reboot_prepare,
+};
+
int __init acpi_sleep_init(void)
{
char supported[ACPI_S_STATE_COUNT * 3 + 1];
@@ -1052,8 +1049,8 @@ int __init acpi_sleep_init(void)
if (acpi_sleep_state_supported(ACPI_STATE_S5)) {
sleep_states[ACPI_STATE_S5] = 1;
- pm_power_off_prepare = acpi_power_off_prepare;
- pm_power_off = acpi_power_off;
+ acpi_sys_off_handler.power_off_cb = acpi_power_off;
+ acpi_sys_off_handler.power_off_prepare_cb = acpi_power_off_prepare;
} else {
acpi_no_s5 = true;
}
@@ -1069,6 +1066,6 @@ int __init acpi_sleep_init(void)
* Register the tts_notifier to reboot notifier list so that the _TTS
* object can also be evaluated when the system enters S5.
*/
- register_reboot_notifier(&tts_notifier);
+ register_sys_off_handler(&acpi_sys_off_handler);
return 0;
}
--
2.33.1
next prev parent reply other threads:[~2021-11-26 18:26 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 18:00 [PATCH v4 00/25] Introduce power-off+restart call chain API Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 01/25] notifier: Remove extern annotation from function prototypes Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 02/25] notifier: Add blocking_notifier_call_chain_is_empty() Dmitry Osipenko
2021-12-10 18:14 ` Rafael J. Wysocki
2021-12-10 18:19 ` Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 03/25] notifier: Add atomic/blocking_notifier_has_unique_priority() Dmitry Osipenko
2021-12-10 18:19 ` Rafael J. Wysocki
2021-12-10 18:52 ` Dmitry Osipenko
2021-12-10 19:05 ` Rafael J. Wysocki
2021-12-10 19:33 ` Dmitry Osipenko
2021-12-10 20:16 ` Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 04/25] reboot: Correct typo in a comment Dmitry Osipenko
2021-12-10 18:21 ` Rafael J. Wysocki
2021-11-26 18:00 ` [PATCH v4 05/25] reboot: Warn if restart handler has duplicated priority Dmitry Osipenko
2021-11-28 0:28 ` Michał Mirosław
2021-11-28 21:06 ` Dmitry Osipenko
2021-11-29 0:26 ` Michał Mirosław
2021-11-29 11:34 ` Dmitry Osipenko
2021-12-10 18:27 ` Rafael J. Wysocki
2021-12-10 19:04 ` Dmitry Osipenko
2021-12-10 19:14 ` Rafael J. Wysocki
2021-12-10 19:42 ` Dmitry Osipenko
2021-12-10 19:44 ` Dmitry Osipenko
2021-12-10 19:49 ` Dmitry Osipenko
2021-12-13 9:23 ` Geert Uytterhoeven
2021-11-26 18:00 ` [PATCH v4 06/25] reboot: Warn if unregister_restart_handler() fails Dmitry Osipenko
2021-12-10 18:32 ` Rafael J. Wysocki
2021-12-10 18:54 ` Dmitry Osipenko
2021-12-10 19:08 ` Rafael J. Wysocki
2021-12-10 19:38 ` Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 07/25] reboot: Remove extern annotation from function prototypes Dmitry Osipenko
2021-12-10 18:09 ` Rafael J. Wysocki
2021-12-10 18:15 ` Dmitry Osipenko
2021-12-10 18:35 ` Rafael J. Wysocki
2021-12-10 18:56 ` Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 08/25] kernel: Add combined power-off+restart handler call chain API Dmitry Osipenko
2021-11-28 0:43 ` Michał Mirosław
2021-11-28 21:04 ` Dmitry Osipenko
2021-11-28 21:17 ` Michał Mirosław
2021-11-28 21:53 ` Dmitry Osipenko
2021-11-29 0:36 ` Michał Mirosław
2021-11-29 11:52 ` Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 09/25] ARM: Use do_kernel_power_off() Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 10/25] csky: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 11/25] riscv: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 12/25] arm64: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 13/25] parisc: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 14/25] xen/x86: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 15/25] powerpc: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 16/25] m68k: Switch to new sys-off handler API Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 17/25] sh: Use do_kernel_power_off() Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 18/25] x86: " Dmitry Osipenko
2021-11-28 1:15 ` Michał Mirosław
2021-11-28 21:06 ` Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 19/25] ia64: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 20/25] mips: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 21/25] nds32: " Dmitry Osipenko
2021-11-26 18:00 ` [PATCH v4 22/25] memory: emif: Use kernel_can_power_off() Dmitry Osipenko
2021-11-28 1:23 ` Michał Mirosław
2021-11-28 21:04 ` Dmitry Osipenko
2021-11-26 18:00 ` Dmitry Osipenko [this message]
2021-11-26 18:01 ` [PATCH v4 24/25] regulator: pfuze100: Use devm_register_sys_off_handler() Dmitry Osipenko
2021-11-26 18:01 ` [PATCH v4 25/25] reboot: Remove pm_power_off_prepare() Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211126180101.27818-24-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@linux-foundation.org \
--cc=alankao@andestech.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=aou@eecs.berkeley.edu \
--cc=benh@kernel.crashing.org \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=daniel.lezcano@linaro.org \
--cc=dave.hansen@linux.intel.com \
--cc=deanbo422@gmail.com \
--cc=deller@gmx.de \
--cc=funaho@jurai.org \
--cc=geert@linux-m68k.org \
--cc=gerg@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=guoren@kernel.org \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jonathanh@nvidia.com \
--cc=kclin@andestech.com \
--cc=krzysztof.kozlowski@canonical.com \
--cc=lee.jones@linaro.org \
--cc=lenb@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@roeck-us.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=p.zabel@pengutronix.de \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=paulus@samba.org \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=sre@kernel.org \
--cc=ssantosh@kernel.org \
--cc=sstabellini@kernel.org \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=tsbogend@alpha.franken.de \
--cc=ulf.hansson@linaro.org \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).