From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: linux-kernel@vger•kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
stable@vger•kernel.org, Prarit Bhargava <prarit@redhat•com>,
Richard Cochran <richardcochran@gmail•com>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>,
Andy Lutomirski <luto@amacapital•net>,
kevin.b.stanton@intel•com, kevin.j.clarke@intel•com,
hpa@zytor•com, jeffrey.t.kirsher@intel•com,
netdev@vger•kernel.org,
"Christopher S. Hall" <christopher.s.hall@intel•com>,
John Stultz <john.stultz@linaro•org>
Subject: [PATCH 4.4 01/21] time: Add cycles to nanoseconds translation
Date: Fri, 14 Oct 2016 13:40:39 +0200 [thread overview]
Message-ID: <20161014114024.727012250@linuxfoundation.org> (raw)
In-Reply-To: <20161014114024.667943585@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christopher S. Hall <christopher.s.hall@intel•com>
commit 6bd58f09e1d8cc6c50a824c00bf0d617919986a1 upstream.
The timekeeping code does not currently provide a way to translate
externally provided clocksource cycles to system time. The cycle count
is always provided by the result clocksource read() method internal to
the timekeeping code. The added function timekeeping_cycles_to_ns()
calculated a nanosecond value from a cycle count that can be added to
tk_read_base.base value yielding the current system time. This allows
clocksource cycle values external to the timekeeping code to provide a
cycle count that can be transformed to system time.
Cc: Prarit Bhargava <prarit@redhat•com>
Cc: Richard Cochran <richardcochran@gmail•com>
Cc: Thomas Gleixner <tglx@linutronix•de>
Cc: Ingo Molnar <mingo@kernel•org>
Cc: Andy Lutomirski <luto@amacapital•net>
Cc: kevin.b.stanton@intel•com
Cc: kevin.j.clarke@intel•com
Cc: hpa@zytor•com
Cc: jeffrey.t.kirsher@intel•com
Cc: netdev@vger•kernel.org
Reviewed-by: Thomas Gleixner <tglx@linutronix•de>
Signed-off-by: Christopher S. Hall <christopher.s.hall@intel•com>
Signed-off-by: John Stultz <john.stultz@linaro•org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
---
kernel/time/timekeeping.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -298,17 +298,34 @@ u32 (*arch_gettimeoffset)(void) = defaul
static inline u32 arch_gettimeoffset(void) { return 0; }
#endif
+static inline s64 timekeeping_delta_to_ns(struct tk_read_base *tkr,
+ cycle_t delta)
+{
+ s64 nsec;
+
+ nsec = delta * tkr->mult + tkr->xtime_nsec;
+ nsec >>= tkr->shift;
+
+ /* If arch requires, add in get_arch_timeoffset() */
+ return nsec + arch_gettimeoffset();
+}
+
static inline s64 timekeeping_get_ns(struct tk_read_base *tkr)
{
cycle_t delta;
- s64 nsec;
delta = timekeeping_get_delta(tkr);
+ return timekeeping_delta_to_ns(tkr, delta);
+}
- nsec = (delta * tkr->mult + tkr->xtime_nsec) >> tkr->shift;
+static inline s64 timekeeping_cycles_to_ns(struct tk_read_base *tkr,
+ cycle_t cycles)
+{
+ cycle_t delta;
- /* If arch requires, add in get_arch_timeoffset() */
- return nsec + arch_gettimeoffset();
+ /* calculate the delta since the last update_wall_time */
+ delta = clocksource_delta(cycles, tkr->cycle_last, tkr->mask);
+ return timekeeping_delta_to_ns(tkr, delta);
}
/**
parent reply other threads:[~2016-10-14 11:40 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20161014114024.667943585@linuxfoundation.org>]
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=20161014114024.727012250@linuxfoundation.org \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=christopher.s.hall@intel$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=john.stultz@linaro$(echo .)org \
--cc=kevin.b.stanton@intel$(echo .)com \
--cc=kevin.j.clarke@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=mingo@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=prarit@redhat$(echo .)com \
--cc=richardcochran@gmail$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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