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

From: Thierry Reding <thierry.reding@gmail•com>
To: Russell King <linux@armlinux•org.uk>, arm@kernel•org
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm•com>,
	Arnd Bergmann <arnd@arndb•de>,
	Stefano Stabellini <stefano.stabellini@eu•citrix.com>,
	Catalin Marinas <catalin.marinas@arm•com>,
	linux-kernel@vger•kernel.org, Stefan Agner <stefan@agner•ch>,
	Wolfram Sang <wsa+renesas@sang-engineering•com>,
	linux-arm-kernel@lists•infradead.org,
	Olof Johansson <olof@lixom•net>,
	Guenter Roeck <linux@roeck-us•net>
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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
