From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Nicolai Stange <nicstange@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Richard Cochran <richardcochran@gmail.com>,
Prarit Bhargava <prarit@redhat.com>,
Stephen Boyd <sboyd@codeaurora.org>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 5/9] clocksource: h8300_timer8: Don't reset rate in ->set_state_oneshot()
Date: Thu, 30 Mar 2017 14:01:20 -0700 [thread overview]
Message-ID: <1490907684-11186-6-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1490907684-11186-1-git-send-email-john.stultz@linaro.org>
From: Nicolai Stange <nicstange@gmail.com>
With the upcoming NTP correction related rate adjustments to be implemented
in the clockevents core, the latter needs to get informed about every rate
change of a clockevent device made after its registration.
Currently, h8300_timer8 violates this requirement in that it registers its
clockevent device with the correct rate, but resets its ->mult and ->rate
values in timer8_clock_event_start(), called from its ->set_state_oneshot()
function.
It seems like
commit 4633f4cac85a ("clocksource/drivers/h8300: Cleanup startup and
remove module code."),
which introduced the rate initialization at registration, missed to remove
the manual setting of ->mult and ->shift from timer8_clock_event_start().
Purge the setting of ->mult, ->shift, ->min_delta_ns and ->max_delta_ns
from timer8_clock_event_start().
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
drivers/clocksource/h8300_timer8.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c
index 546bb18..804c489 100644
--- a/drivers/clocksource/h8300_timer8.c
+++ b/drivers/clocksource/h8300_timer8.c
@@ -101,15 +101,7 @@ static inline struct timer8_priv *ced_to_priv(struct clock_event_device *ced)
static void timer8_clock_event_start(struct timer8_priv *p, unsigned long delta)
{
- struct clock_event_device *ced = &p->ced;
-
timer8_start(p);
-
- ced->shift = 32;
- ced->mult = div_sc(p->rate, NSEC_PER_SEC, ced->shift);
- ced->max_delta_ns = clockevent_delta2ns(0xffff, ced);
- ced->min_delta_ns = clockevent_delta2ns(0x0001, ced);
-
timer8_set_next(p, delta);
}
--
2.7.4
next prev parent reply other threads:[~2017-03-30 21:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 21:01 [GIT PULL][PATCH 0/9] Timekeeping changes for 4.12 John Stultz
2017-03-30 21:01 ` [PATCH 1/9] clocksource: sh_cmt: Compute rate before registration again John Stultz
2017-03-30 21:01 ` [PATCH 2/9] clocksource: sh_tmu: " John Stultz
2017-03-30 21:01 ` [PATCH 3/9] clocksource: em_sti: Split clock prepare and enable steps John Stultz
2017-03-30 21:01 ` [PATCH 4/9] clocksource: em_sti: Compute rate before registration John Stultz
2017-03-30 21:01 ` John Stultz [this message]
2017-03-30 21:01 ` [PATCH 6/9] clockevents: Make clockevents_config() static John Stultz
2017-03-30 21:01 ` [PATCH 7/9] MAINTAINERS: Add Stephen Boyd as timekeeping reviewer John Stultz
2017-03-30 21:01 ` [PATCH 8/9] timers, sched_clock: Update timeout for clock wrap John Stultz
2017-03-30 21:01 ` [PATCH 9/9] sysrq: Reset the watchdog timers while displaying high-resolution timers John Stultz
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=1490907684-11186-6-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=nicstange@gmail.com \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=sboyd@codeaurora.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®