Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1374212

[PATCH 3/6] ARM: PSCI: Register with kernel restart handler

Show all headers | View raw

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.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
It might make sense to introduce a restart-priority property for devicetree
based configurations, but I am not sure if this would be acceptable.

 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..99fab3ac3fd5 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 *np, 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
    Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-12 17:40 +0200
    Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Mark Rutland <mark.rutland@arm.com> - 2016-04-13 13:10 +0200
      Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Jisheng Zhang <jszhang@marvell.com> - 2016-04-13 13:40 +0200
      Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-13 15:20 +0200
        Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Geert Uytterhoeven <geert@linux-m68k.org> - 2016-04-13 15:30 +0200
          Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-14 02:50 +0200
            Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-14 11:00 +0200
              Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-14 15:30 +0200
                Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-14 16:40 +0200
  [PATCH 1/6] ARM: prima2: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 6/6] ARM: Remove arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 4/6] ARM: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 5/6] ARM64: Remove arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
    Re: [PATCH 5/6] ARM64: Remove arm_pm_restart Catalin Marinas <catalin.marinas@arm.com> - 2016-04-12 15:20 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang <wsa@the-dreams.de> - 2016-04-08 17:50 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Arnd Bergmann <arnd@arndb.de> - 2016-04-08 22:50 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang <wsa@the-dreams.de> - 2016-04-12 17:50 +0200

csiph-web