[PATCH 2/6] ARM: xen: 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 2/6] ARM: xen: Register with kernel restart handler
Date: Tue, 15 Oct 2019 16:51:43 +0200	[thread overview]
Message-ID: <20191015145147.1106247-3-thierry.reding@gmail.com> (raw)
In-Reply-To: <20191015145147.1106247-1-thierry.reding@gmail.com>

From: Guenter Roeck <linux@roeck-us•net>

Register with kernel restart handler instead of setting arm_pm_restart
directly.

Select a high priority of 192 to ensure that default restart handlers
are replaced if Xen is running.

Acked-by: Arnd Bergmann <arnd@arndb•de>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering•com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu•citrix.com>
Signed-off-by: Guenter Roeck <linux@roeck-us•net>
Signed-off-by: Thierry Reding <treding@nvidia•com>
---
 arch/arm/xen/enlighten.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 1e57692552d9..eb0a0edb9909 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -30,6 +30,7 @@
 #include <linux/cpu.h>
 #include <linux/console.h>
 #include <linux/pvclock_gtod.h>
+#include <linux/reboot.h>
 #include <linux/time64.h>
 #include <linux/timekeeping.h>
 #include <linux/timekeeper_internal.h>
@@ -181,11 +182,18 @@ void xen_reboot(int reason)
 	BUG_ON(rc);
 }
 
-static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)
+static int xen_restart(struct notifier_block *nb, unsigned long action,
+		       void *data)
 {
 	xen_reboot(SHUTDOWN_reboot);
+
+	return NOTIFY_DONE;
 }
 
+static struct notifier_block xen_restart_nb = {
+	.notifier_call = xen_restart,
+	.priority = 192,
+};
 
 static void xen_power_off(void)
 {
@@ -406,7 +414,7 @@ static int __init xen_pm_init(void)
 		return -ENODEV;
 
 	pm_power_off = xen_power_off;
-	arm_pm_restart = xen_restart;
+	register_restart_handler(&xen_restart_nb);
 	if (!xen_initial_domain()) {
 		struct timespec64 ts;
 		xen_read_wallclock(&ts);
-- 
2.23.0


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