Commit e84f43e3 authored by Adrian Hunter's avatar Adrian Hunter Committed by Thomas Gleixner
Browse files

timekeeping: Consolidate timekeeping helpers 



Consolidate timekeeping helpers, making use of timekeeping_cycles_to_ns()
in preference to directly using timekeeping_delta_to_ns().

No functional change.

Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240325064023.2997-15-adrian.hunter@intel.com
parent e8e9d21a

kernel/time/timekeeping.c

+8 −6
Original line number Diff line number Diff line
@@ -237,7 +237,9 @@ static void timekeeping_check_update(struct timekeeper *tk, u64 offset) 
	}

}



static inline u64 timekeeping_debug_get_delta(const struct tk_read_base *tkr)

static inline u64 timekeeping_cycles_to_ns(const struct tk_read_base *tkr, u64 cycles);



static inline u64 timekeeping_debug_get_ns(const struct tk_read_base *tkr)

{

	struct timekeeper *tk = &tk_core.timekeeper;

	u64 now, last, mask, max, delta;
@@ -266,22 +268,22 @@ static inline u64 timekeeping_debug_get_delta(const struct tk_read_base *tkr) 
	 */

	if (unlikely((~delta & mask) < (mask >> 3))) {

		tk->underflow_seen = 1;

		delta = 0;

		now = last;

	}



	/* Cap delta value to the max_cycles values to avoid mult overflows */

	if (unlikely(delta > max)) {

		tk->overflow_seen = 1;

		delta = tkr->clock->max_cycles;

		now = last + max;

	}



	return delta;

	return timekeeping_cycles_to_ns(tkr, now);

}

#else

static inline void timekeeping_check_update(struct timekeeper *tk, u64 offset)

{

}

static inline u64 timekeeping_debug_get_delta(const struct tk_read_base *tkr)

static inline u64 timekeeping_debug_get_ns(const struct tk_read_base *tkr)

{

	BUG();

}
@@ -389,7 +391,7 @@ 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)

{

	if (IS_ENABLED(CONFIG_DEBUG_TIMEKEEPING))

		return timekeeping_delta_to_ns(tkr, timekeeping_debug_get_delta(tkr));

		return timekeeping_debug_get_ns(tkr);



	return __timekeeping_get_ns(tkr);

}