Re: Resume does not work after timekeeping change

[John Stultz <john.stultz@linaro.org>]

On 04/20/2013 08:46 AM, Jiri Slaby wrote:
> Hi,
>
> my machine does not wake from suspend to RAM on my box running the -next
> kernel. The last thing I see is "Disabling non-boot CPUs ...". I
> bisected it to this commit:
>
> commit 7ec98e15aa049b7a2ca73485f31cf4f90c34e2dd
> Author: Thomas Gleixner <tglx@linutronix.de>
> Date:   Thu Feb 21 22:51:39 2013 +0000
>
>      timekeeping: Delay update of clock->cycle_last
>
>
> Reverting that one on the top of -next-20130419 makes it work again.
>
>
> I also tried it inside a VM using suspend to disk. There, it behaves
> like it takes a minute or so to wake up. So I tried to wait on the real
> HW too, but it never resumes there.

Thanks for chasing this down! Sorry for the trouble, does the following fix resolve this?

thanks
-john

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 675f720..94041a9 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -952,6 +952,7 @@ static void timekeeping_resume(void)
  
  	/* Re-base the last cycle value */
  	clock->cycle_last = cycle_now;
+	tk->cycle_last = cycle_now;
  	tk->ntp_error = 0;
  	timekeeping_suspended = 0;
  	timekeeping_update(tk, false, true);