1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 70624695b6d5..ccd296dbb95c 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -95,7 +95,7 @@ static void __update_runtime_status(struct device *dev, enum rpm_status status)
 static void pm_runtime_deactivate_timer(struct device *dev)
 {
         if (dev->power.timer_expires > 0) {
-                hrtimer_cancel(&dev->power.suspend_timer);
+                hrtimer_try_to_cancel(&dev->power.suspend_timer);
                 dev->power.timer_expires = 0;
         }
 }
@@ -121,7 +121,7 @@ static void pm_runtime_cancel_pending(struct device *dev)
  * Compute the autosuspend-delay expiration time based on the device's
  * power.last_busy time.  If the delay has already expired or is disabled
  * (negative) or the power.use_autosuspend flag isn't set, return 0.
- * Otherwise return the expiration time in jiffies (adjusted to be nonzero).
+ * Otherwise return the expiration time in nanoseconds (adjusted to be nonzero).
  *
  * This function may be called either with or without dev->power.lock held.
  * Either way it can be racy, since power.last_busy may be updated at any time.
@@ -130,7 +130,7 @@ u64 pm_runtime_autosuspend_expiration(struct device *dev)
 {
         int autosuspend_delay;
         u64 last_busy, expires = 0;
-        u64 now = ktime_to_ns(ktime_get());
+        u64 now = ktime_get_mono_fast_ns();
 
         if (!dev->power.use_autosuspend)
                 goto out;
@@ -141,7 +141,7 @@ u64 pm_runtime_autosuspend_expiration(struct device *dev)
 
         last_busy = READ_ONCE(dev->power.last_busy);
 
-        expires = last_busy + autosuspend_delay * NSEC_PER_MSEC;
+        expires = last_busy + (u64)autosuspend_delay * NSEC_PER_MSEC;
         if (expires <= now)
                 expires = 0;    /* Already expired. */
 
@@ -525,7 +525,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
                                  * We add a slack of 25% to gather wakeups
                                  * without sacrificing the granularity.
                                  */
-                                u64 slack = READ_ONCE(dev->power.autosuspend_delay) *
+                                u64 slack = (u64)READ_ONCE(dev->power.autosuspend_delay) *
                                                     (NSEC_PER_MSEC >> 2);
 
                                 dev->power.timer_expires = expires;
@@ -905,8 +905,11 @@ static enum hrtimer_restart  pm_suspend_timer_fn(struct hrtimer *timer)
         spin_lock_irqsave(&dev->power.lock, flags);
 
         expires = dev->power.timer_expires;
-        /* If 'expire' is after 'jiffies' we've been called too early. */
-        if (expires > 0 && expires < ktime_to_ns(ktime_get())) {
+        /*
+         * If 'expires' is after the current time, we've been called
+         * too early.
+         */
+        if (expires > 0 && expires < ktime_get_mono_fast_ns()) {
                 dev->power.timer_expires = 0;
                 rpm_suspend(dev, dev->power.timer_autosuspends ?
                     (RPM_ASYNC | RPM_AUTO) : RPM_ASYNC);
@@ -925,7 +928,7 @@ static enum hrtimer_restart  pm_suspend_timer_fn(struct hrtimer *timer)
 int pm_schedule_suspend(struct device *dev, unsigned int delay)
 {
         unsigned long flags;
-        ktime_t expires;
+        u64 expires;
         int retval;
 
         spin_lock_irqsave(&dev->power.lock, flags);
@@ -942,8 +945,8 @@ int pm_schedule_suspend(struct device *dev, unsigned int delay)
         /* Other scheduled or pending requests need to be canceled. */
         pm_runtime_cancel_pending(dev);
 
-        expires = ktime_add(ktime_get(), ms_to_ktime(delay));
-        dev->power.timer_expires = ktime_to_ns(expires);
+        expires = ktime_get_mono_fast_ns() + (u64)delay * NSEC_PER_MSEC;
+        dev->power.timer_expires = expires;
         dev->power.timer_autosuspends = 0;
         hrtimer_start(&dev->power.suspend_timer, expires, HRTIMER_MODE_ABS);