From: Thierry Reding <thierry.reding@gmail.com> To: Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de> Cc: Mark Rutland <mark.rutland@arm.com>, Guenter Roeck <linux@roeck-us.net>, Stefano Stabellini <sstabellini@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler Date: Mon, 30 Jan 2017 12:05:08 +0100 [thread overview] Message-ID: <20170130110512.6943-3-thierry.reding@gmail.com> (raw) In-Reply-To: <20170130110512.6943-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 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 11d9f2898b16..85d678e1d826 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -29,6 +29,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> @@ -191,14 +192,22 @@ static int xen_dying_cpu(unsigned int cpu) return 0; } -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 }; @@ -423,7 +432,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.11.0
WARNING: multiple messages have this Message-ID (diff)
From: thierry.reding@gmail.com (Thierry Reding) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/6] ARM: xen: Register with kernel restart handler Date: Mon, 30 Jan 2017 12:05:08 +0100 [thread overview] Message-ID: <20170130110512.6943-3-thierry.reding@gmail.com> (raw) In-Reply-To: <20170130110512.6943-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 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 11d9f2898b16..85d678e1d826 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -29,6 +29,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> @@ -191,14 +192,22 @@ static int xen_dying_cpu(unsigned int cpu) return 0; } -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 }; @@ -423,7 +432,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.11.0
next prev parent reply other threads:[~2017-01-30 11:05 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-30 11:05 [PATCH 0/6] ARM, arm64: Remove arm_pm_restart() Thierry Reding 2017-01-30 11:05 ` 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 2017-01-30 11:05 ` Thierry Reding [this message] 2017-01-30 11:05 ` [PATCH 2/6] ARM: xen: " Thierry Reding 2017-01-30 11:05 ` [PATCH 3/6] drivers: firmware: psci: " Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` [PATCH 4/6] ARM: " Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` [PATCH 5/6] ARM64: Remove arm_pm_restart() Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` [PATCH 6/6] ARM: " Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2019-09-14 15:25 ` [PATCH 0/6] ARM, arm64: " Guenter Roeck 2019-09-14 15:25 ` Guenter Roeck 2019-09-16 7:49 ` Arnd Bergmann 2019-09-16 7:49 ` Arnd Bergmann 2019-09-16 13:17 ` Guenter Roeck 2019-09-16 13:17 ` Guenter Roeck 2019-09-16 13:49 ` Thierry Reding 2019-09-16 13:49 ` Thierry Reding 2019-09-16 15:43 ` Guenter Roeck 2019-09-16 15:43 ` Guenter Roeck 2019-09-16 15:50 ` Thierry Reding 2019-09-16 15:50 ` Thierry Reding 2019-09-16 16:29 ` Arnd Bergmann 2019-09-16 16:29 ` Arnd Bergmann 2019-09-16 20:28 ` Thierry Reding 2019-09-16 20:28 ` Thierry Reding 2019-09-17 0:41 ` Alexandre Belloni 2019-09-17 0:41 ` Alexandre Belloni 2019-09-17 7:01 ` Arnd Bergmann 2019-09-17 7:01 ` Arnd Bergmann 2019-09-17 13:06 ` Guenter Roeck 2019-09-17 13:06 ` Guenter Roeck -- strict thread matches above, loose matches on Subject: below -- 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) 2016-04-08 12:53 [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck 2016-04-08 12:53 ` [PATCH 2/6] ARM: xen: Register with kernel restart handler 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-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
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=20170130110512.6943-3-thierry.reding@gmail.com \ --to=thierry.reding@gmail.com \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=linux@roeck-us.net \ --cc=mark.rutland@arm.com \ --cc=sstabellini@kernel.org \ --cc=will.deacon@arm.com \ /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: linkBe 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.