From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753165AbdHUJWO (ORCPT ); Mon, 21 Aug 2017 05:22:14 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45439 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753126AbdHUJWL (ORCPT ); Mon, 21 Aug 2017 05:22:11 -0400 Date: Mon, 21 Aug 2017 02:17:29 -0700 From: tip-bot for Hans de Goede Message-ID: Cc: peterz@infradead.org, linux-kernel@vger.kernel.org, msalter@redhat.com, matt@codeblueprint.co.uk, pjones@redhat.com, ard.biesheuvel@linaro.org, torvalds@linux-foundation.org, andriy.shevchenko@linux.intel.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, hdegoede@redhat.com, lenb@kernel.org, rjw@rjwysocki.net Reply-To: lenb@kernel.org, rjw@rjwysocki.net, hdegoede@redhat.com, mingo@kernel.org, tglx@linutronix.de, andriy.shevchenko@linux.intel.com, hpa@zytor.com, torvalds@linux-foundation.org, ard.biesheuvel@linaro.org, pjones@redhat.com, matt@codeblueprint.co.uk, msalter@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org In-Reply-To: <20170818194947.19347-7-ard.biesheuvel@linaro.org> References: <20170818194947.19347-7-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns Git-Commit-ID: b6a3780dad74f6e3d1d45eca843ae623cc3216a8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b6a3780dad74f6e3d1d45eca843ae623cc3216a8 Gitweb: http://git.kernel.org/tip/b6a3780dad74f6e3d1d45eca843ae623cc3216a8 Author: Hans de Goede AuthorDate: Fri, 18 Aug 2017 20:49:39 +0100 Committer: Ingo Molnar CommitDate: Mon, 21 Aug 2017 09:43:50 +0200 efi/reboot: Fall back to original power-off method if EFI_RESET_SHUTDOWN returns 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. Signed-off-by: Hans de Goede Signed-off-by: Matt Fleming Signed-off-by: Ard Biesheuvel Cc: Andy Shevchenko Cc: Len Brown Cc: Linus Torvalds Cc: Mark Salter Cc: Peter Jones Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170818194947.19347-7-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- 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 #include +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; }