x86 specific mechanism to make NTP-corrected time information available to non-Linux domains.
Signed-off-by: Wolfgang Mauerer <[email protected]> Signed-off-by: Jan Kiszka <[email protected]> --- arch/x86/Kconfig | 1 + arch/x86/include/asm/ipipe_base.h | 3 ++- arch/x86/include/asm/tsc.h | 1 + arch/x86/kernel/tsc.c | 4 ++-- arch/x86/kernel/vsyscall_64.c | 6 ++++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 89b72a9..4b1adbc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -50,6 +50,7 @@ config X86 select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_LZMA select HAVE_ARCH_KMEMCHECK + select HAVE_IPIPE_HOSTRT config OUTPUT_FORMAT string diff --git a/arch/x86/include/asm/ipipe_base.h b/arch/x86/include/asm/ipipe_base.h index 1098d6f..6131fe9 100644 --- a/arch/x86/include/asm/ipipe_base.h +++ b/arch/x86/include/asm/ipipe_base.h @@ -66,7 +66,8 @@ #define IPIPE_EVENT_INIT (IPIPE_FIRST_EVENT + 4) #define IPIPE_EVENT_EXIT (IPIPE_FIRST_EVENT + 5) #define IPIPE_EVENT_CLEANUP (IPIPE_FIRST_EVENT + 6) -#define IPIPE_LAST_EVENT IPIPE_EVENT_CLEANUP +#define IPIPE_EVENT_HOSTRT (IPIPE_FIRST_EVENT + 7) +#define IPIPE_LAST_EVENT IPIPE_EVENT_HOSTRT #define IPIPE_NR_EVENTS (IPIPE_LAST_EVENT + 1) #define ex_do_divide_error 0 diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h index c042729..aed7d66 100644 --- a/arch/x86/include/asm/tsc.h +++ b/arch/x86/include/asm/tsc.h @@ -14,6 +14,7 @@ */ typedef unsigned long long cycles_t; +extern struct clocksource clocksource_tsc; extern unsigned int cpu_khz; extern unsigned int tsc_khz; diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 597683a..5e298a2 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -699,7 +699,7 @@ core_initcall(cpufreq_tsc); /* clocksource code */ -static struct clocksource clocksource_tsc; +struct clocksource clocksource_tsc; /* * We compare the TSC to the cycle_last value in the clocksource @@ -745,7 +745,7 @@ static void resume_tsc(void) clocksource_tsc.cycle_last = 0; } -static struct clocksource clocksource_tsc = { +struct clocksource clocksource_tsc = { .name = "tsc", .rating = 300, .read = read_tsc, diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 8cb4974..f1b90f7 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c @@ -32,6 +32,7 @@ #include <linux/cpu.h> #include <linux/smp.h> #include <linux/notifier.h> +#include <linux/ipipe_tickdev.h> #include <asm/vsyscall.h> #include <asm/pgtable.h> @@ -89,6 +90,11 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock) vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; vsyscall_gtod_data.wall_time_coarse = __current_kernel_time(); write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); + +#ifdef CONFIG_IPIPE_HOSTRT + if (clock == &clocksource_tsc) + update_ipipe_hostrt(wall_time, clock); +#endif } /* RED-PEN may want to readd seq locking, but then the variable should be -- 1.6.4 _______________________________________________ Adeos-main mailing list [email protected] https://mail.gna.org/listinfo/adeos-main
