From patchwork Wed Dec 14 11:12:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Lagerwall X-Patchwork-Id: 9474051 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E021F60823 for ; Wed, 14 Dec 2016 11:13:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D57C728713 for ; Wed, 14 Dec 2016 11:13:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6C6D2871B; Wed, 14 Dec 2016 11:13:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5004228713 for ; Wed, 14 Dec 2016 11:13:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cH7Tt-0007d3-T8; Wed, 14 Dec 2016 11:12:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cH7Ts-0007bp-Gn for xen-devel@lists.xen.org; Wed, 14 Dec 2016 11:12:16 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 90/25-25657-F0921585; Wed, 14 Dec 2016 11:12:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFLMWRWlGSWpSXmKPExsXitHSDvS6/ZmC EwfkuQYslHxezODB6HN39mymAMYo1My8pvyKBNePGw1usBZ94Kw7P5GpgXMHVxcjJISHgL3Ft 5yl2EJtNwEDi1qXvzCC2iICsxOquOWBxZoFqieknjrOB2MICzhL9U/6zgNgsAqoSixa/ALI5O HgFPCVOd4lCjJSTuHmuE2yMkICaxNvlZ8DKeQUEJU7OfMICMVJC4uCLF8wTGLlnIUnNQpJawM i0ilG9OLWoLLVI11AvqSgzPaMkNzEzR9fQwFgvN7W4ODE9NScxqVgvOT93EyMwDBiAYAfj8o9 OhxglOZiURHm5rgZECPEl5adUZiQWZ8QXleakFh9ilOHgUJLgzdAIjBASLEpNT61Iy8wBBiRM WoKDR0mE96Y6UJq3uCAxtzgzHSJ1ilFRSpy3HKRPACSRUZoH1waLgkuMslLCvIxAhwjxFKQW5 WaWoMq/YhTnYFQS5tUAmcKTmVcCN/0V0GImoMWiS/xBFpckIqSkGhhT9kVtSTu7Zxnb3h/v/J VaOE9kbU36/jXE8EfzlscsUv/r3Do/z1vWeK5c+uC7j5vVzwi1y4epiT7m8TzB73Fia/nCPz5 bHkZ93G+9nkNGfrZKldyn2jmcipL/3zjZ2tY+ctzTH1DVs+zbctMWl9Y23QMe3///FL5sInWv VCTO5Lc94xmTkBtKLMUZiYZazEXFiQBmSM8UfQIAAA== X-Env-Sender: prvs=149da8861=ross.lagerwall@citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1481713933!75411596!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45355 invoked from network); 14 Dec 2016 11:12:14 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 14 Dec 2016 11:12:14 -0000 X-IronPort-AV: E=Sophos;i="5.33,346,1477958400"; d="scan'208";a="403544340" From: Ross Lagerwall To: Date: Wed, 14 Dec 2016 11:12:01 +0000 Message-ID: <1481713921-21715-1-git-send-email-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich , Ross Lagerwall Subject: [Xen-devel] [PATCH] x86: Use ACPI reboot method for Dell OptiPlex 9020 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP When EFI booting the Dell OptiPlex 9020, it sometimes GP faults in the EFI runtime instead of rebooting. Quirk this hardware to use the ACPI reboot method instead. dmidecode info: BIOS Information Vendor: Dell Inc. Version: A15 Release Date: 11/08/2015 System Information Manufacturer: Dell Inc. Product Name: OptiPlex 9020 Version: 00 Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper --- xen/arch/x86/shutdown.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 55f6840..3d669d1 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -128,11 +128,15 @@ static int __init override_reboot(struct dmi_system_id *d) { enum reboot_type type = (long)d->driver_data; + if ( type == BOOT_ACPI && acpi_disabled ) + type = BOOT_KBD; + if ( reboot_type != type ) { static const char *__initdata msg[] = { [BOOT_KBD] = "keyboard controller", + [BOOT_ACPI] = "ACPI", [BOOT_CF9] = "PCI", }; @@ -438,6 +442,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 390"), }, }, + { /* Handle problems with rebooting on Dell OptiPlex 9020. */ + .callback = override_reboot, + .driver_data = (void *)(long)BOOT_ACPI, + .ident = "Dell OptiPlex 9020", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 9020"), + }, + }, { /* Handle problems with rebooting on the Latitude E6320. */ .callback = override_reboot, .driver_data = (void *)(long)BOOT_CF9,