From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "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>,
"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>,
"the arch/x86 maintainers" <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" <krzk@kernel.org>,
"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>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
linux-csky@vger.kernel.org,
"linux-ia64@vger.kernel.org" <linux-ia64@vger.kernel.org>,
linux-m68k <linux-m68k@lists.linux-m68k.org>,
"open list:BROADCOM NVRAM DRIVER" <linux-mips@vger.kernel.org>,
"Parisc List" <linux-parisc@vger.kernel.org>,
linux-riscv <linux-riscv@lists.infradead.org>,
"Linux-sh list" <linux-sh@vger.kernel.org>,
xen-devel@lists.xenproject.org,
"ACPI Devel Maling List" <linux-acpi@vger.kernel.org>,
"Linux PM list" <linux-pm@vger.kernel.org>,
linux-tegra <linux-tegra@vger.kernel.org>
Subject: Re: [PATCH v8 16/27] m68k: Switch to new sys-off handler API
Date: Wed, 1 Jun 2022 00:24:49 +0300 [thread overview]
Message-ID: <a41c323a-5d69-0ff1-d0da-38eb55e1e4db@collabora.com> (raw)
In-Reply-To: <CAMuHMdUFqf58F31EAGnhp_cu9k-G4Sx1cmwx-PGb3mU+6bjRnQ@mail.gmail.com>
On 5/31/22 22:04, Geert Uytterhoeven wrote:
> Hi Dmitry,
>
> On Tue, May 10, 2022 at 1:34 AM Dmitry Osipenko
> <dmitry.osipenko@collabora.com> wrote:
>> 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 sys-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>
>> Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
>> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>
> Thanks for your patch, which is now commit f0f7e5265b3b37b0
> ("m68k: Switch to new sys-off handler API") upstream.
>
>> --- 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);
>
> Unfortunately nothing is registered, as this is called very early
> (from setup_arch(), before the memory allocator is available.
> Hence register_sys_off_handler() fails with -ENOMEM, and poweroff
> stops working.
>
> Possible solutions:
> - As at most one handler can be registered,
> register_platform_power_off() could use a static struct sys_off_handler
> instance,
> - Keep mach_power_off, and call register_platform_power_off() later.
>
> Anything else?
> Thanks!
>
>> --- 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>
>> @@ -140,7 +141,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
>> @@ -160,6 +160,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);
>> }
>
> This must have the same problem.
The static variant should be better, IMO. I'm not sure whether other platforms won't face the same problem once they will start using register_platform_power_off(). I'll send the fix, thank you for the testing!
--- >8 ---
diff --git a/kernel/reboot.c b/kernel/reboot.c
index a091145ee710..4fea05d387dc 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -315,6 +315,37 @@ static int sys_off_notify(struct notifier_block *nb,
return handler->sys_off_cb(&data);
}
+static struct sys_off_handler platform_sys_off_handler;
+
+static struct sys_off_handler *alloc_sys_off_handler(int priority)
+{
+ struct sys_off_handler *handler;
+
+ /*
+ * Platforms like m68k can't allocate sys_off handler dynamically
+ * at the early boot time.
+ */
+ if (priority == SYS_OFF_PRIO_PLATFORM) {
+ handler = &platform_sys_off_handler;
+ if (handler->cb_data)
+ return ERR_PTR(-EBUSY);
+ } else {
+ handler = kzalloc(sizeof(*handler), GFP_KERNEL);
+ if (!handler)
+ return ERR_PTR(-ENOMEM);
+ }
+
+ return handler;
+}
+
+static void free_sys_off_handler(struct sys_off_handler *handler)
+{
+ if (handler == &platform_sys_off_handler)
+ memset(handler, 0, sizeof(*handler));
+ else
+ kfree(handler);
+}
+
/**
* register_sys_off_handler - Register sys-off handler
* @mode: Sys-off mode
@@ -345,9 +376,9 @@ register_sys_off_handler(enum sys_off_mode mode,
struct sys_off_handler *handler;
int err;
- handler = kzalloc(sizeof(*handler), GFP_KERNEL);
- if (!handler)
- return ERR_PTR(-ENOMEM);
+ handler = alloc_sys_off_handler(priority);
+ if (IS_ERR(handler))
+ return handler;
switch (mode) {
case SYS_OFF_MODE_POWER_OFF_PREPARE:
@@ -364,7 +395,7 @@ register_sys_off_handler(enum sys_off_mode mode,
break;
default:
- kfree(handler);
+ free_sys_off_handler(handler);
return ERR_PTR(-EINVAL);
}
@@ -391,7 +422,7 @@ register_sys_off_handler(enum sys_off_mode mode,
}
if (err) {
- kfree(handler);
+ free_sys_off_handler(handler);
return ERR_PTR(err);
}
@@ -422,7 +453,7 @@ void unregister_sys_off_handler(struct sys_off_handler *handler)
/* sanity check, shall never happen */
WARN_ON(err);
- kfree(handler);
+ free_sys_off_handler(handler);
}
EXPORT_SYMBOL_GPL(unregister_sys_off_handler);
next prev parent reply other threads:[~2022-05-31 21:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 23:32 [PATCH v8 00/27] Introduce power-off+restart call chain API Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 01/27] notifier: Add atomic_notifier_call_chain_is_empty() Dmitry Osipenko
2022-05-10 18:14 ` Rafael J. Wysocki
2022-05-11 10:12 ` Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 02/27] notifier: Add blocking/atomic_notifier_chain_register_unique_prio() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 03/27] kernel/reboot: Introduce sys-off handler API Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 04/27] kernel/reboot: Wrap legacy power-off callbacks into sys-off handlers Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 05/27] kernel/reboot: Add do_kernel_power_off() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 06/27] kernel/reboot: Add stub for pm_power_off Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 07/27] kernel/reboot: Add kernel_can_power_off() Dmitry Osipenko
2022-05-24 13:14 ` Geert Uytterhoeven
2022-05-24 13:41 ` Dmitry Osipenko
2022-05-24 15:03 ` Geert Uytterhoeven
2022-05-24 20:16 ` Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 08/27] kernel/reboot: Add register_platform_power_off() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 09/27] ARM: Use do_kernel_power_off() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 10/27] csky: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 11/27] riscv: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 12/27] arm64: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 13/27] parisc: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 14/27] xen/x86: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 15/27] powerpc: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 16/27] m68k: Switch to new sys-off handler API Dmitry Osipenko
2022-05-31 19:04 ` Geert Uytterhoeven
2022-05-31 21:24 ` Dmitry Osipenko [this message]
2022-05-09 23:32 ` [PATCH v8 17/27] sh: Use do_kernel_power_off() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 18/27] x86: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 19/27] ia64: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 20/27] mips: " Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 21/27] memory: emif: Use kernel_can_power_off() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 22/27] ACPI: power: Switch to sys-off handler API Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 23/27] regulator: pfuze100: Use devm_register_sys_off_handler() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 24/27] reboot: Remove pm_power_off_prepare() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 25/27] soc/tegra: pmc: Use sys-off handler API to power off Nexus 7 properly Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 26/27] kernel/reboot: Add devm_register_power_off_handler() Dmitry Osipenko
2022-05-09 23:32 ` [PATCH v8 27/27] kernel/reboot: Add devm_register_restart_handler() Dmitry Osipenko
2022-05-18 14:46 ` [PATCH v8 00/27] Introduce power-off+restart call chain API Rafael J. Wysocki
2022-05-19 10:57 ` Dmitry Osipenko
2022-05-23 18:00 ` Geert Uytterhoeven
2022-05-24 13:43 ` Rafael J. Wysocki
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=a41c323a-5d69-0ff1-d0da-38eb55e1e4db@collabora.com \
--to=dmitry.osipenko@collabora.com \
--cc=James.Bottomley@hansenpartnership.com \
--cc=akpm@linux-foundation.org \
--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=krzk@kernel.org \
--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-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=mingo@redhat.com \
--cc=mirq-linux@rere.qmqm.pl \
--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).