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>,
	Stefano Stabellini <sstabellini@kernel.org>,
	xen-devel@lists.xenproject.org
Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler
Date: Fri,  8 Apr 2016 05:53:55 -0700	[thread overview]
Message-ID: <1460120039-2497-3-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.

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

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

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 75cd7345c654..76a1d12fd27e 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -27,6 +27,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>
@@ -193,14 +194,22 @@ after_register_vcpu_info:
 	put_cpu();
 }
 
-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)
 {
 	struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
 	int rc;
 	rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
 	BUG_ON(rc);
+
+	return NOTIFY_DONE;
 }
 
+static struct notifier_block xen_restart_nb = {
+	.notifier_call = xen_restart,
+	.priority = 192,
+};
+
 static void xen_power_off(void)
 {
 	struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };
@@ -370,7 +379,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.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 2/6] ARM: xen: Register with kernel restart handler
Date: Fri,  8 Apr 2016 05:53:55 -0700	[thread overview]
Message-ID: <1460120039-2497-3-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.

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

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

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 75cd7345c654..76a1d12fd27e 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -27,6 +27,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>
@@ -193,14 +194,22 @@ after_register_vcpu_info:
 	put_cpu();
 }
 
-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)
 {
 	struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
 	int rc;
 	rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
 	BUG_ON(rc);
+
+	return NOTIFY_DONE;
 }
 
+static struct notifier_block xen_restart_nb = {
+	.notifier_call = xen_restart,
+	.priority = 192,
+};
+
 static void xen_power_off(void)
 {
 	struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };
@@ -370,7 +379,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.5.0

WARNING: multiple messages have this Message-ID
From: Guenter Roeck <linux@roeck-us.net>
To: Russell King <linux@arm.linux.org.uk>,
	Catalin Marinas <catalin.marinas@arm.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>,
	Wolfram Sang <wsa@the-dreams.de>,
	linux-kernel@vger.kernel.org,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	linux-arm-kernel@lists.infradead.org,
	xen-devel@lists.xenproject.org,
	Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler
Date: Fri,  8 Apr 2016 05:53:55 -0700	[thread overview]
Message-ID: <1460120039-2497-3-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.

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

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

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 75cd7345c654..76a1d12fd27e 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -27,6 +27,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>
@@ -193,14 +194,22 @@ after_register_vcpu_info:
 	put_cpu();
 }
 
-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)
 {
 	struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
 	int rc;
 	rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
 	BUG_ON(rc);
+
+	return NOTIFY_DONE;
 }
 
+static struct notifier_block xen_restart_nb = {
+	.notifier_call = xen_restart,
+	.priority = 192,
+};
+
 static void xen_power_off(void)
 {
 	struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };
@@ -370,7 +379,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.5.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

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

Thread overview: 71+ 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 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Guenter Roeck
2016-04-08 12:53   ` Guenter Roeck
2016-04-08 12:53 ` Guenter Roeck [this message]
2016-04-08 12:53   ` [PATCH 2/6] ARM: xen: " 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 2/6] ARM: xen: 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 2/6] ARM: xen: Register with kernel restart handler Thierry Reding
2019-10-15 14:51   ` Thierry Reding
     [not found]   ` <CAF2Aj3hbW7+pNp+_jnMVL8zeSxAvSbV1ZFZ_4PAUj6J0TxMk7g@mail.gmail.com>
2021-06-03 13:11     ` Guenter Roeck
2021-06-03 13:11       ` Guenter Roeck
2021-06-03 13:38       ` Lee Jones
2021-06-03 13:38         ` Lee Jones
2021-06-03 13:48         ` Boris Ostrovsky
2021-06-03 13:48           ` Boris Ostrovsky
2021-06-03 13:56           ` Russell King (Oracle)
2021-06-03 13:56             ` Russell King (Oracle)
2021-06-03 14:03             ` Lee Jones
2021-06-03 14:03               ` Lee Jones
2021-06-03 14:10               ` Russell King (Oracle)
2021-06-03 14:10                 ` Russell King (Oracle)
2021-06-03 14:20               ` Thierry Reding
2021-06-03 14:20                 ` Thierry Reding
2021-06-03 13:45       ` Russell King (Oracle)
2021-06-03 13:45         ` Russell King (Oracle)

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-3-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=sstabellini@kernel.org \
    --cc=wsa@the-dreams.de \
    --cc=xen-devel@lists.xenproject.org \
    /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.