From: Thierry Reding <thierry.reding@gmail.com>
To: Russell King <linux@armlinux.org.uk>, arm@kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>,
Guenter Roeck <linux@roeck-us.net>,
Stefan Agner <stefan@agner.ch>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/6] ARM: Register with kernel restart handler
Date: Tue, 15 Oct 2019 16:51:45 +0200 [thread overview]
Message-ID: <20191015145147.1106247-5-thierry.reding@gmail.com> (raw)
In-Reply-To: <20191015145147.1106247-1-thierry.reding@gmail.com>
From: Guenter Roeck <linux@roeck-us.net>
By making use of the kernel restart handler, board specific restart
handlers can be prioritized amongst available mechanisms for a particular
board or system.
Select the default priority of 128 to indicate that the restart callback
in the machine description is the default restart mechanism.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
arch/arm/kernel/setup.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index d0a464e317ea..d403648195de 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1073,6 +1073,20 @@ void __init hyp_mode_check(void)
#endif
}
+static void (*__arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
+
+static int arm_restart(struct notifier_block *nb, unsigned long action,
+ void *data)
+{
+ __arm_pm_restart(action, data);
+ return NOTIFY_DONE;
+}
+
+static struct notifier_block arm_restart_nb = {
+ .notifier_call = arm_restart,
+ .priority = 128,
+};
+
void __init setup_arch(char **cmdline_p)
{
const struct machine_desc *mdesc;
@@ -1132,8 +1146,10 @@ void __init setup_arch(char **cmdline_p)
paging_init(mdesc);
request_standard_resources(mdesc);
- if (mdesc->restart)
- arm_pm_restart = mdesc->restart;
+ if (mdesc->restart) {
+ __arm_pm_restart = mdesc->restart;
+ register_restart_handler(&arm_restart_nb);
+ }
unflatten_device_tree();
--
2.23.0
next prev parent reply other threads:[~2019-10-15 14:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 14:51 [PATCH 0/6] ARM/arm64: arm_pm_restart removal Thierry Reding
2019-10-15 14:51 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Thierry Reding
2019-10-15 14:51 ` [PATCH 2/6] ARM: xen: " Thierry Reding
[not found] ` <CAF2Aj3hbW7+pNp+_jnMVL8zeSxAvSbV1ZFZ_4PAUj6J0TxMk7g@mail.gmail.com>
2021-06-03 13:11 ` Guenter Roeck
2021-06-03 13:38 ` Lee Jones
2021-06-03 13:48 ` Boris Ostrovsky
2021-06-03 13:56 ` Russell King (Oracle)
2021-06-03 14:03 ` Lee Jones
2021-06-03 14:10 ` Russell King (Oracle)
2021-06-03 14:20 ` Thierry Reding
2021-06-03 13:45 ` Russell King (Oracle)
2019-10-15 14:51 ` [PATCH 3/6] drivers: firmware: psci: " Thierry Reding
2019-10-16 7:46 ` Stefan Agner
2019-10-15 14:51 ` Thierry Reding [this message]
2019-10-15 14:51 ` [PATCH 5/6] ARM64: Remove arm_pm_restart() Thierry Reding
2019-10-15 14:51 ` [PATCH 6/6] ARM: " Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2017-01-30 11:05 [PATCH 0/6] ARM, arm64: " Thierry Reding
2017-01-30 11:05 ` [PATCH 4/6] ARM: Register with kernel restart handler Thierry Reding
2016-04-08 12:53 [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck
2016-04-08 12:53 ` [PATCH 4/6] ARM: Register with kernel restart handler Guenter Roeck
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=20191015145147.1106247-5-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@roeck-us.net \
--cc=lorenzo.pieralisi@arm.com \
--cc=olof@lixom.net \
--cc=stefan@agner.ch \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wsa+renesas@sang-engineering.com \
/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).