Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1374201 > unrolled thread
| Started by | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| First post | 2016-04-08 15:00 +0200 |
| Last post | 2016-04-10 02:00 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 2/6] ARM: xen: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
Re: [Xen-devel] [PATCH 2/6] ARM: xen: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 20:30 +0200
Re: [PATCH 2/6] ARM: xen: Register with kernel restart handler Stefano Stabellini <sstabellini@kernel.org> - 2016-04-10 01:50 +0200
Re: [PATCH 2/6] ARM: xen: Register with kernel restart handler Stefano Stabellini <sstabellini@kernel.org> - 2016-04-10 02:00 +0200
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2016-04-08 15:00 +0200 |
| Subject | [PATCH 2/6] ARM: xen: Register with kernel restart handler |
| Message-ID | <rlEb0-3RN-13@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2016-04-08 20:30 +0200 |
| Subject | Re: [Xen-devel] [PATCH 2/6] ARM: xen: Register with kernel restart handler |
| Message-ID | <rlJkm-82k-21@gated-at.bofh.it> |
| In reply to | #1374201 |
On Fri, Apr 08, 2016 at 11:22:57AM -0400, Konrad Rzeszutek Wilk wrote:
> On Fri, Apr 08, 2016 at 05:53:55AM -0700, Guenter Roeck wrote:
> > Register with kernel restart handler instead of setting arm_pm_restart
> > directly.
> >
> > Select a high priority of 192 to ensure that default restart handlers
>
> Is there some macro for that magic value?
>
No, only guidelines in kernel/reboot.c.
Guenter
> > 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
[toc] | [prev] | [next] | [standalone]
| From | Stefano Stabellini <sstabellini@kernel.org> |
|---|---|
| Date | 2016-04-10 01:50 +0200 |
| Message-ID | <rmaNz-4mk-3@gated-at.bofh.it> |
| In reply to | #1374201 |
On Fri, 8 Apr 2016, Guenter Roeck wrote:
> 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>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.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 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
>
[toc] | [prev] | [next] | [standalone]
| From | Stefano Stabellini <sstabellini@kernel.org> |
|---|---|
| Date | 2016-04-10 02:00 +0200 |
| Message-ID | <rmaXf-4qS-5@gated-at.bofh.it> |
| In reply to | #1374682 |
On Sat, 9 Apr 2016, Stefano Stabellini wrote:
> On Fri, 8 Apr 2016, Guenter Roeck wrote:
> > 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>
>
> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
and queued for 4.7
>
> > 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
> >
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web