diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-25 00:35:16 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-05 10:12:49 -0400 |
| commit | 8e15f153b0adf2638ebbc89ff369e332f1b86d8a (patch) | |
| tree | 83a296267924c21a6fe93456c17e190978bedcec | |
| parent | d89e99a31dfc45fc7b0f2d88ba158f0fdae8c64f (diff) | |
PM / sleep: Increase default DPM watchdog timeout to 60
[ Upstream commit fff3b16d2754a061a3549c4307a186423a0128fd ]
Many harddisks (mostly WD ones) have firmware problems and take too
long, more than 10 seconds, to resume from suspend. And this often
exceeds the default DPM watchdog timeout (12 seconds), resulting in a
kernel panic out of sudden.
Since most distros just take the default as is, we should give a bit
more safer value. This patch increases the default value from 12
seconds to one minute, which has been confirmed to be long enough for
such problematic disks.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=91921
Fixes: 70fea60d888d (PM / Sleep: Detect device suspend/resume lockup and log event)
Cc: 3.13+ <stable@vger.kernel.org> # 3.13+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | kernel/power/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index bbef57f5bdfd..c2ae4618a159 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -191,7 +191,7 @@ config DPM_WATCHDOG config DPM_WATCHDOG_TIMEOUT int "Watchdog timeout in seconds" range 1 120 - default 12 + default 60 depends on DPM_WATCHDOG config PM_TRACE |