korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-01 08:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

timekeeping: Refactor timekeeping helpers

Browse Source 
Simplify the usage of timekeeping sanity checking, in preparation for
consolidating timekeeping helpers. This works towards eliminating
timekeeping_delta_to_ns() in favour of timekeeping_cycles_to_ns().

No functional change.

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240325064023.2997-14-adrian.hunter@intel.com
This commit is contained in:
Adrian Hunter 2024-03-25 08:40:17 +02:00 committed by Thomas Gleixner
parent 670be12ba8
commit e8e9d21a5d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/time/timekeeping.c
View File

@ -237,7 +237,7 @@ static void timekeeping_check_update(struct timekeeper *tk, u64 offset)
} }
} }
static inline u64 timekeeping_get_delta(const struct tk_read_base *tkr) static inline u64 timekeeping_debug_get_delta(const struct tk_read_base *tkr)
{ {
struct timekeeper *tk = &tk_core.timekeeper; struct timekeeper *tk = &tk_core.timekeeper;
u64 now, last, mask, max, delta; u64 now, last, mask, max, delta;
@ -281,17 +281,9 @@ static inline u64 timekeeping_get_delta(const struct tk_read_base *tkr)
static inline void timekeeping_check_update(struct timekeeper *tk, u64 offset) static inline void timekeeping_check_update(struct timekeeper *tk, u64 offset)
{ {
} }
static inline u64 timekeeping_get_delta(const struct tk_read_base *tkr) static inline u64 timekeeping_debug_get_delta(const struct tk_read_base *tkr)
{ {
u64 cycle_now, delta; BUG();
/* read clocksource */
cycle_now = tk_clock_read(tkr);
/* calculate the delta since the last update_wall_time */
delta = clocksource_delta(cycle_now, tkr->cycle_last, tkr->mask);
return delta;
} }
#endif #endif
@ -396,10 +388,10 @@ static __always_inline u64 __timekeeping_get_ns(const struct tk_read_base *tkr)
static inline u64 timekeeping_get_ns(const struct tk_read_base *tkr) static inline u64 timekeeping_get_ns(const struct tk_read_base *tkr)
{ {
u64 delta; if (IS_ENABLED(CONFIG_DEBUG_TIMEKEEPING))
return timekeeping_delta_to_ns(tkr, timekeeping_debug_get_delta(tkr));
delta = timekeeping_get_delta(tkr); return __timekeeping_get_ns(tkr);
return timekeeping_delta_to_ns(tkr, delta);
} }
/** /**