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>,
"Michał Mirosław" <mirq-linux@rere•qmqm.pl>
Cc: linux-ia64@vger•kernel.org, linux-parisc@vger•kernel.org,
linux-sh@vger•kernel.org, linux-pm@vger•kernel.org,
linux-kernel@vger•kernel.org, linux-csky@vger•kernel.org,
linux-mips@vger•kernel.org, linux-acpi@vger•kernel.org,
linux-m68k@lists•linux-m68k.org, linux-tegra@vger•kernel.org,
xen-devel@lists•xenproject.org, linux-riscv@lists•infradead.org,
linuxppc-dev@lists•ozlabs.org
Subject: [PATCH v5 19/21] ACPI: power: Switch to sys-off handler API
Date: Mon, 13 Dec 2021 00:03:07 +0300 [thread overview]
Message-ID: <20211212210309.9851-20-digetx@gmail.com> (raw)
In-Reply-To: <20211212210309.9851-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-12-12 23:17 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-12 21:02 [PATCH v5 00/21] Introduce power-off+restart call chain API Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 01/21] notifier: Add blocking_notifier_call_chain_is_empty() Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 02/21] notifier: Add atomic/blocking_notifier_chain_register_unique_prio() Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 03/21] reboot: Print error message if restart handler has duplicated priority Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 04/21] kernel: Add combined power-off+restart handler call chain API Dmitry Osipenko
2022-01-08 23:35 ` Michał Mirosław
2022-01-11 7:57 ` Dmitry Osipenko
2022-01-27 14:39 ` Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 05/21] ARM: Use do_kernel_power_off() Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 06/21] csky: " Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 07/21] riscv: " Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 08/21] arm64: " Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 09/21] parisc: " Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 10/21] xen/x86: " Dmitry Osipenko
2021-12-12 21:02 ` [PATCH v5 11/21] powerpc: " Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 12/21] m68k: Switch to new sys-off handler API Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 13/21] sh: Use do_kernel_power_off() Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 14/21] x86: " Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 15/21] ia64: " Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 16/21] mips: " Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 17/21] nds32: " Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 18/21] memory: emif: Use kernel_can_power_off() Dmitry Osipenko
2021-12-12 21:03 ` Dmitry Osipenko [this message]
2021-12-12 21:03 ` [PATCH v5 20/21] regulator: pfuze100: Use devm_register_sys_off_handler() Dmitry Osipenko
2021-12-12 21:03 ` [PATCH v5 21/21] 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=20211212210309.9851-20-digetx@gmail.com \
--to=digetx@gmail$(echo .)com \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alankao@andestech$(echo .)com \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=aou@eecs$(echo .)berkeley.edu \
--cc=benh@kernel$(echo .)crashing.org \
--cc=boris.ostrovsky@oracle$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=dalias@libc$(echo .)org \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=deanbo422@gmail$(echo .)com \
--cc=deller@gmx$(echo .)de \
--cc=funaho@jurai$(echo .)org \
--cc=geert@linux-m68k$(echo .)org \
--cc=gerg@linux-m68k$(echo .)org \
--cc=green.hu@gmail$(echo .)com \
--cc=guoren@kernel$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=jgross@suse$(echo .)com \
--cc=jonathanh@nvidia$(echo .)com \
--cc=kclin@andestech$(echo .)com \
--cc=krzysztof.kozlowski@canonical$(echo .)com \
--cc=lee.jones@linaro$(echo .)org \
--cc=lenb@kernel$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-csky@vger$(echo .)kernel.org \
--cc=linux-ia64@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-pm@vger$(echo .)kernel.org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-tegra@vger$(echo .)kernel.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linux@roeck-us$(echo .)net \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mingo@redhat$(echo .)com \
--cc=mirq-linux@rere$(echo .)qmqm.pl \
--cc=mpe@ellerman$(echo .)id.au \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul.walmsley@sifive$(echo .)com \
--cc=paulus@samba$(echo .)org \
--cc=pavel@ucw$(echo .)cz \
--cc=rafael@kernel$(echo .)org \
--cc=sre@kernel$(echo .)org \
--cc=ssantosh@kernel$(echo .)org \
--cc=sstabellini@kernel$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=thierry.reding@gmail$(echo .)com \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=ulf.hansson@linaro$(echo .)org \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=xen-devel@lists$(echo .)xenproject.org \
--cc=ysato@users$(echo .)sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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