From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: "Rob Herring" <rob.herring@calxeda.com>,
"Pawel Moll" <pawel.moll@arm.com>,
"Mark Rutland" <mark.rutland@arm.com>,
"Stephen Warren" <swarren@wwwdotorg.org>,
"Ian Campbell" <ijc+devicetree@hellion.org.uk>,
"Russell King" <linux@arm.linux.org.uk>,
"Michal Simek" <michal.simek@xilinx.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
"Sören Brinkmann" <soren.brinkmann@xilinx.com>
Subject: [PATCH 2/2] time: clockevents: Adjust timer interval when frequency changes
Date: Mon, 9 Dec 2013 16:34:46 -0800 [thread overview]
Message-ID: <1386635686-15686-3-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1386635686-15686-1-git-send-email-soren.brinkmann@xilinx.com>
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 <tglx@linutronix.de>
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
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;
}
/**
--
1.8.5.1
next prev parent reply other threads:[~2013-12-10 0:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 1:04 [PATCH v2 0/9] arm: zynq: Add support for cpufreq Soren Brinkmann
2013-11-27 1:04 ` [PATCH v2 1/9] arm: dt: zynq: Remove 'clock-ranges' from TTC nodes Soren Brinkmann
2013-12-12 8:53 ` Michal Simek
2013-12-12 17:01 ` Sören Brinkmann
2013-12-12 19:07 ` Michal Simek
2013-11-27 1:04 ` [PATCH v2 2/9] arm: dt: zynq: Add 'cpus' node Soren Brinkmann
2013-11-27 1:04 ` [PATCH v2 3/9] clocksource/cadence_ttc: Store timer frequency in driver data Soren Brinkmann
2013-12-17 19:21 ` Sören Brinkmann
2013-12-18 14:53 ` Daniel Lezcano
2013-12-18 16:47 ` Sören Brinkmann
2013-12-18 21:58 ` Daniel Lezcano
2013-12-19 18:32 ` Sören Brinkmann
2013-12-19 20:53 ` Daniel Lezcano
2013-12-19 21:23 ` Sören Brinkmann
2013-12-19 21:39 ` Daniel Lezcano
2013-11-27 1:04 ` [PATCH v2 4/9] clocksource/cadence_ttc: Use enable/disable_irq Soren Brinkmann
2013-11-28 11:55 ` Daniel Lezcano
2013-11-28 14:18 ` Thomas Gleixner
2013-11-28 18:36 ` Sören Brinkmann
2013-11-28 19:07 ` Thomas Gleixner
2013-12-06 22:47 ` Sören Brinkmann
2013-12-07 10:56 ` Thomas Gleixner
2013-12-10 0:34 ` [PATCH 0/2] clockevents Soren Brinkmann
2013-12-10 0:34 ` [PATCH 1/2] time: Serialize calls to 'clockevents_update_freq' in the timing core Soren Brinkmann
2013-12-11 14:32 ` Daniel Lezcano
2013-12-11 20:09 ` Sören Brinkmann
2013-12-12 12:07 ` Daniel Lezcano
2013-12-10 0:34 ` Soren Brinkmann [this message]
2013-11-27 1:04 ` [PATCH v2 5/9] clocksource/cadence_ttc: Adjust interval in clock notifier Soren Brinkmann
2013-12-12 12:15 ` Daniel Lezcano
2013-12-12 18:44 ` Sören Brinkmann
2013-11-27 1:04 ` [PATCH v2 6/9] clocksource/cadence_ttc: Overhaul clocksource frequency adjustment Soren Brinkmann
2013-11-27 1:04 ` [PATCH v2 7/9] clocksource/cadence_ttc: Use only one counter Soren Brinkmann
2013-11-27 1:04 ` [PATCH v2 8/9] arm: zynq: Don't use arm_global_timer with cpufreq Soren Brinkmann
2013-11-27 1:04 ` [PATCH v2 9/9] arm: zynq: Add support for cpufreq Soren Brinkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386635686-15686-3-git-send-email-soren.brinkmann@xilinx.com \
--to=soren.brinkmann@xilinx.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=michal.simek@xilinx.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=swarren@wwwdotorg.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®