lkml.org 
[lkml]   [2015]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/1] kernel/power/autosleep.c: check for pm_suspend() return before queueing suspend again
Date
Prevent tight loop for suspend-resume when some
devices failed to suspend
If some devices failed to suspend, we monitor this
error in try_to_suspend(). pm_suspend() is already
an 'int' returning function, how about checking return
from pm_suspend() before queueing suspend again?

For devices which do not register for pending events,
this will prevent tight loop for suspend-resume in
suspend abort scenarios due to device suspend failures

Signed-off-by: Nitish Ambastha <nitish.a@samsung.com>
---
kernel/power/autosleep.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/kernel/power/autosleep.c b/kernel/power/autosleep.c
index 9012ecf..3923148 100644
--- a/kernel/power/autosleep.c
+++ b/kernel/power/autosleep.c
@@ -26,6 +26,7 @@ static struct wakeup_source *autosleep_ws;
static void try_to_suspend(struct work_struct *work)
{
unsigned int initial_count, final_count;
+ int error = 0;

if (!pm_get_wakeup_count(&initial_count, true))
goto out;
@@ -45,10 +46,20 @@ static void try_to_suspend(struct work_struct *work)
if (autosleep_state >= PM_SUSPEND_MAX)
hibernate();
else
- pm_suspend(autosleep_state);
+ error = pm_suspend(autosleep_state);

mutex_unlock(&autosleep_lock);

+ if (error) {
+ /*
+ * If some devices failed to suspend, its better to wait
+ * to prevent system from trying to suspend in tight loop
+ */
+ pr_info("PM: suspend returned (%d)\n", error);
+ schedule_timeout_uninterruptible(HZ / 2);
+ goto out;
+ }
+
if (!pm_get_wakeup_count(&final_count, false))
goto out;

--
1.7.9.5


\
 
 \ /
  Last update: 2015-06-29 09:21    [W:0.137 / U:0.280 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site