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

Commit 315f28fa authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x66/vdso: Add CLOCK_TAI support 



With the storage array in place it's now trivial to support CLOCK_TAI in
the vdso. Extend the base time storage array and add the update code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarMatt Rickard <matt@softrans.com.au>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Florian Weimer <fweimer@redhat.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: devel@linuxdriverproject.org
Cc: virtualization@lists.linux-foundation.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Juergen Gross <jgross@suse.com>
Link: https://lkml.kernel.org/r/20180917130707.823878601@linutronix.de
parent 3e89bf35

arch/x86/entry/vsyscall/vsyscall_gtod.c

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ void update_vsyscall(struct timekeeper *tk) 
	base->sec = tk->xtime_sec;

	base->nsec = tk->tkr_mono.xtime_nsec;



	base = &vdata->basetime[CLOCK_TAI];

	base->sec = tk->xtime_sec + (s64)tk->tai_offset;

	base->nsec = tk->tkr_mono.xtime_nsec;



	base = &vdata->basetime[CLOCK_MONOTONIC];

	base->sec = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;

	nsec = tk->tkr_mono.xtime_nsec;

arch/x86/include/asm/vgtod.h

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ struct vgtod_ts { 
	u64		nsec;

};



#define VGTOD_BASES	(CLOCK_MONOTONIC_COARSE + 1)

#define VGTOD_HRES	(BIT(CLOCK_REALTIME) | BIT(CLOCK_MONOTONIC))

#define VGTOD_BASES	(CLOCK_TAI + 1)

#define VGTOD_HRES	(BIT(CLOCK_REALTIME) | BIT(CLOCK_MONOTONIC) | BIT(CLOCK_TAI))

#define VGTOD_COARSE	(BIT(CLOCK_REALTIME_COARSE) | BIT(CLOCK_MONOTONIC_COARSE))



/*