All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Barry Song <baohua@kernel.org>
Subject: [PATCH 1/6] ARM: prima2: Register with kernel restart handler
Date: Fri,  8 Apr 2016 05:53:54 -0700	[thread overview]
Message-ID: <1460120039-2497-2-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1460120039-2497-1-git-send-email-linux@roeck-us.net>

Register with kernel restart handler instead of setting arm_pm_restart
directly. By doing this, the prima2 reset handler can be prioritized
among other restart methods available on a particular board.

Select a high priority of 192 since the original code overwrites the
default arm restart handler.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 arch/arm/mach-prima2/rstc.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c
index 7c251eb11d01..1639997c5b49 100644
--- a/arch/arm/mach-prima2/rstc.c
+++ b/arch/arm/mach-prima2/rstc.c
@@ -65,11 +65,18 @@ static struct reset_controller_dev sirfsoc_reset_controller = {
 
 #define SIRFSOC_SYS_RST_BIT  BIT(31)
 
-static void sirfsoc_restart(enum reboot_mode mode, const char *cmd)
+static int sirfsoc_restart(struct notifier_block *nb, unsigned long action,
+			   void *data)
 {
 	writel(SIRFSOC_SYS_RST_BIT, sirfsoc_rstc_base);
+	return NOTIFY_DONE;
 }
 
+static struct notifier_block sirfsoc_restart_nb = {
+	.notifier_call  = sirfsoc_restart,
+	.priority       = 192,
+};
+
 static int sirfsoc_rstc_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
@@ -80,7 +87,7 @@ static int sirfsoc_rstc_probe(struct platform_device *pdev)
 	}
 
 	sirfsoc_reset_controller.of_node = np;
-	arm_pm_restart = sirfsoc_restart;
+	register_restart_handler(&sirfsoc_restart_nb);
 
 	if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
 		reset_controller_register(&sirfsoc_reset_controller);
-- 
2.5.0

WARNING: multiple messages have this Message-ID
From: linux@roeck-us.net (Guenter Roeck)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/6] ARM: prima2: Register with kernel restart handler
Date: Fri,  8 Apr 2016 05:53:54 -0700	[thread overview]
Message-ID: <1460120039-2497-2-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1460120039-2497-1-git-send-email-linux@roeck-us.net>

Register with kernel restart handler instead of setting arm_pm_restart
directly. By doing this, the prima2 reset handler can be prioritized
among other restart methods available on a particular board.

Select a high priority of 192 since the original code overwrites the
default arm restart handler.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 arch/arm/mach-prima2/rstc.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c
index 7c251eb11d01..1639997c5b49 100644
--- a/arch/arm/mach-prima2/rstc.c
+++ b/arch/arm/mach-prima2/rstc.c
@@ -65,11 +65,18 @@ static struct reset_controller_dev sirfsoc_reset_controller = {
 
 #define SIRFSOC_SYS_RST_BIT  BIT(31)
 
-static void sirfsoc_restart(enum reboot_mode mode, const char *cmd)
+static int sirfsoc_restart(struct notifier_block *nb, unsigned long action,
+			   void *data)
 {
 	writel(SIRFSOC_SYS_RST_BIT, sirfsoc_rstc_base);
+	return NOTIFY_DONE;
 }
 
+static struct notifier_block sirfsoc_restart_nb = {
+	.notifier_call  = sirfsoc_restart,
+	.priority       = 192,
+};
+
 static int sirfsoc_rstc_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
@@ -80,7 +87,7 @@ static int sirfsoc_rstc_probe(struct platform_device *pdev)
 	}
 
 	sirfsoc_reset_controller.of_node = np;
-	arm_pm_restart = sirfsoc_restart;
+	register_restart_handler(&sirfsoc_restart_nb);
 
 	if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
 		reset_controller_register(&sirfsoc_reset_controller);
-- 
2.5.0

  reply	other threads:[~2016-04-08 12:54 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-08 12:53 [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck
2016-04-08 12:53 ` Guenter Roeck
2016-04-08 12:53 ` Guenter Roeck [this message]
2016-04-08 12:53   ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Guenter Roeck
2016-04-08 12:53 ` [PATCH 2/6] ARM: xen: " Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 15:22   ` Konrad Rzeszutek Wilk
2016-04-08 18:20     ` Guenter Roeck
2016-04-08 18:20     ` [Xen-devel] " Guenter Roeck
2016-04-08 18:20       ` Guenter Roeck
2016-04-09 23:46   ` Stefano Stabellini
2016-04-09 23:46     ` Stefano Stabellini
2016-04-09 23:56     ` Stefano Stabellini
2016-04-09 23:56       ` Stefano Stabellini
2016-04-09 23:56     ` Stefano Stabellini
2016-04-09 23:46   ` Stefano Stabellini
2016-04-08 12:53 ` [PATCH 3/6] ARM: PSCI: " Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-12 15:36   ` Wolfram Sang
2016-04-12 15:36     ` Wolfram Sang
2016-04-13 11:05   ` Mark Rutland
2016-04-13 11:05     ` Mark Rutland
2016-04-13 11:24     ` Jisheng Zhang
2016-04-13 11:24       ` Jisheng Zhang
2016-04-13 13:10     ` Guenter Roeck
2016-04-13 13:10       ` Guenter Roeck
2016-04-13 13:22       ` Geert Uytterhoeven
2016-04-13 13:22         ` Geert Uytterhoeven
2016-04-14  0:42         ` Guenter Roeck
2016-04-14  0:42           ` Guenter Roeck
2016-04-14  8:52           ` Wolfram Sang
2016-04-14  8:52             ` Wolfram Sang
2016-04-14 13:21             ` Guenter Roeck
2016-04-14 13:21               ` Guenter Roeck
2016-04-14 14:31               ` Wolfram Sang
2016-04-14 14:31                 ` Wolfram Sang
2016-04-08 12:53 ` [PATCH 4/6] ARM: " Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 12:53 ` [PATCH 5/6] ARM64: Remove arm_pm_restart Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-12 13:10   ` Catalin Marinas
2016-04-12 13:10     ` Catalin Marinas
2016-04-08 12:53 ` [PATCH 6/6] ARM: " Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 15:44 ` [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang
2016-04-08 15:44   ` Wolfram Sang
2016-04-08 20:46 ` Arnd Bergmann
2016-04-08 20:46   ` Arnd Bergmann
2016-04-12 15:41 ` Wolfram Sang
2016-04-12 15:41   ` Wolfram Sang
2017-01-30 11:05 [PATCH 0/6] ARM, arm64: Remove arm_pm_restart() Thierry Reding
2017-01-30 11:05 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Thierry Reding
2017-01-30 11:05   ` Thierry Reding
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   ` Thierry Reding

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=1460120039-2497-2-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=baohua@kernel.org \
    --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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.