From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDE30C2BB1D for ; Thu, 12 Mar 2020 08:34:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB419206B7 for ; Thu, 12 Mar 2020 08:34:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=endlessm-com.20150623.gappssmtp.com header.i=@endlessm-com.20150623.gappssmtp.com header.b="kDMvA2ex" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726437AbgCLIen (ORCPT ); Thu, 12 Mar 2020 04:34:43 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:41929 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726023AbgCLIen (ORCPT ); Thu, 12 Mar 2020 04:34:43 -0400 Received: by mail-pl1-f194.google.com with SMTP id t14so2371276plr.8 for ; Thu, 12 Mar 2020 01:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessm-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=o8tWeCypuK1QOsKNJkPWjnl6zp71Q9i3fpD2i8Bk47I=; b=kDMvA2exUIdT1c6vkox/9tshpEUaxfe3peeGwW7N3j+NMe16liNfQTD5oL8HlYFePF fzgSMWlcsMGtkzxAaHHGs3bT7k1uvXaS6W69RUIvuuBSeDOWfWwPckHvclvaedExsmUB GWhXUjbK+qA6KG4n0sQ+S3jSTMF4Wi1KmU926yp6f0E1PzTfnjk5tSzoIuPXApsHTCWn oH0JB3DMFc99MinbXtpjMken/HnHg6SN8VX3UHCKnvP8qllUGoW+BdogB4XwEgWtsCLw zFKgGyuX776BjcJNU3GDxj0vwBdZ5rzwyGeB/tMtVLVEJebgGBi0tWggi8NrAWdeeR/q 4lKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=o8tWeCypuK1QOsKNJkPWjnl6zp71Q9i3fpD2i8Bk47I=; b=uHHmjkdBNCiCerOAA3Qd0B6bBWsnhnMdi5Xf7cV68kbjnvmI7IFtkvrKetMEGEuu+L w3cDm38YbumdqV9qhs9itydESpuaeA/2HQ3JRODu9XU9Ju2m3maU+gtZ+aOiuQnk9B7R eukc+OQ9yAw3iSqGYsw+PlPM8JJlBsEWMnzmu/3b2A6DWaQYSkFhZKgd409HXEIu3fGC ZpywCorRGNfsi8vL3m1wQ+AfR49lEMbsxWmqeFGTVsJHerOXvHQo0/YhDdbtYejsJ/e4 9KYXOO9Ljs3nC3Ls6GSN/6DqHJYrWwV2/Qb7VMH/tM8cJsuLIgnNXk65cJryorq926zn Vyhw== X-Gm-Message-State: ANhLgQ0dRGU+UXrCAGG7ynMlt6yqvJxO5FuigfBOzdFz8O4q397zT8PU 3ZDIHphKWxn4H94GqJwbA3Hwzw== X-Google-Smtp-Source: ADFU+vvspHbr8K5oFPO6UNLDH5awu771Qxb0TRck99UbEb+J2KJblpIGzDwr0ExCYH8hcE0po0F1lA== X-Received: by 2002:a17:90b:1904:: with SMTP id mp4mr3126972pjb.110.1584002080097; Thu, 12 Mar 2020 01:34:40 -0700 (PDT) Received: from starnight.local ([150.116.255.181]) by smtp.googlemail.com with ESMTPSA id s13sm8163947pjp.1.2020.03.12.01.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 01:34:39 -0700 (PDT) From: Jian-Hong Pan To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Ard Biesheuvel , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux@endlessm.com, Jian-Hong Pan Subject: [PATCH] Revert "x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T" Date: Thu, 12 Mar 2020 16:33:42 +0800 Message-Id: <20200312083341.9365-1-jian-hong@endlessm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org 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 --- 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