x86/jailhouse: Set up timekeeping

Get the precalibrated frequencies for the TSC and the APIC timer from
the Jailhouse platform info and set the kernel values accordingly.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: jailhouse-dev@googlegroups.com
Link: https://lkml.kernel.org/r/b2557426332fc337a74d3141cb920f7dce9ad601.1511770314.git.jan.kiszka@siemens.com

diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
index 21c107770d6747208b85a273be0f2bcaca89127d..34cf9d3e175182a42128b1fea5871a0aa4175ea0 100644 (file)
--- a/arch/x86/kernel/jailhouse.c
+++ b/arch/x86/kernel/jailhouse.c
@@ -16,6 +16,7 @@
 #include <asm/setup.h>
 
 static __initdata struct jailhouse_setup_data setup_data;
+static unsigned int precalibrated_tsc_khz;
 
 static uint32_t jailhouse_cpuid_base(void)
 {
@@ -31,6 +32,16 @@ static uint32_t __init jailhouse_detect(void)
        return jailhouse_cpuid_base();
 }
 
+static void __init jailhouse_timer_init(void)
+{
+       lapic_timer_frequency = setup_data.apic_khz * (1000 / HZ);
+}
+
+static unsigned long jailhouse_get_tsc(void)
+{
+       return precalibrated_tsc_khz;
+}
+
 static void __init jailhouse_get_smp_config(unsigned int early)
 {
        unsigned int cpu;
@@ -66,8 +77,12 @@ static void __init jailhouse_init_platform(void)
        struct setup_data header;
        void *mapping;
 
+       x86_init.timers.timer_init      = jailhouse_timer_init;
        x86_init.mpparse.get_smp_config = jailhouse_get_smp_config;
 
+       x86_platform.calibrate_cpu      = jailhouse_get_tsc;
+       x86_platform.calibrate_tsc      = jailhouse_get_tsc;
+
        while (pa_data) {
                mapping = early_memremap(pa_data, sizeof(header));
                memcpy(&header, mapping, sizeof(header));
@@ -95,6 +110,8 @@ static void __init jailhouse_init_platform(void)
 
        pmtmr_ioport = setup_data.pm_timer_address;
        pr_debug("Jailhouse: PM-Timer IO Port: %#x\n", pmtmr_ioport);
+
+       precalibrated_tsc_khz = setup_data.tsc_khz;
 }
 
 bool jailhouse_paravirt(void)