* [PATCH] efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns
@ 2017-04-23 12:36 Hans de Goede
2017-05-19 15:45 ` Ard Biesheuvel
2017-06-21 13:15 ` Hans de Goede
0 siblings, 2 replies; 6+ messages in thread
From: Hans de Goede @ 2017-04-23 12:36 UTC (permalink / raw)
To: Len Brown, Matt Fleming, Ard Biesheuvel
Cc: Hans de Goede, Andy Shevchenko, linux-acpi, Peter Jones,
linux-efi, Mark Salter
Commit 44be28e9dd98 ("x86/reboot: Add EFI reboot quirk for ACPI Hardware
Reduced flag") sets pm_power_off to efi_power_off() when the
acpi_gbl_reduced_hardware flag is set.
According to its commit message this is necessary because: "BayTrail-T
class of hardware requires EFI in order to powerdown and reboot and no
other reliable method exists"
But I have a Bay Trail CR tablet where the EFI_RESET_SHUTDOWN call does
not work, it simply returns without doing anything (AFAICT).
So it seems that some Bay Trail devices must use EFI for power-off, while
for others only ACPI works.
Note that efi_power_off() only gets used if the platform code defines
efi_poweroff_required() and that returns true, this currently only ever
happens on x86.
Since on the devices which need ACPI for power-off the EFI_RESET_SHUTDOWN
call simply returns, this patch makes the efi-reboot code remember the
old pm_power_off handler and if EFI_RESET_SHUTDOWN returns it falls back
to calling that.
This seems preferable to dmi-quirking our way out of this, since there
are likely quite a few devices suffering from this.
Cc: Mark Salter <msalter@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/firmware/efi/reboot.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/reboot.c b/drivers/firmware/efi/reboot.c
index 62ead9b..7117e2d 100644
--- a/drivers/firmware/efi/reboot.c
+++ b/drivers/firmware/efi/reboot.c
@@ -5,6 +5,8 @@
#include <linux/efi.h>
#include <linux/reboot.h>
+void (*orig_pm_power_off)(void);
+
int efi_reboot_quirk_mode = -1;
void efi_reboot(enum reboot_mode reboot_mode, const char *__unused)
@@ -51,6 +53,12 @@ bool __weak efi_poweroff_required(void)
static void efi_power_off(void)
{
efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL);
+ /*
+ * The above call should not return, if it does fall back to
+ * the original power off method (typically ACPI poweroff).
+ */
+ if (orig_pm_power_off)
+ orig_pm_power_off();
}
static int __init efi_shutdown_init(void)
@@ -58,8 +66,10 @@ static int __init efi_shutdown_init(void)
if (!efi_enabled(EFI_RUNTIME_SERVICES))
return -ENODEV;
- if (efi_poweroff_required())
+ if (efi_poweroff_required()) {
+ orig_pm_power_off = pm_power_off;
pm_power_off = efi_power_off;
+ }
return 0;
}
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns
2017-04-23 12:36 [PATCH] efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns Hans de Goede
@ 2017-05-19 15:45 ` Ard Biesheuvel
[not found] ` <CAKv+Gu-qSMK6YTh5O=w-6mOSdAkMzNn945M+TAC0CAMRfgVhmw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-06-21 13:15 ` Hans de Goede
1 sibling, 1 reply; 6+ messages in thread
From: Ard Biesheuvel @ 2017-05-19 15:45 UTC (permalink / raw)
To: Hans de Goede, Matt Fleming
Cc: Len Brown, Andy Shevchenko, linux-acpi, Peter Jones, linux-efi,
Mark Salter
On 23 April 2017 at 13:36, Hans de Goede <hdegoede@redhat.com> wrote:
> Commit 44be28e9dd98 ("x86/reboot: Add EFI reboot quirk for ACPI Hardware
> Reduced flag") sets pm_power_off to efi_power_off() when the
> acpi_gbl_reduced_hardware flag is set.
>
> According to its commit message this is necessary because: "BayTrail-T
> class of hardware requires EFI in order to powerdown and reboot and no
> other reliable method exists"
>
> But I have a Bay Trail CR tablet where the EFI_RESET_SHUTDOWN call does
> not work, it simply returns without doing anything (AFAICT).
>
> So it seems that some Bay Trail devices must use EFI for power-off, while
> for others only ACPI works.
>
> Note that efi_power_off() only gets used if the platform code defines
> efi_poweroff_required() and that returns true, this currently only ever
> happens on x86.
>
> Since on the devices which need ACPI for power-off the EFI_RESET_SHUTDOWN
> call simply returns, this patch makes the efi-reboot code remember the
> old pm_power_off handler and if EFI_RESET_SHUTDOWN returns it falls back
> to calling that.
>
> This seems preferable to dmi-quirking our way out of this, since there
> are likely quite a few devices suffering from this.
>
> Cc: Mark Salter <msalter@redhat.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/firmware/efi/reboot.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/reboot.c b/drivers/firmware/efi/reboot.c
> index 62ead9b..7117e2d 100644
> --- a/drivers/firmware/efi/reboot.c
> +++ b/drivers/firmware/efi/reboot.c
> @@ -5,6 +5,8 @@
> #include <linux/efi.h>
> #include <linux/reboot.h>
>
> +void (*orig_pm_power_off)(void);
> +
> int efi_reboot_quirk_mode = -1;
>
> void efi_reboot(enum reboot_mode reboot_mode, const char *__unused)
> @@ -51,6 +53,12 @@ bool __weak efi_poweroff_required(void)
> static void efi_power_off(void)
> {
> efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL);
> + /*
> + * The above call should not return, if it does fall back to
> + * the original power off method (typically ACPI poweroff).
> + */
> + if (orig_pm_power_off)
> + orig_pm_power_off();
> }
>
> static int __init efi_shutdown_init(void)
> @@ -58,8 +66,10 @@ static int __init efi_shutdown_init(void)
> if (!efi_enabled(EFI_RUNTIME_SERVICES))
> return -ENODEV;
>
> - if (efi_poweroff_required())
> + if (efi_poweroff_required()) {
> + orig_pm_power_off = pm_power_off;
> pm_power_off = efi_power_off;
> + }
>
> return 0;
> }
This does not look unreasonable to me, but this is more Matt's turf so
I will let him handle this one.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns
[not found] ` <CAKv+Gu-qSMK6YTh5O=w-6mOSdAkMzNn945M+TAC0CAMRfgVhmw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2017-05-25 11:11 ` Matt Fleming
0 siblings, 0 replies; 6+ messages in thread
From: Matt Fleming @ 2017-05-25 11:11 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Hans de Goede, Len Brown, Andy Shevchenko,
linux-acpi-u79uwXL29TY76Z2rM5mHXA, Peter Jones,
linux-efi-u79uwXL29TY76Z2rM5mHXA, Mark Salter, Rafael J. Wysocki
On Fri, 19 May, at 04:45:49PM, Ard Biesheuvel wrote:
>
> This does not look unreasonable to me, but this is more Matt's turf so
> I will let him handle this one.
I was hoping that either Len or Rafael would have chimed in by now,
but they were probably waiting for me...
Doesn't ACPI reduced require that EFI power off be supported? I can't
find anything in the spec that makes that connection.
Unless the ACPI folks provide a reason that falling back to ACPI
poweroff doesn't make sense for ACPI reduced hardware, I think we
should apply this patch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns
2017-04-23 12:36 [PATCH] efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns Hans de Goede
2017-05-19 15:45 ` Ard Biesheuvel
@ 2017-06-21 13:15 ` Hans de Goede
2017-06-22 9:55 ` Matt Fleming
1 sibling, 1 reply; 6+ messages in thread
From: Hans de Goede @ 2017-06-21 13:15 UTC (permalink / raw)
To: Len Brown, Matt Fleming, Ard Biesheuvel
Cc: Andy Shevchenko, linux-acpi, Peter Jones, linux-efi, Mark Salter
HI,
On 23-04-17 14:36, Hans de Goede wrote:
> Commit 44be28e9dd98 ("x86/reboot: Add EFI reboot quirk for ACPI Hardware
> Reduced flag") sets pm_power_off to efi_power_off() when the
> acpi_gbl_reduced_hardware flag is set.
>
> According to its commit message this is necessary because: "BayTrail-T
> class of hardware requires EFI in order to powerdown and reboot and no
> other reliable method exists"
>
> But I have a Bay Trail CR tablet where the EFI_RESET_SHUTDOWN call does
> not work, it simply returns without doing anything (AFAICT).
>
> So it seems that some Bay Trail devices must use EFI for power-off, while
> for others only ACPI works.
>
> Note that efi_power_off() only gets used if the platform code defines
> efi_poweroff_required() and that returns true, this currently only ever
> happens on x86.
>
> Since on the devices which need ACPI for power-off the EFI_RESET_SHUTDOWN
> call simply returns, this patch makes the efi-reboot code remember the
> old pm_power_off handler and if EFI_RESET_SHUTDOWN returns it falls back
> to calling that.
>
> This seems preferable to dmi-quirking our way out of this, since there
> are likely quite a few devices suffering from this.
>
> Cc: Mark Salter <msalter@redhat.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
What is the status of this patch ? It has had 2 somewhat favorable
reviews and then things went silent ?
Regards,
Hans
> ---
> drivers/firmware/efi/reboot.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/reboot.c b/drivers/firmware/efi/reboot.c
> index 62ead9b..7117e2d 100644
> --- a/drivers/firmware/efi/reboot.c
> +++ b/drivers/firmware/efi/reboot.c
> @@ -5,6 +5,8 @@
> #include <linux/efi.h>
> #include <linux/reboot.h>
>
> +void (*orig_pm_power_off)(void);
> +
> int efi_reboot_quirk_mode = -1;
>
> void efi_reboot(enum reboot_mode reboot_mode, const char *__unused)
> @@ -51,6 +53,12 @@ bool __weak efi_poweroff_required(void)
> static void efi_power_off(void)
> {
> efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL);
> + /*
> + * The above call should not return, if it does fall back to
> + * the original power off method (typically ACPI poweroff).
> + */
> + if (orig_pm_power_off)
> + orig_pm_power_off();
> }
>
> static int __init efi_shutdown_init(void)
> @@ -58,8 +66,10 @@ static int __init efi_shutdown_init(void)
> if (!efi_enabled(EFI_RUNTIME_SERVICES))
> return -ENODEV;
>
> - if (efi_poweroff_required())
> + if (efi_poweroff_required()) {
> + orig_pm_power_off = pm_power_off;
> pm_power_off = efi_power_off;
> + }
>
> return 0;
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns
2017-06-21 13:15 ` Hans de Goede
@ 2017-06-22 9:55 ` Matt Fleming
2017-06-22 10:04 ` Hans de Goede
0 siblings, 1 reply; 6+ messages in thread
From: Matt Fleming @ 2017-06-22 9:55 UTC (permalink / raw)
To: Hans de Goede
Cc: Len Brown, Ard Biesheuvel, Andy Shevchenko, linux-acpi,
Peter Jones, linux-efi, Mark Salter
On Wed, 21 Jun, at 03:15:09PM, Hans de Goede wrote:
> HI,
>
> On 23-04-17 14:36, Hans de Goede wrote:
> >Commit 44be28e9dd98 ("x86/reboot: Add EFI reboot quirk for ACPI Hardware
> >Reduced flag") sets pm_power_off to efi_power_off() when the
> >acpi_gbl_reduced_hardware flag is set.
> >
> >According to its commit message this is necessary because: "BayTrail-T
> >class of hardware requires EFI in order to powerdown and reboot and no
> >other reliable method exists"
> >
> >But I have a Bay Trail CR tablet where the EFI_RESET_SHUTDOWN call does
> >not work, it simply returns without doing anything (AFAICT).
> >
> >So it seems that some Bay Trail devices must use EFI for power-off, while
> >for others only ACPI works.
> >
> >Note that efi_power_off() only gets used if the platform code defines
> >efi_poweroff_required() and that returns true, this currently only ever
> >happens on x86.
> >
> >Since on the devices which need ACPI for power-off the EFI_RESET_SHUTDOWN
> >call simply returns, this patch makes the efi-reboot code remember the
> >old pm_power_off handler and if EFI_RESET_SHUTDOWN returns it falls back
> >to calling that.
> >
> >This seems preferable to dmi-quirking our way out of this, since there
> >are likely quite a few devices suffering from this.
> >
> >Cc: Mark Salter <msalter@redhat.com>
> >Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>
> What is the status of this patch ? It has had 2 somewhat favorable
> reviews and then things went silent ?
Sorry about the delay. I've picked this up for the efi-next branch
since we're at -rc6 and it doesn't look like an -rc6-urgent bug.
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns
2017-06-22 9:55 ` Matt Fleming
@ 2017-06-22 10:04 ` Hans de Goede
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Goede @ 2017-06-22 10:04 UTC (permalink / raw)
To: Matt Fleming
Cc: Len Brown, Ard Biesheuvel, Andy Shevchenko, linux-acpi,
Peter Jones, linux-efi, Mark Salter
Hi,
On 22-06-17 11:55, Matt Fleming wrote:
> On Wed, 21 Jun, at 03:15:09PM, Hans de Goede wrote:
>> HI,
>>
>> On 23-04-17 14:36, Hans de Goede wrote:
>>> Commit 44be28e9dd98 ("x86/reboot: Add EFI reboot quirk for ACPI Hardware
>>> Reduced flag") sets pm_power_off to efi_power_off() when the
>>> acpi_gbl_reduced_hardware flag is set.
>>>
>>> According to its commit message this is necessary because: "BayTrail-T
>>> class of hardware requires EFI in order to powerdown and reboot and no
>>> other reliable method exists"
>>>
>>> But I have a Bay Trail CR tablet where the EFI_RESET_SHUTDOWN call does
>>> not work, it simply returns without doing anything (AFAICT).
>>>
>>> So it seems that some Bay Trail devices must use EFI for power-off, while
>>> for others only ACPI works.
>>>
>>> Note that efi_power_off() only gets used if the platform code defines
>>> efi_poweroff_required() and that returns true, this currently only ever
>>> happens on x86.
>>>
>>> Since on the devices which need ACPI for power-off the EFI_RESET_SHUTDOWN
>>> call simply returns, this patch makes the efi-reboot code remember the
>>> old pm_power_off handler and if EFI_RESET_SHUTDOWN returns it falls back
>>> to calling that.
>>>
>>> This seems preferable to dmi-quirking our way out of this, since there
>>> are likely quite a few devices suffering from this.
>>>
>>> Cc: Mark Salter <msalter@redhat.com>
>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>
>> What is the status of this patch ? It has had 2 somewhat favorable
>> reviews and then things went silent ?
>
> Sorry about the delay. I've picked this up for the efi-next branch
> since we're at -rc6 and it doesn't look like an -rc6-urgent bug.
Ack, putting this in -next is the right thing to do, you never know
what weird firmware quirks this patch may trigger. E.g. EFI_RESET_SHUTDOWN
could return on some models with the PMIC turned off leaving the device
running for XX ms on its power-supply capacitors, and then calling into
the ACPI method may cause weirdness.
Regards,
Hans
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-22 10:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-23 12:36 [PATCH] efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns Hans de Goede
2017-05-19 15:45 ` Ard Biesheuvel
[not found] ` <CAKv+Gu-qSMK6YTh5O=w-6mOSdAkMzNn945M+TAC0CAMRfgVhmw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-25 11:11 ` Matt Fleming
2017-06-21 13:15 ` Hans de Goede
2017-06-22 9:55 ` Matt Fleming
2017-06-22 10:04 ` Hans de Goede
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).