From patchwork Mon Jul 16 09:47:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 1200401 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B50843FC33 for ; Mon, 16 Jul 2012 09:47:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751841Ab2GPJrk (ORCPT ); Mon, 16 Jul 2012 05:47:40 -0400 Received: from www.linutronix.de ([62.245.132.108]:52241 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522Ab2GPJrj (ORCPT ); Mon, 16 Jul 2012 05:47:39 -0400 Received: from localhost ([127.0.0.1]) by Galois.linutronix.de with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Sqhts-00049e-8H; Mon, 16 Jul 2012 11:47:32 +0200 Date: Mon, 16 Jul 2012 11:47:31 +0200 (CEST) From: Thomas Gleixner To: "Rafael J. Wysocki" cc: Linus Torvalds , Linux PM list , LKML , John Stultz , Ingo Molnar , Peter Zijlstra , Prarit Bhargava , stable@vger.kernel.org, Andreas Schwab Subject: Re: [Regression][Revert request] Excessive delay or hang during resume from system suspend due to a hrtimer commit In-Reply-To: <201207152240.50129.rjw@sisk.pl> Message-ID: References: <201207152240.50129.rjw@sisk.pl> User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-Version: 1.0 X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Sun, 15 Jul 2012, Rafael J. Wysocki wrote: > To everyone involved: the fact that this change, which was likely to introduce > regressions from the look of it alone, has been pushed to Linus (an to -stable > at the same time!) so late in the cycle, is seriuosly disappointing. Well, we spent an massive amount of time in testing, reviewing and discussion and it definitely did not break suspend/resume here. This was not pushed without a lot of thoughts and in fact what you are seing is another long standing bug in the timekeeping resume code, which was just papered over by the incorrect handling of the clock was set cases in the other parts of the system. Does the following patch fix the problem for you ? @John: Should that clear ntp as well or is it enough to set ntp_error to 0 ? /me really goes on vacation now. Thanks, tglx --------- --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 269b1fe..3447cfa 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -717,6 +717,7 @@ static void timekeeping_resume(void) timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock); timekeeper.ntp_error = 0; timekeeping_suspended = 0; + timekeeping_update(false); write_sequnlock_irqrestore(&timekeeper.lock, flags); touch_softlockup_watchdog();