From e2062b3da270435e58557414592c917b9f73e6f1 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Mon, 20 Feb 2017 13:32:58 +1100 Subject: [PATCH 11/17] Don't use hrtimer overlay when pm_freezing since some drivers still don't correctly use freezable timeouts. --- kernel/time/hrtimer.c | 2 +- kernel/time/timer.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index c6ea49693bca..17ad543fbbc4 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -2039,7 +2039,7 @@ long __sched schedule_msec_hrtimeout(long timeout) * (yet) better than Hz, as would occur during startup, use regular * timers. */ - if (jiffs > 4 || hrtimer_resolution >= NSEC_PER_SEC / HZ) + if (jiffs > 4 || hrtimer_resolution >= NSEC_PER_SEC / HZ || pm_freezing) return schedule_timeout(jiffs); secs = timeout / 1000; diff --git a/kernel/time/timer.c b/kernel/time/timer.c index ffd29e30ddb9..73ace4cbbe28 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -1975,12 +1976,12 @@ void msleep(unsigned int msecs) * Use high resolution timers where the resolution of tick based * timers is inadequate. */ - if (jiffs < 5 && hrtimer_resolution < NSEC_PER_SEC / HZ) { + if (jiffs < 5 && hrtimer_resolution < NSEC_PER_SEC / HZ && !pm_freezing) { while (msecs) msecs = schedule_msec_hrtimeout_uninterruptible(msecs); return; } - timeout = msecs_to_jiffies(msecs) + 1; + timeout = jiffs + 1; while (timeout) timeout = schedule_timeout_uninterruptible(timeout); @@ -1997,12 +1998,12 @@ unsigned long msleep_interruptible(unsigned int msecs) int jiffs = msecs_to_jiffies(msecs); unsigned long timeout; - if (jiffs < 5 && hrtimer_resolution < NSEC_PER_SEC / HZ) { + if (jiffs < 5 && hrtimer_resolution < NSEC_PER_SEC / HZ && !pm_freezing) { while (msecs && !signal_pending(current)) msecs = schedule_msec_hrtimeout_interruptible(msecs); return msecs; } - timeout = msecs_to_jiffies(msecs) + 1; + timeout = jiffs + 1; while (timeout && !signal_pending(current)) timeout = schedule_timeout_interruptible(timeout); -- 2.19.1