From patchwork Mon Feb 3 22:34:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3572211 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 A2E989F38A for ; Mon, 3 Feb 2014 22:37:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D5F482015E for ; Mon, 3 Feb 2014 22:37:15 +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 DE49920158 for ; Mon, 3 Feb 2014 22:37:14 +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 1WAS7P-00087A-JL; Mon, 03 Feb 2014 22:35:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAS7B-0004tT-Oy; Mon, 03 Feb 2014 22:35:41 +0000 Received: from mail-qa0-x234.google.com ([2607:f8b0:400d:c00::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAS6m-0004mz-6K for linux-arm-kernel@lists.infradead.org; Mon, 03 Feb 2014 22:35:17 +0000 Received: by mail-qa0-f52.google.com with SMTP id j15so10994321qaq.39 for ; Mon, 03 Feb 2014 14:34:52 -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=2hy/uiSL/JPLcfb2BT3EDWv+3VaR/aw/VsHIuC9h5l8=; b=u5v80o/88G7IqV4kOb1ik11oX/A2ZRFs512xUtAmVYiVJJyWohqwVcmlPf+5olyjeR UtdgW7gVW/5Q+SSFcp/E7gk0h4F9TfhgMqbiOrNX6CDI9rIB+caeferar1TQzOQ21rZk jhMfKVBppHS3Ih6cXW2KEQlhD/c9d+fH7pU9DY0Sg43FqXfyH4uQEpVH3JuvBHxpQoHb omnsGeEbSp+FUGcZ48YUPgnmQpRR+wfYkQaKn7sm9NOt5smAyvaBVWgJ8wTyrp4yRZ+u oY+eAI5aY5X9b7cuZPyBrWgJmfuak1+gOAdsJKP048Sxh8YtrKvw7zJOUWLbNKR9GEjx TMmg== X-Received: by 10.140.22.232 with SMTP id 95mr56840341qgn.82.1391466892354; Mon, 03 Feb 2014 14:34:52 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id o10sm60740211qaa.6.2014.02.03.14.34.50 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 03 Feb 2014 14:34:51 -0800 (PST) From: Soren Brinkmann To: Thomas Gleixner , Daniel Lezcano , Michal Simek Subject: [PATCH v3 2/7] time: clockevents: Adjust timer interval when frequency changes Date: Mon, 3 Feb 2014 14:34:32 -0800 Message-Id: <1391466877-28908-3-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391466877-28908-1-git-send-email-soren.brinkmann@xilinx.com> References: <1391466877-28908-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140203_173516_362472_192857D5 X-CRM114-Status: GOOD ( 10.12 ) X-Spam-Score: -1.9 (-) Cc: =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-kernel@vger.kernel.org, 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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 --- It is assumed that simply calling the timer's 'set_mode()' API takes care of programming an appropriate interval based on the current timer frequency. If that doesn't work for all timers, I guess it might require a new API call. --- 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; } /**