From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750718AbbF2HBc (ORCPT ); Mon, 29 Jun 2015 03:01:32 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:50514 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750872AbbF2HBY (ORCPT ); Mon, 29 Jun 2015 03:01:24 -0400 X-AuditID: cbfee68e-f79c56d000006efb-5b-5590ed42e544 From: Nitish Ambastha To: rjw@rjwysocki.net, pavel@ucw.cz, len.brown@intel.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: cpgs@samsung.com, nitish.a@samsung.com, nits.ambastha@gmail.com Subject: [PATCH 1/1] kernel/power/autosleep.c: check for pm_suspend() return before queueing suspend again Date: Mon, 29 Jun 2015 18:04:57 +0530 Message-id: <1435581297-20271-1-git-send-email-nitish.a@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNLMWRmVeSWpSXmKPExsWyRsSkWtfp7YRQgxn/+S1eHtK0mDVlL5PF 5V1z2Cw+9x5htHiy8AmTxdHeDSwWd08dZbM4c/oSqwOHx85Zd9k9Fu95yeSx5Wo7i0ffllWM HitWf2f3+LxJLoAtissmJTUnsyy1SN8ugStj377p7AVPeCqa72xnaWDcxtXFyMkhIWAi8eTG JjYIW0ziwr31QDYXh5DAUkaJ+0//McIUfd/6kQkisYhRovfdAqiq34wSe5YuYAapYhPQkfi8 7SPYKBGBIoldUN3MAs4Srf2rWEBsYYEciWPP5rCC2CwCqhJvps1lB7F5BVwkDu87BmRzAG1T kJgzyQZicTe7xMvZUOUCEt8mH2KBKJGV2HSAGaJEUuLgihssExgFFzAyrGIUTS1ILihOSi8y 0itOzC0uzUvXS87P3cQIDOPT/5717WC8ecD6EKMAB6MSD++HNxNChVgTy4orcw8xmgJtmMgs JZqcD4yWvJJ4Q2MzIwtTE1NjI3NLMyVx3gSpn8FCAumJJanZqakFqUXxRaU5qcWHGJk4OKUa GCNEV0dY8v0MfFfE6iohd0vfP2URR6j7Imv242+euDzR7+ts2qr91eW95u+SgKszz1nPmZBe uKxmYrmnz+Mdm41Pcd1b9MU8k+X6ijUt/xsTDhfoTsu+dZ7/SJsH2zYftrTvD1NYdVmiJwke vHj/3E6ZtLipFc0hf9cfV1ZzNjKd0SJVelXisxJLcUaioRZzUXEiAEIl+cleAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGIsWRmVeSWpSXmKPExsVy+t9jAV2ntxNCDaY95bB4eUjTYtaUvUwW l3fNYbP43HuE0eLJwidMFkd7N7BY3D11lM3izOlLrA4cHjtn3WX3WLznJZPHlqvtLB59W1Yx eqxY/Z3d4/MmuQC2qAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRb JRefAF23zBygg5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGfv2TWcv eMJT0XxnO0sD4zauLkZODgkBE4nvWz8yQdhiEhfurWfrYuTiEBJYxCjR+24BlPObUWLP0gXM IFVsAjoSn7d9ZAOxRQSKJHY9/ccIYjMLOEu09q9iAbGFBXIkjj2bwwpiswioSryZNpcdxOYV cJE4vO8YkM0BtE1BYs4kmwmM3AsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525iBMfJM+kd jKsaLA4xCnAwKvHwOryYECrEmlhWXJl7iFGCg1lJhPfyZqAQb0piZVVqUX58UWlOavEhRlOg 5ROZpUST84ExnFcSb2hsYm5qbGppYmFiZqkkznsy3ydUSCA9sSQ1OzW1ILUIpo+Jg1OqgTG7 YUHj3Tv79Vr/uEzImdz+2FWwI2GRQxuHdvW7Mv/qzX7TNxnof0tecE6xLeTDpRWWK1X2MG2Q OGn6zWDHLjv1d8afHraGNQn/1pc6l3y119VYuKCFf9or7+4Af/tEz4hafr4+Z32uFdvK8hr2 64S3Br+pu6D+QOHx60r71L6vM6e4HFqvocRSnJFoqMVcVJwIAJ/1h+CpAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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