* [PATCH] arm64: support reboot and power off via EFI runtime
@ 2014-06-17 16:45 Mark Salter
2014-06-18 13:26 ` Mark Rutland
2014-06-18 14:09 ` Rob Herring
0 siblings, 2 replies; 6+ messages in thread
From: Mark Salter @ 2014-06-17 16:45 UTC (permalink / raw)
To: linux-arm-kernel
Add handlers for arm_pm_resestart and pm_power_off which use EFI
runtime services ResetSystem call to perform the functions. These
handlers are only installed if no handler currently exists. This
allows PSCI to take priority over EFI for these functions.
Signed-off-by: Mark Salter <msalter@redhat.com>
---
arch/arm64/kernel/efi.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index 14db1f6..e8c0476 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -19,11 +19,14 @@
#include <linux/of_fdt.h>
#include <linux/sched.h>
#include <linux/slab.h>
+#include <linux/reboot.h>
+#include <linux/pm.h>
#include <asm/cacheflush.h>
#include <asm/efi.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
+#include <asm/system_misc.h>
struct efi_memory_map memmap;
@@ -467,3 +470,40 @@ static int __init arm64_enter_virtual_mode(void)
return 0;
}
early_initcall(arm64_enter_virtual_mode);
+
+static void efi_restart(enum reboot_mode reboot_mode, const char *cmd)
+{
+ int efi_mode;
+
+ switch (reboot_mode) {
+ case REBOOT_WARM:
+ case REBOOT_SOFT:
+ efi_mode = EFI_RESET_WARM;
+ break;
+ default:
+ efi_mode = EFI_RESET_COLD;
+ break;
+ }
+ efi.reset_system(efi_mode, 0, 0, NULL);
+}
+
+static void efi_power_off(void)
+{
+ efi.reset_system(EFI_RESET_SHUTDOWN, 0, 0, NULL);
+}
+
+static int __init setup_efi_reset(void)
+{
+ if (efi_enabled(EFI_RUNTIME_SERVICES)) {
+ /*
+ * If something (psci, etc) hasn't already registered
+ * a handler, use EFI.
+ */
+ if (arm_pm_restart == NULL)
+ arm_pm_restart = efi_restart;
+ if (pm_power_off == NULL)
+ pm_power_off = efi_power_off;
+ }
+ return 0;
+}
+pure_initcall(setup_efi_reset);
--
1.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] arm64: support reboot and power off via EFI runtime
2014-06-17 16:45 [PATCH] arm64: support reboot and power off via EFI runtime Mark Salter
@ 2014-06-18 13:26 ` Mark Rutland
2014-06-18 13:52 ` Mark Salter
2014-06-18 14:09 ` Rob Herring
1 sibling, 1 reply; 6+ messages in thread
From: Mark Rutland @ 2014-06-18 13:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mark,
On Tue, Jun 17, 2014 at 05:45:14PM +0100, Mark Salter wrote:
> Add handlers for arm_pm_resestart and pm_power_off which use EFI
> runtime services ResetSystem call to perform the functions. These
> handlers are only installed if no handler currently exists. This
> allows PSCI to take priority over EFI for these functions.
>
> Signed-off-by: Mark Salter <msalter@redhat.com>
> ---
> arch/arm64/kernel/efi.c | 40 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 40 insertions(+)
>
> diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
> index 14db1f6..e8c0476 100644
> --- a/arch/arm64/kernel/efi.c
> +++ b/arch/arm64/kernel/efi.c
> @@ -19,11 +19,14 @@
> #include <linux/of_fdt.h>
> #include <linux/sched.h>
> #include <linux/slab.h>
> +#include <linux/reboot.h>
> +#include <linux/pm.h>
>
> #include <asm/cacheflush.h>
> #include <asm/efi.h>
> #include <asm/tlbflush.h>
> #include <asm/mmu_context.h>
> +#include <asm/system_misc.h>
>
> struct efi_memory_map memmap;
>
> @@ -467,3 +470,40 @@ static int __init arm64_enter_virtual_mode(void)
> return 0;
> }
> early_initcall(arm64_enter_virtual_mode);
> +
> +static void efi_restart(enum reboot_mode reboot_mode, const char *cmd)
> +{
> + int efi_mode;
> +
> + switch (reboot_mode) {
> + case REBOOT_WARM:
> + case REBOOT_SOFT:
> + efi_mode = EFI_RESET_WARM;
> + break;
> + default:
> + efi_mode = EFI_RESET_COLD;
> + break;
> + }
> + efi.reset_system(efi_mode, 0, 0, NULL);
> +}
> +
> +static void efi_power_off(void)
> +{
> + efi.reset_system(EFI_RESET_SHUTDOWN, 0, 0, NULL);
> +}
> +
> +static int __init setup_efi_reset(void)
> +{
> + if (efi_enabled(EFI_RUNTIME_SERVICES)) {
> + /*
> + * If something (psci, etc) hasn't already registered
> + * a handler, use EFI.
> + */
> + if (arm_pm_restart == NULL)
> + arm_pm_restart = efi_restart;
> + if (pm_power_off == NULL)
> + pm_power_off = efi_power_off;
> + }
> + return 0;
> +}
> +pure_initcall(setup_efi_reset);
This doesn't seem to match the definition of a pure initcall, given that
it depends on the state of EFI runtime services and
arm_{pm_restart,power_off}.
Is there any reason this needs to run so early? Can this not be
called later, when we have more of a guarantee of other reboot /
shutdown mechanisms having been registered?
Cheers,
Mark.
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] arm64: support reboot and power off via EFI runtime
2014-06-18 13:26 ` Mark Rutland
@ 2014-06-18 13:52 ` Mark Salter
0 siblings, 0 replies; 6+ messages in thread
From: Mark Salter @ 2014-06-18 13:52 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2014-06-18 at 14:26 +0100, Mark Rutland wrote:
> Hi Mark,
>
> On Tue, Jun 17, 2014 at 05:45:14PM +0100, Mark Salter wrote:
> > Add handlers for arm_pm_resestart and pm_power_off which use EFI
> > runtime services ResetSystem call to perform the functions. These
> > handlers are only installed if no handler currently exists. This
> > allows PSCI to take priority over EFI for these functions.
> >
> > Signed-off-by: Mark Salter <msalter@redhat.com>
> > ---
> > arch/arm64/kernel/efi.c | 40 ++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 40 insertions(+)
> >
> > diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
> > index 14db1f6..e8c0476 100644
> > --- a/arch/arm64/kernel/efi.c
> > +++ b/arch/arm64/kernel/efi.c
> > @@ -19,11 +19,14 @@
> > #include <linux/of_fdt.h>
> > #include <linux/sched.h>
> > #include <linux/slab.h>
> > +#include <linux/reboot.h>
> > +#include <linux/pm.h>
> >
> > #include <asm/cacheflush.h>
> > #include <asm/efi.h>
> > #include <asm/tlbflush.h>
> > #include <asm/mmu_context.h>
> > +#include <asm/system_misc.h>
> >
> > struct efi_memory_map memmap;
> >
> > @@ -467,3 +470,40 @@ static int __init arm64_enter_virtual_mode(void)
> > return 0;
> > }
> > early_initcall(arm64_enter_virtual_mode);
> > +
> > +static void efi_restart(enum reboot_mode reboot_mode, const char *cmd)
> > +{
> > + int efi_mode;
> > +
> > + switch (reboot_mode) {
> > + case REBOOT_WARM:
> > + case REBOOT_SOFT:
> > + efi_mode = EFI_RESET_WARM;
> > + break;
> > + default:
> > + efi_mode = EFI_RESET_COLD;
> > + break;
> > + }
> > + efi.reset_system(efi_mode, 0, 0, NULL);
> > +}
> > +
> > +static void efi_power_off(void)
> > +{
> > + efi.reset_system(EFI_RESET_SHUTDOWN, 0, 0, NULL);
> > +}
> > +
> > +static int __init setup_efi_reset(void)
> > +{
> > + if (efi_enabled(EFI_RUNTIME_SERVICES)) {
> > + /*
> > + * If something (psci, etc) hasn't already registered
> > + * a handler, use EFI.
> > + */
> > + if (arm_pm_restart == NULL)
> > + arm_pm_restart = efi_restart;
> > + if (pm_power_off == NULL)
> > + pm_power_off = efi_power_off;
> > + }
> > + return 0;
> > +}
> > +pure_initcall(setup_efi_reset);
>
> This doesn't seem to match the definition of a pure initcall, given that
> it depends on the state of EFI runtime services and
> arm_{pm_restart,power_off}.
>
> Is there any reason this needs to run so early? Can this not be
> called later, when we have more of a guarantee of other reboot /
> shutdown mechanisms having been registered?
>
I used pure_initcall because that was the earliest EFI runtime services
would be available (runtime services set up with early_initcall). I was
thinking this was after psci would have a chance to set handlers and
other hw specific drivers could come later and override. But now that
you mention it, there is no reason this couldn't come much later in boot
so that the EFI handlers are a last resort.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] arm64: support reboot and power off via EFI runtime
2014-06-17 16:45 [PATCH] arm64: support reboot and power off via EFI runtime Mark Salter
2014-06-18 13:26 ` Mark Rutland
@ 2014-06-18 14:09 ` Rob Herring
2014-06-18 14:41 ` Mark Salter
1 sibling, 1 reply; 6+ messages in thread
From: Rob Herring @ 2014-06-18 14:09 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jun 17, 2014 at 11:45 AM, Mark Salter <msalter@redhat.com> wrote:
> Add handlers for arm_pm_resestart and pm_power_off which use EFI
typo.
> runtime services ResetSystem call to perform the functions. These
> handlers are only installed if no handler currently exists. This
> allows PSCI to take priority over EFI for these functions.
>
> Signed-off-by: Mark Salter <msalter@redhat.com>
> ---
> arch/arm64/kernel/efi.c | 40 ++++++++++++++++++++++++++++++++++++++++
Where's the arm32 version? Surely this could be shared with all
arches. pm_power_off is at least architecturally independent. We
should do the same for restart/reboot. I'm not saying do that now, but
at least put it in the right place for that to happen.
Rob
> 1 file changed, 40 insertions(+)
>
> diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
> index 14db1f6..e8c0476 100644
> --- a/arch/arm64/kernel/efi.c
> +++ b/arch/arm64/kernel/efi.c
> @@ -19,11 +19,14 @@
> #include <linux/of_fdt.h>
> #include <linux/sched.h>
> #include <linux/slab.h>
> +#include <linux/reboot.h>
> +#include <linux/pm.h>
>
> #include <asm/cacheflush.h>
> #include <asm/efi.h>
> #include <asm/tlbflush.h>
> #include <asm/mmu_context.h>
> +#include <asm/system_misc.h>
>
> struct efi_memory_map memmap;
>
> @@ -467,3 +470,40 @@ static int __init arm64_enter_virtual_mode(void)
> return 0;
> }
> early_initcall(arm64_enter_virtual_mode);
> +
> +static void efi_restart(enum reboot_mode reboot_mode, const char *cmd)
> +{
> + int efi_mode;
> +
> + switch (reboot_mode) {
> + case REBOOT_WARM:
> + case REBOOT_SOFT:
> + efi_mode = EFI_RESET_WARM;
> + break;
> + default:
> + efi_mode = EFI_RESET_COLD;
> + break;
> + }
> + efi.reset_system(efi_mode, 0, 0, NULL);
> +}
> +
> +static void efi_power_off(void)
> +{
> + efi.reset_system(EFI_RESET_SHUTDOWN, 0, 0, NULL);
> +}
> +
> +static int __init setup_efi_reset(void)
> +{
> + if (efi_enabled(EFI_RUNTIME_SERVICES)) {
> + /*
> + * If something (psci, etc) hasn't already registered
> + * a handler, use EFI.
> + */
> + if (arm_pm_restart == NULL)
> + arm_pm_restart = efi_restart;
> + if (pm_power_off == NULL)
> + pm_power_off = efi_power_off;
> + }
> + return 0;
> +}
> +pure_initcall(setup_efi_reset);
> --
> 1.9.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] arm64: support reboot and power off via EFI runtime
2014-06-18 14:09 ` Rob Herring
@ 2014-06-18 14:41 ` Mark Salter
2014-06-18 15:53 ` Matt Fleming
0 siblings, 1 reply; 6+ messages in thread
From: Mark Salter @ 2014-06-18 14:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2014-06-18 at 09:09 -0500, Rob Herring wrote:
> On Tue, Jun 17, 2014 at 11:45 AM, Mark Salter <msalter@redhat.com> wrote:
> > Add handlers for arm_pm_resestart and pm_power_off which use EFI
>
> typo.
>
> > runtime services ResetSystem call to perform the functions. These
> > handlers are only installed if no handler currently exists. This
> > allows PSCI to take priority over EFI for these functions.
> >
> > Signed-off-by: Mark Salter <msalter@redhat.com>
> > ---
> > arch/arm64/kernel/efi.c | 40 ++++++++++++++++++++++++++++++++++++++++
>
> Where's the arm32 version? Surely this could be shared with all
> arches. pm_power_off is at least architecturally independent. We
> should do the same for restart/reboot. I'm not saying do that now, but
> at least put it in the right place for that to happen.
>
> Rob
Good point. So the right place would be drivers/firmware/efi I think.
Add a CONFIG_EFI_RESET with default off. I suppose we could also
go ahead and s/arm_pm_restart/pm_restart/ kernel-wide or have an
ifdef in the code (or depends on ARM64 || ARM in Kconfig) until we
do so.
[Matt Fleming CC'd]
>
> > 1 file changed, 40 insertions(+)
> >
> > diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
> > index 14db1f6..e8c0476 100644
> > --- a/arch/arm64/kernel/efi.c
> > +++ b/arch/arm64/kernel/efi.c
> > @@ -19,11 +19,14 @@
> > #include <linux/of_fdt.h>
> > #include <linux/sched.h>
> > #include <linux/slab.h>
> > +#include <linux/reboot.h>
> > +#include <linux/pm.h>
> >
> > #include <asm/cacheflush.h>
> > #include <asm/efi.h>
> > #include <asm/tlbflush.h>
> > #include <asm/mmu_context.h>
> > +#include <asm/system_misc.h>
> >
> > struct efi_memory_map memmap;
> >
> > @@ -467,3 +470,40 @@ static int __init arm64_enter_virtual_mode(void)
> > return 0;
> > }
> > early_initcall(arm64_enter_virtual_mode);
> > +
> > +static void efi_restart(enum reboot_mode reboot_mode, const char *cmd)
> > +{
> > + int efi_mode;
> > +
> > + switch (reboot_mode) {
> > + case REBOOT_WARM:
> > + case REBOOT_SOFT:
> > + efi_mode = EFI_RESET_WARM;
> > + break;
> > + default:
> > + efi_mode = EFI_RESET_COLD;
> > + break;
> > + }
> > + efi.reset_system(efi_mode, 0, 0, NULL);
> > +}
> > +
> > +static void efi_power_off(void)
> > +{
> > + efi.reset_system(EFI_RESET_SHUTDOWN, 0, 0, NULL);
> > +}
> > +
> > +static int __init setup_efi_reset(void)
> > +{
> > + if (efi_enabled(EFI_RUNTIME_SERVICES)) {
> > + /*
> > + * If something (psci, etc) hasn't already registered
> > + * a handler, use EFI.
> > + */
> > + if (arm_pm_restart == NULL)
> > + arm_pm_restart = efi_restart;
> > + if (pm_power_off == NULL)
> > + pm_power_off = efi_power_off;
> > + }
> > + return 0;
> > +}
> > +pure_initcall(setup_efi_reset);
> > --
> > 1.9.0
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] arm64: support reboot and power off via EFI runtime
2014-06-18 14:41 ` Mark Salter
@ 2014-06-18 15:53 ` Matt Fleming
0 siblings, 0 replies; 6+ messages in thread
From: Matt Fleming @ 2014-06-18 15:53 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 18 Jun, at 10:41:47AM, Mark Salter wrote:
> On Wed, 2014-06-18 at 09:09 -0500, Rob Herring wrote:
> > On Tue, Jun 17, 2014 at 11:45 AM, Mark Salter <msalter@redhat.com> wrote:
> > > Add handlers for arm_pm_resestart and pm_power_off which use EFI
> >
> > typo.
> >
> > > runtime services ResetSystem call to perform the functions. These
> > > handlers are only installed if no handler currently exists. This
> > > allows PSCI to take priority over EFI for these functions.
> > >
> > > Signed-off-by: Mark Salter <msalter@redhat.com>
> > > ---
> > > arch/arm64/kernel/efi.c | 40 ++++++++++++++++++++++++++++++++++++++++
> >
> > Where's the arm32 version? Surely this could be shared with all
> > arches. pm_power_off is at least architecturally independent. We
> > should do the same for restart/reboot. I'm not saying do that now, but
> > at least put it in the right place for that to happen.
> >
> > Rob
>
> Good point. So the right place would be drivers/firmware/efi I think.
> Add a CONFIG_EFI_RESET with default off. I suppose we could also
> go ahead and s/arm_pm_restart/pm_restart/ kernel-wide or have an
> ifdef in the code (or depends on ARM64 || ARM in Kconfig) until we
> do so.
>
> [Matt Fleming CC'd]
Heh, this is timely. I wrote some patches last week to use
EfiResetSystem() for ACPI Hardware Reduced platforms,
http://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=efi/reboot
so it would definitely be good if we could try and solve both of our
problems simultaneously.
Let me post that patch series to kickoff the discussion.
--
Matt Fleming, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-18 15:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-17 16:45 [PATCH] arm64: support reboot and power off via EFI runtime Mark Salter
2014-06-18 13:26 ` Mark Rutland
2014-06-18 13:52 ` Mark Salter
2014-06-18 14:09 ` Rob Herring
2014-06-18 14:41 ` Mark Salter
2014-06-18 15:53 ` Matt Fleming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).