From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:50779 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756135AbcDJSMa (ORCPT ); Sun, 10 Apr 2016 14:12:30 -0400 Subject: Patch "PM / sleep: Clear pm_suspend_global_flags upon hibernate" has been added to the 4.5-stable tree To: lukas@wunner.de, gregkh@linuxfoundation.org, rafael.j.wysocki@intel.com Cc: , From: Date: Sun, 10 Apr 2016 11:12:29 -0700 Message-ID: <146031194931143@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled PM / sleep: Clear pm_suspend_global_flags upon hibernate to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: pm-sleep-clear-pm_suspend_global_flags-upon-hibernate.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 276142730c39c9839465a36a90e5674a8c34e839 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Wed, 23 Mar 2016 00:11:20 +0100 Subject: PM / sleep: Clear pm_suspend_global_flags upon hibernate From: Lukas Wunner commit 276142730c39c9839465a36a90e5674a8c34e839 upstream. When suspending to RAM, waking up and later suspending to disk, we gratuitously runtime resume devices after the thaw phase. This does not occur if we always suspend to RAM or always to disk. pm_complete_with_resume_check(), which gets called from pci_pm_complete() among others, schedules a runtime resume if PM_SUSPEND_FLAG_FW_RESUME is set. The flag is set during a suspend-to-RAM cycle. It is cleared at the beginning of the suspend-to-RAM cycle but not afterwards and it is not cleared during a suspend-to-disk cycle at all. Fix it. Fixes: ef25ba047601 (PM / sleep: Add flags to indicate platform firmware involvement) Signed-off-by: Lukas Wunner Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- kernel/power/hibernate.c | 1 + 1 file changed, 1 insertion(+) --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -339,6 +339,7 @@ int hibernation_snapshot(int platform_mo pm_message_t msg; int error; + pm_suspend_clear_flags(); error = platform_begin(platform_mode); if (error) goto Close; Patches currently in stable-queue which might be from lukas@wunner.de are queue-4.5/pm-sleep-clear-pm_suspend_global_flags-upon-hibernate.patch queue-4.5/acpi-pm-runtime-resume-devices-when-waking-from-hibernate.patch