From patchwork Tue Dec 10 00:34:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3313801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B25D59F37A for ; Tue, 10 Dec 2013 00:37:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E80FD202EA for ; Tue, 10 Dec 2013 00:37:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07F36202B8 for ; Tue, 10 Dec 2013 00:37:07 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqBJD-00069E-5G; Tue, 10 Dec 2013 00:36:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqBJ0-0008FH-AX; Tue, 10 Dec 2013 00:36:06 +0000 Received: from mail-pd0-x22c.google.com ([2607:f8b0:400e:c02::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqBIh-0008B7-Nc for linux-arm-kernel@lists.infradead.org; Tue, 10 Dec 2013 00:35:49 +0000 Received: by mail-pd0-f172.google.com with SMTP id g10so6163007pdj.31 for ; Mon, 09 Dec 2013 16:35:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=nMIyEvHrGDpNm8zthsjFKfVb2WaWqxcBpPwhhUANZmw=; b=KVZu03jJ74QCYdWh1xM3UZeLKv/iQJ7VEhikazeh/ftVhKqDHW+rQDbQXxpz7ZGbnX 50I+dn6FUCbUiP5IILFsZI30qzhBEe/3WX3G/BgIjEk3aa9/n7BQ37L0f2KKoLnHw1wW 4XsFnWYi0k6yILkaCe5rFUsajFm/HbJZreKH7+RE4W8lkbwnbVJOaJwcUzXGPA9vQ8BI yiaFmRxFH3w4tI5m9/L7JFCuzZJBJEdbb3eBSrZJ9XN2nxoc7/8vE2XJZJQrRavdEmIB eXElN0emoLbFaZw0IwnJmRkdKaCaDxR64UYgXfMIXcUoWnt42BzPe5IVTMBLOtXGkVKV zdGg== X-Received: by 10.68.196.193 with SMTP id io1mr24239122pbc.46.1386635726291; Mon, 09 Dec 2013 16:35:26 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id ie6sm21002695pbc.6.2013.12.09.16.35.24 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 09 Dec 2013 16:35:25 -0800 (PST) From: Soren Brinkmann To: Daniel Lezcano , Thomas Gleixner Subject: [PATCH 2/2] time: clockevents: Adjust timer interval when frequency changes Date: Mon, 9 Dec 2013 16:34:46 -0800 Message-Id: <1386635686-15686-3-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1386635686-15686-1-git-send-email-soren.brinkmann@xilinx.com> References: <1386635686-15686-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131209_193547_913333_939F8BB5 X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Ian Campbell , Stephen Warren , Michal Simek , Rob Herring , linux-kernel@vger.kernel.org, =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To adjust the timer's interval in periodic mode, the clockevent device is put into periodic mode during clockevents_update_freq() in case the timer is in periodic mode. Cc: Thomas Gleixner Signed-off-by: Soren Brinkmann --- kernel/time/clockevents.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 641d91003a45..f85e5fda9c66 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c @@ -443,10 +443,13 @@ int __clockevents_update_freq(struct clock_event_device *dev, u32 freq) { clockevents_config(dev, freq); - if (dev->mode != CLOCK_EVT_MODE_ONESHOT) - return 0; + if (dev->mode == CLOCK_EVT_MODE_ONESHOT) + return clockevents_program_event(dev, dev->next_event, false); + + if (dev->mode == CLOCK_EVT_MODE_PERIODIC) + dev->set_mode(CLOCK_EVT_MODE_PERIODIC, dev); - return clockevents_program_event(dev, dev->next_event, false); + return 0; } /**