From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:42377 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521AbcFEU5U (ORCPT ); Sun, 5 Jun 2016 16:57:20 -0400 Subject: Patch "PM / sleep: Handle failures in device_suspend_late() consistently" has been added to the 4.5-stable tree To: rafael.j.wysocki@intel.com, gregkh@linuxfoundation.org, grygorii.strashko@ti.com Cc: , From: Date: Sun, 05 Jun 2016 13:57:19 -0700 Message-ID: <146516023924627@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: Handle failures in device_suspend_late() consistently 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-handle-failures-in-device_suspend_late-consistently.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 3a17fb329da68cb00558721aff876a80bba2fdb9 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 20 May 2016 23:09:49 +0200 Subject: PM / sleep: Handle failures in device_suspend_late() consistently From: Rafael J. Wysocki commit 3a17fb329da68cb00558721aff876a80bba2fdb9 upstream. Grygorii Strashko reports: The PM runtime will be left disabled for the device if its .suspend_late() callback fails and async suspend is not allowed for this device. In this case device will not be added in dpm_late_early_list and dpm_resume_early() will ignore this device, as result PM runtime will be disabled for it forever (side effect: after 8 subsequent failures for the same device the PM runtime will be reenabled due to disable_depth overflow). To fix this problem, add devices to dpm_late_early_list regardless of whether or not device_suspend_late() returns errors for them. That will ensure failures in there to be handled consistently for all devices regardless of their async suspend/resume status. Reported-by: Grygorii Strashko Tested-by: Grygorii Strashko Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/base/power/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1267,14 +1267,15 @@ int dpm_suspend_late(pm_message_t state) error = device_suspend_late(dev); mutex_lock(&dpm_list_mtx); + if (!list_empty(&dev->power.entry)) + list_move(&dev->power.entry, &dpm_late_early_list); + if (error) { pm_dev_err(dev, state, " late", error); dpm_save_failed_dev(dev_name(dev)); put_device(dev); break; } - if (!list_empty(&dev->power.entry)) - list_move(&dev->power.entry, &dpm_late_early_list); put_device(dev); if (async_error) Patches currently in stable-queue which might be from rafael.j.wysocki@intel.com are queue-4.5/cpuidle-fix-cpuidle_state_is_coupled-argument-in-cpuidle_enter.patch queue-4.5/pm-sleep-handle-failures-in-device_suspend_late-consistently.patch queue-4.5/pm-runtime-fix-error-path-in-pm_runtime_force_resume.patch queue-4.5/cpuidle-indicate-when-a-device-has-been-unregistered.patch