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

Commit a00bea9a authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: timekeeping: Add missing _ns functions for coarse accessors 



This further unifies the accessors for the fast and coarse functions, so
that the same types of functions are available for each. There was also
a bit of confusion with the documentation, which prior advertised a
function that has never existed. Finally, the vanilla ktime_get_coarse()
was omitted from the API originally, so this fills this oversight.

Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/20190621203249.3909-3-Jason@zx2c4.com


(cherry picked from commit 4c54294d01e605a9f992361b924c5d8b12822a6d)
Bug: 152722841
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I6beab35b160e85c9f473c86d248af5ae962f9ac2
parent f34aa80c

Documentation/core-api/timekeeping.rst

+7 −3
Original line number Diff line number Diff line
@@ -99,16 +99,20 @@ Coarse and fast_ns access 


Some additional variants exist for more specialized cases:



.. c:function:: ktime_t ktime_get_coarse_boottime( void )

.. c:function:: ktime_t ktime_get_coarse( void )

		ktime_t ktime_get_coarse_boottime( void )

		ktime_t ktime_get_coarse_real( void )

		ktime_t ktime_get_coarse_clocktai( void )

		ktime_t ktime_get_coarse_raw( void )



.. c:function:: u64 ktime_get_coarse_ns( void )

		u64 ktime_get_coarse_boot_ns( void )

		u64 ktime_get_coarse_real_ns( void )

		u64 ktime_get_coarse_clocktai_ns( void )



.. c:function:: void ktime_get_coarse_ts64( struct timespec64 * )

		void ktime_get_coarse_boottime_ts64( struct timespec64 * )

		void ktime_get_coarse_real_ts64( struct timespec64 * )

		void ktime_get_coarse_clocktai_ts64( struct timespec64 * )

		void ktime_get_coarse_raw_ts64( struct timespec64 * )



	These are quicker than the non-coarse versions, but less accurate,

	corresponding to CLOCK_MONONOTNIC_COARSE and CLOCK_REALTIME_COARSE

include/linux/timekeeping.h

+28 −0
Original line number Diff line number Diff line
@@ -113,6 +113,34 @@ static inline ktime_t ktime_get_coarse_clocktai(void) 
	return ktime_get_coarse_with_offset(TK_OFFS_TAI);

}



static inline ktime_t ktime_get_coarse(void)

{

	struct timespec64 ts;



	ktime_get_coarse_ts64(&ts);

	return timespec64_to_ktime(ts);

}



static inline u64 ktime_get_coarse_ns(void)

{

	return ktime_to_ns(ktime_get_coarse());

}



static inline u64 ktime_get_coarse_real_ns(void)

{

	return ktime_to_ns(ktime_get_coarse_real());

}



static inline u64 ktime_get_coarse_boot_ns(void)

{

	return ktime_to_ns(ktime_get_coarse_boottime());

}



static inline u64 ktime_get_coarse_clocktai_ns(void)

{

	return ktime_to_ns(ktime_get_coarse_clocktai());

}



/**

 * ktime_mono_to_real - Convert monotonic time to clock realtime

 */