From: Guenter Roeck <linux@roeck-us.net>
To: Russell King <linux@arm.linux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: Wolfram Sang <wsa@the-dreams.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v2 3/6] ARM: PSCI: Register with kernel restart handler
Date: Thu, 14 Apr 2016 19:42:34 -0700 [thread overview]
Message-ID: <1460688157-6551-4-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1460688157-6551-1-git-send-email-linux@roeck-us.net>
Register with kernel restart handler instead of setting arm_pm_restart
directly. This enables support for replacing the PSCI restart handler
with a different handler if necessary for a specific board.
Select a priority of 129 to indicate a higher than default priority, but
keep it as low as possible since PSCI reset is known to fail on some
boards.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v2: Rebased to v4.6-rc3, added Reviewed/by/Acked-by/Tested-by tags
Variable name change: np -> nb
drivers/firmware/psci.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 11bfee8b79a9..a0f71480f145 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -231,11 +231,18 @@ static int get_set_conduit_method(struct device_node *np)
return 0;
}
-static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
+static int psci_sys_reset(struct notifier_block *nb, unsigned long action,
+ void *data)
{
invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);
+ return NOTIFY_DONE;
}
+static struct notifier_block psci_sys_reset_nb = {
+ .notifier_call = psci_sys_reset,
+ .priority = 129,
+};
+
static void psci_sys_poweroff(void)
{
invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0);
@@ -461,7 +468,7 @@ static void __init psci_0_2_set_functions(void)
psci_ops.migrate_info_type = psci_migrate_info_type;
- arm_pm_restart = psci_sys_reset;
+ register_restart_handler(&psci_sys_reset_nb);
pm_power_off = psci_sys_poweroff;
}
--
2.5.0
next prev parent reply other threads:[~2016-04-15 2:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-15 2:42 [PATCH v2 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck
2016-04-15 2:42 ` [PATCH v2 1/6] ARM: prima2: Register with kernel restart handler Guenter Roeck
2016-04-15 2:42 ` [PATCH v2 2/6] ARM: xen: " Guenter Roeck
2016-04-15 18:22 ` Stefano Stabellini
2016-04-15 19:35 ` Guenter Roeck
2016-04-15 21:10 ` Stefano Stabellini
2016-04-15 2:42 ` Guenter Roeck [this message]
2016-04-19 15:47 ` [PATCH v2 3/6] ARM: PSCI: " Lorenzo Pieralisi
2016-04-15 2:42 ` [PATCH v2 4/6] ARM: " Guenter Roeck
2016-04-15 2:42 ` [PATCH v2 5/6] ARM64: Remove arm_pm_restart Guenter Roeck
2016-04-15 2:42 ` [PATCH v2 6/6] ARM: " 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=1460688157-6551-4-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=catalin.marinas@arm.com \
--cc=geert@linux-m68k.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=wsa@the-dreams.de \
/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).