From: Nicolai Stange <nicstange@gmail.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>,
linux-kernel@vger.kernel.org,
Nicolai Stange <nicstange@gmail.com>
Subject: [RFC v4 22/22] timekeeping: inform clockevents about freq adjustments
Date: Tue, 23 Aug 2016 01:33:20 +0200 [thread overview]
Message-ID: <20160822233320.4548-23-nicstange@gmail.com> (raw)
In-Reply-To: <20160822233320.4548-1-nicstange@gmail.com>
Upon adjustments of the monotonic clock's frequencies from the
timekeeping core, the clockevents devices' ->mult_adjusted should be
changed accordingly, too.
Introduce clockevents_adjust_all_freqs() which traverses all registered
clockevent devices and recalculates their ->mult_adjusted based on the
monotonic clock's current frequency.
Call clockevents_adjust_all_freqs() from timekeeping_apply_adjustment().
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
---
kernel/time/clockevents.c | 25 +++++++++++++++++++++++++
kernel/time/tick-internal.h | 1 +
kernel/time/timekeeping.c | 3 +++
3 files changed, 29 insertions(+)
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index ee7cd40..8f58565 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -561,6 +561,31 @@ void __clockevents_adjust_freq(struct clock_event_device *dev)
dev->shift));
}
+void clockevents_adjust_all_freqs(u32 mult_cs_mono, u32 mult_cs_raw)
+{
+ u32 last_mult_raw = 0, last_mult_adjusted = 0;
+ u32 mult_raw;
+ unsigned long flags;
+ struct clock_event_device *dev;
+
+ raw_spin_lock_irqsave(&clockevents_lock, flags);
+ list_for_each_entry(dev, &clockevent_devices, list) {
+ if (!(dev->features & CLOCK_EVT_FEAT_ONESHOT))
+ continue;
+
+ mult_raw = dev->mult;
+ if (mult_raw != last_mult_raw) {
+ last_mult_raw = mult_raw;
+ last_mult_adjusted =
+ __clockevents_calc_adjust_freq(mult_raw,
+ mult_cs_mono,
+ mult_cs_raw);
+ }
+ dev->mult_adjusted = last_mult_adjusted;
+ }
+ raw_spin_unlock_irqrestore(&clockevents_lock, flags);
+}
+
int __clockevents_update_freq(struct clock_event_device *dev, u32 freq)
{
clockevents_config(dev, freq);
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index 0b29d23..9162671 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -56,6 +56,7 @@ extern int clockevents_program_event(struct clock_event_device *dev,
ktime_t expires, bool force);
extern void clockevents_handle_noop(struct clock_event_device *dev);
extern int __clockevents_update_freq(struct clock_event_device *dev, u32 freq);
+extern void clockevents_adjust_all_freqs(u32 mult_cs_mono, u32 mult_cs_raw);
extern void timekeeping_get_mono_mult(u32 *mult_cs_mono, u32 *mult_cs_raw);
extern ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6eac5b5..8d378b9 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1845,6 +1845,9 @@ static __always_inline void timekeeping_apply_adjustment(struct timekeeper *tk,
tk->xtime_interval += interval;
tk->tkr_mono.xtime_nsec -= offset;
tk->ntp_error -= (interval - offset) << tk->ntp_error_shift;
+
+ clockevents_adjust_all_freqs(tk->tkr_mono.mult,
+ tk->tkr_mono.clock->mult);
}
/*
--
2.9.2
next prev parent reply other threads:[~2016-08-22 23:34 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-22 23:32 [RFC v4 00/22] adapt clockevents frequencies to mono clock Nicolai Stange
2016-08-22 23:32 ` [RFC v4 01/22] clocksource: sh_cmt: compute rate before registration again Nicolai Stange
2016-08-22 23:33 ` [RFC v4 02/22] clocksource: sh_tmu: " Nicolai Stange
2016-08-22 23:33 ` [RFC v4 03/22] clocksource: em_sti: split clock prepare and enable steps Nicolai Stange
2016-08-22 23:33 ` [RFC v4 04/22] clocksource: em_sti: compute rate before registration Nicolai Stange
2016-08-22 23:33 ` [RFC v4 05/22] clocksource: h8300_timer8: don't reset rate in ->set_state_oneshot() Nicolai Stange
2016-08-22 23:33 ` [RFC v4 06/22] clockevents: make clockevents_config() static Nicolai Stange
2016-08-22 23:33 ` [RFC v4 07/22] many clockevent drivers: set ->min_delta_ticks and ->max_delta_ticks Nicolai Stange
2016-08-22 23:33 ` [RFC v4 08/22] arch/s390/kernel/time: " Nicolai Stange
2016-08-22 23:33 ` [RFC v4 09/22] arch/x86/platform/uv/uv_time: " Nicolai Stange
2016-08-22 23:33 ` [RFC v4 10/22] arch/tile/kernel/time: " Nicolai Stange
2016-09-06 19:19 ` Chris Metcalf
2016-09-08 11:21 ` Nicolai Stange
2016-09-09 16:25 ` Chris Metcalf
2016-08-22 23:33 ` [RFC v4 11/22] clockevents: always initialize ->min_delta_ns and ->max_delta_ns Nicolai Stange
2016-08-22 23:33 ` [RFC v4 12/22] many clockevent drivers: don't set " Nicolai Stange
2016-08-22 23:33 ` [RFC v4 13/22] clockevents: check a programmed delta's bounds in terms of cycles Nicolai Stange
2016-08-27 15:20 ` Nicolai Stange
2016-08-31 8:31 ` Nicolai Stange
2016-08-22 23:33 ` [RFC v4 14/22] clockevents: clockevents_program_event(): turn clc into unsigned long Nicolai Stange
2016-08-25 13:20 ` Thomas Gleixner
2016-08-27 15:23 ` Nicolai Stange
2016-08-22 23:33 ` [RFC v4 15/22] clockevents: clockevents_program_min_delta(): don't set ->next_event Nicolai Stange
2016-08-22 23:33 ` [RFC v4 16/22] clockevents: use ->min_delta_ticks_adjusted to program minimum delta Nicolai Stange
2016-08-24 9:28 ` Nicolai Stange
2016-08-22 23:33 ` [RFC v4 17/22] clockevents: min delta increment: calculate min_delta_ns from ticks Nicolai Stange
2016-08-22 23:33 ` [RFC v4 18/22] timer_list: print_tickdevice(): calculate ->*_delta_ns dynamically Nicolai Stange
2016-08-22 23:33 ` [RFC v4 19/22] clockevents: purge ->min_delta_ns and ->max_delta_ns Nicolai Stange
2016-08-22 23:33 ` [RFC v4 20/22] clockevents: initial support for mono to raw time conversion Nicolai Stange
2016-08-22 23:33 ` [RFC v4 21/22] clockevents: make setting of ->mult and ->mult_adjusted atomic Nicolai Stange
2016-08-22 23:33 ` Nicolai Stange [this message]
2016-08-24 9:40 ` [RFC v4 22/22] timekeeping: inform clockevents about freq adjustments Nicolai Stange
2016-08-25 14:56 ` Thomas Gleixner
2016-08-25 15:25 ` Thomas Gleixner
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=20160822233320.4548-23-nicstange@gmail.com \
--to=nicstange@gmail.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).