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 16/25] m68k: Switch to new sys-off handler API
Date: Fri, 26 Nov 2021 21:00:52 +0300 [thread overview]
Message-ID: <20211126180101.27818-17-digetx@gmail.com> (raw)
In-Reply-To: <20211126180101.27818-1-digetx@gmail.com>
Kernel now supports chained power-off handlers. Use
register_power_off_handler() that registers power-off handlers and
do_kernel_power_off() that invokes chained power-off handlers. Legacy
pm_power_off() will be removed once all drivers will be converted to
the new power-off API.
Normally arch code should adopt only the do_kernel_power_off() at first,
but m68k is a special case because it uses pm_power_off() "inside out",
i.e. pm_power_off() invokes machine_power_off() [in fact it does nothing],
while it's machine_power_off() that should invoke the pm_power_off(), and
thus, we can't convert platforms to the new API separately. There are only
two platforms changed here, so it's not a big deal.
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
arch/m68k/emu/natfeat.c | 3 ++-
arch/m68k/include/asm/machdep.h | 1 -
arch/m68k/kernel/process.c | 5 ++---
arch/m68k/kernel/setup_mm.c | 1 -
arch/m68k/kernel/setup_no.c | 1 -
arch/m68k/mac/config.c | 4 +++-
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c
index 71b78ecee75c..b19dc00026d9 100644
--- a/arch/m68k/emu/natfeat.c
+++ b/arch/m68k/emu/natfeat.c
@@ -15,6 +15,7 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/reboot.h>
#include <linux/io.h>
#include <asm/machdep.h>
#include <asm/natfeat.h>
@@ -90,5 +91,5 @@ void __init nf_init(void)
pr_info("NatFeats found (%s, %lu.%lu)\n", buf, version >> 16,
version & 0xffff);
- mach_power_off = nf_poweroff;
+ register_platform_power_off(nf_poweroff);
}
diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
index 8fd80ef1b77e..8d8c3ee2069f 100644
--- a/arch/m68k/include/asm/machdep.h
+++ b/arch/m68k/include/asm/machdep.h
@@ -24,7 +24,6 @@ extern int (*mach_get_rtc_pll)(struct rtc_pll_info *);
extern int (*mach_set_rtc_pll)(struct rtc_pll_info *);
extern void (*mach_reset)( void );
extern void (*mach_halt)( void );
-extern void (*mach_power_off)( void );
extern unsigned long (*mach_hd_init) (unsigned long, unsigned long);
extern void (*mach_hd_setup)(char *, int *);
extern void (*mach_heartbeat) (int);
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index a6030dbaa089..e160a7c57bd3 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -67,12 +67,11 @@ void machine_halt(void)
void machine_power_off(void)
{
- if (mach_power_off)
- mach_power_off();
+ do_kernel_power_off();
for (;;);
}
-void (*pm_power_off)(void) = machine_power_off;
+void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
void show_regs(struct pt_regs * regs)
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 4b51bfd38e5f..50f4f120a4ff 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -98,7 +98,6 @@ EXPORT_SYMBOL(mach_get_rtc_pll);
EXPORT_SYMBOL(mach_set_rtc_pll);
void (*mach_reset)( void );
void (*mach_halt)( void );
-void (*mach_power_off)( void );
#ifdef CONFIG_HEARTBEAT
void (*mach_heartbeat) (int);
EXPORT_SYMBOL(mach_heartbeat);
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 5e4104f07a44..00bf82258233 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -55,7 +55,6 @@ int (*mach_hwclk) (int, struct rtc_time*);
/* machine dependent reboot functions */
void (*mach_reset)(void);
void (*mach_halt)(void);
-void (*mach_power_off)(void);
#ifdef CONFIG_M68000
#if defined(CONFIG_M68328)
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 5d16f9b47aa9..727320dedf08 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -12,6 +12,7 @@
#include <linux/errno.h>
#include <linux/module.h>
+#include <linux/reboot.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/tty.h>
@@ -139,7 +140,6 @@ void __init config_mac(void)
mach_hwclk = mac_hwclk;
mach_reset = mac_reset;
mach_halt = mac_poweroff;
- mach_power_off = mac_poweroff;
#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
mach_beep = mac_mksound;
#endif
@@ -159,6 +159,8 @@ void __init config_mac(void)
if (macintosh_config->ident == MAC_MODEL_IICI)
mach_l2_flush = via_l2_flush;
+
+ register_platform_power_off(mac_poweroff);
}
--
2.33.1
next prev parent reply other threads:[~2021-11-26 18:25 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 ` Dmitry Osipenko [this message]
2021-11-26 18:00 ` [PATCH v4 17/25] sh: " 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 ` [PATCH v4 23/25] ACPI: power: Switch to sys-off handler API Dmitry Osipenko
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-17-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 read-only IMAP folder(s) and NNTP newsgroup(s).