From patchwork Fri Jul 6 12:13:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 10511451 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 2CF136024A for ; Fri, 6 Jul 2018 12:14:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D60C281E1 for ; Fri, 6 Jul 2018 12:14:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 119F9285C6; Fri, 6 Jul 2018 12:14:35 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EBDA281E1 for ; Fri, 6 Jul 2018 12:14:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932584AbeGFMOd convert rfc822-to-8bit (ORCPT ); Fri, 6 Jul 2018 08:14:33 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:50348 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932483AbeGFMOc (ORCPT ); Fri, 6 Jul 2018 08:14:32 -0400 Received: from 79.184.254.38.ipv4.supernova.orange.pl (79.184.254.38) (HELO aspire.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83) id da16ad57a5b2ef46; Fri, 6 Jul 2018 14:14:30 +0200 From: "Rafael J. Wysocki" To: Thomas =?ISO-8859-1?Q?H=E4nig?= Cc: Takashi Iwai , Erik Schmauss , Linux PM , Linux Kernel Mailing List , Linux ACPI Subject: Re: [REGRESSION 4.17] Spurious wakeup / reboot with power button Date: Fri, 06 Jul 2018 14:13:04 +0200 Message-ID: <1704080.gFTvVrrZA1@aspire.rjw.lan> In-Reply-To: References: <7049b672-859c-e049-a391-f66e4336d4a9@cosifan.de> MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Friday, July 6, 2018 1:21:50 PM CEST Rafael J. Wysocki wrote: > On Fri, Jul 6, 2018 at 1:12 PM, Thomas Hänig wrote: [cut] > So the latest patch: > > https://patchwork.kernel.org/patch/10511211/ > > should work for you (please verify) and the change in > drivers/acpi/sleep.c in it most likely is not necessary. > > If you can confirm that this one works for you, I'll send a smaller > one with the acpi_hw_legacy_sleep() part alone. Well, scratch this, sorry. The power button probably is a fixed event and it won't be effected by that patch. Instead, please test the patch below. --- drivers/acpi/acpica/hwsleep.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pm/drivers/acpi/acpica/hwsleep.c =================================================================== --- linux-pm.orig/drivers/acpi/acpica/hwsleep.c +++ linux-pm/drivers/acpi/acpica/hwsleep.c @@ -51,16 +51,23 @@ acpi_status acpi_hw_legacy_sleep(u8 slee return_ACPI_STATUS(status); } - /* - * 1) Disable all GPEs - * 2) Enable all wakeup GPEs - */ + /* Disable all GPEs */ status = acpi_hw_disable_all_gpes(); if (ACPI_FAILURE(status)) { return_ACPI_STATUS(status); } + /* + * If the target sleep state is S5, clear all GPEs and fixed events too + */ + if (sleep_state == ACPI_STATE_S5) { + status = acpi_hw_clear_acpi_status(); + if (ACPI_FAILURE(status)) { + return_ACPI_STATUS(status); + } + } acpi_gbl_system_awake_and_running = FALSE; + /* Enable all wakeup GPEs */ status = acpi_hw_enable_all_wakeup_gpes(); if (ACPI_FAILURE(status)) { return_ACPI_STATUS(status);