Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abb3a4ea authored by John Stultz's avatar John Stultz
Browse files

time: Introduce get_monotonic_boottime and ktime_get_boottime 



This adds new functions that return the monotonic time since boot
(in other words, CLOCK_MONOTONIC + suspend time).

CC: Jamie Lokier <jamie@shareable.org>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Alexander Shishkin <virtuoso@slind.org>
CC: Arve Hjønnevåg <arve@android.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent e06383db

include/linux/hrtimer.h

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer) 


extern ktime_t ktime_get(void);

extern ktime_t ktime_get_real(void);

extern ktime_t ktime_get_boottime(void);





DECLARE_PER_CPU(struct tick_device, tick_cpu_device);

include/linux/time.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ extern void getnstime_raw_and_real(struct timespec *ts_raw, 
		struct timespec *ts_real);

extern void getboottime(struct timespec *ts);

extern void monotonic_to_bootbased(struct timespec *ts);

extern void get_monotonic_boottime(struct timespec *ts);



extern struct timespec timespec_trunc(struct timespec t, unsigned gran);

extern int timekeeping_valid_for_hres(void);

kernel/time/timekeeping.c

+50 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static void update_wall_time(void) 
 * getboottime - Return the real time of system boot.

 * @ts:		pointer to the timespec to be set

 *

 * Returns the time of day in a timespec.

 * Returns the wall-time of boot in a timespec.

 *

 * This is based on the wall_to_monotonic offset and the total suspend

 * time. Calls to settimeofday will affect the value returned (which
@@ -925,6 +925,55 @@ void getboottime(struct timespec *ts) 
}

EXPORT_SYMBOL_GPL(getboottime);





/**

 * get_monotonic_boottime - Returns monotonic time since boot

 * @ts:		pointer to the timespec to be set

 *

 * Returns the monotonic time since boot in a timespec.

 *

 * This is similar to CLOCK_MONTONIC/ktime_get_ts, but also

 * includes the time spent in suspend.

 */

void get_monotonic_boottime(struct timespec *ts)

{

	struct timespec tomono, sleep;

	unsigned int seq;

	s64 nsecs;



	WARN_ON(timekeeping_suspended);



	do {

		seq = read_seqbegin(&xtime_lock);

		*ts = xtime;

		tomono = wall_to_monotonic;

		sleep = total_sleep_time;

		nsecs = timekeeping_get_ns();



	} while (read_seqretry(&xtime_lock, seq));



	set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec + sleep.tv_sec,

			ts->tv_nsec + tomono.tv_nsec + sleep.tv_nsec + nsecs);

}

EXPORT_SYMBOL_GPL(get_monotonic_boottime);



/**

 * ktime_get_boottime - Returns monotonic time since boot in a ktime

 *

 * Returns the monotonic time since boot in a ktime

 *

 * This is similar to CLOCK_MONTONIC/ktime_get, but also

 * includes the time spent in suspend.

 */

ktime_t ktime_get_boottime(void)

{

	struct timespec ts;



	get_monotonic_boottime(&ts);

	return timespec_to_ktime(ts);

}

EXPORT_SYMBOL_GPL(ktime_get_boottime);



/**

 * monotonic_to_bootbased - Convert the monotonic time to boot based.

 * @ts:		pointer to the timespec to be converted