From: Jian-Hong Pan <jian-hong@endlessm.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
Ard Biesheuvel <ardb@kernel.org>,
Kees Cook <keescook@chromium.org>,
Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
linux-efi@vger.kernel.org, linux@endlessm.com,
Jian-Hong Pan <jian-hong@endlessm.com>
Subject: [PATCH] Revert "x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T"
Date: Thu, 12 Mar 2020 16:33:42 +0800 [thread overview]
Message-ID: <20200312083341.9365-1-jian-hong@endlessm.com> (raw)
This reverts commit 0082517fa4bce073e7cf542633439f26538a14cc.
According to Acer's information, this reboot issue is fixed since 1.08
and newer BIOS. So, we can revert the quirk.
Fixes: 0082517fa4bc ("x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T")
Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com>
---
arch/x86/kernel/reboot.c | 21 ---------------------
include/linux/efi.h | 7 +------
2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 0cc7c0b106bb..92177ccd47f3 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -81,19 +81,6 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
return 0;
}
-/*
- * Some machines don't handle the default ACPI reboot method and
- * require the EFI reboot method:
- */
-static int __init set_efi_reboot(const struct dmi_system_id *d)
-{
- if (reboot_type != BOOT_EFI && !efi_runtime_disabled()) {
- reboot_type = BOOT_EFI;
- pr_info("%s series board detected. Selecting EFI-method for reboot.\n", d->ident);
- }
- return 0;
-}
-
void __noreturn machine_real_restart(unsigned int type)
{
local_irq_disable();
@@ -179,14 +166,6 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
},
},
- { /* Handle reboot issue on Acer TravelMate X514-51T */
- .callback = set_efi_reboot,
- .ident = "Acer TravelMate X514-51T",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate X514-51T"),
- },
- },
/* Apple */
{ /* Handle problems with rebooting on Apple MacBook5 */
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 7efd7072cca5..8375bbc6e739 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1529,12 +1529,7 @@ efi_status_t efi_parse_options(char const *cmdline);
efi_status_t efi_setup_gop(struct screen_info *si, efi_guid_t *proto,
unsigned long size);
-#ifdef CONFIG_EFI
-extern bool efi_runtime_disabled(void);
-#else
-static inline bool efi_runtime_disabled(void) { return true; }
-#endif
-
+bool efi_runtime_disabled(void);
extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
extern unsigned long efi_call_virt_save_flags(void);
--
2.25.1
next reply other threads:[~2020-03-12 8:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 8:33 Jian-Hong Pan [this message]
2020-03-12 10:46 ` [PATCH] Revert "x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T" Borislav Petkov
2020-03-16 9:17 ` Jian-Hong Pan
2020-03-16 10:02 ` Borislav Petkov
2020-03-18 6:58 ` Jian-Hong Pan
2020-03-20 12:37 ` Daniel Drake
2020-03-20 13:54 ` Borislav Petkov
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=20200312083341.9365-1-jian-hong@endlessm.com \
--to=jian-hong@endlessm.com \
--cc=anton@enomsg.org \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=ccross@android.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@endlessm.com \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).