lkml.org 
[lkml]   [2020]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] Revert "x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T"
    Date
    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
    \
     
     \ /
      Last update: 2020-03-12 09:35    [W:5.517 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site