Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyper...

[linux-2.6-block.git] / arch / x86 / include / asm / mshyperv.h

diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index 080a92025748350a6927e27db7ffdcb0b69914e5..2ef31cc8c529541074a70f5810c80e73366d8890 100644 (file)
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -38,6 +38,17 @@ typedef int (*hyperv_fill_flush_list_func)(
 #define hv_get_crash_ctl(val) \
        rdmsrl(HV_X64_MSR_CRASH_CTL, val)
 
+#define hv_get_time_ref_count(val) \
+       rdmsrl(HV_X64_MSR_TIME_REF_COUNT, val)
+
+#define hv_get_reference_tsc(val) \
+       rdmsrl(HV_X64_MSR_REFERENCE_TSC, val)
+#define hv_set_reference_tsc(val) \
+       wrmsrl(HV_X64_MSR_REFERENCE_TSC, val)
+#define hv_set_clocksource_vdso(val) \
+       ((val).archdata.vclock_mode = VCLOCK_HVCLOCK)
+#define hv_get_raw_timer() rdtsc_ordered()
+
 void hyperv_callback_vector(void);
 void hyperv_reenlightenment_vector(void);
 #ifdef CONFIG_TRACING
@@ -57,7 +68,6 @@ static inline void hv_disable_stimer0_percpu_irq(int irq) {}
 
 
 #if IS_ENABLED(CONFIG_HYPERV)
-extern struct clocksource *hyperv_cs;
 extern void *hv_hypercall_pg;
 extern void  __percpu  **hyperv_pcpu_input_arg;
 
@@ -246,75 +256,6 @@ static inline int hyperv_flush_guest_mapping_range(u64 as,
 }
 #endif /* CONFIG_HYPERV */
 
-#ifdef CONFIG_HYPERV_TSCPAGE
-struct ms_hyperv_tsc_page *hv_get_tsc_page(void);
-static inline u64 hv_read_tsc_page_tsc(const struct ms_hyperv_tsc_page *tsc_pg,
-                                      u64 *cur_tsc)
-{
-       u64 scale, offset;
-       u32 sequence;
-
-       /*
-        * The protocol for reading Hyper-V TSC page is specified in Hypervisor
-        * Top-Level Functional Specification ver. 3.0 and above. To get the
-        * reference time we must do the following:
-        * - READ ReferenceTscSequence
-        *   A special '0' value indicates the time source is unreliable and we
-        *   need to use something else. The currently published specification
-        *   versions (up to 4.0b) contain a mistake and wrongly claim '-1'
-        *   instead of '0' as the special value, see commit c35b82ef0294.
-        * - ReferenceTime =
-        *        ((RDTSC() * ReferenceTscScale) >> 64) + ReferenceTscOffset
-        * - READ ReferenceTscSequence again. In case its value has changed
-        *   since our first reading we need to discard ReferenceTime and repeat
-        *   the whole sequence as the hypervisor was updating the page in
-        *   between.
-        */
-       do {
-               sequence = READ_ONCE(tsc_pg->tsc_sequence);
-               if (!sequence)
-                       return U64_MAX;
-               /*
-                * Make sure we read sequence before we read other values from
-                * TSC page.
-                */
-               smp_rmb();
-
-               scale = READ_ONCE(tsc_pg->tsc_scale);
-               offset = READ_ONCE(tsc_pg->tsc_offset);
-               *cur_tsc = rdtsc_ordered();
-
-               /*
-                * Make sure we read sequence after we read all other values
-                * from TSC page.
-                */
-               smp_rmb();
-
-       } while (READ_ONCE(tsc_pg->tsc_sequence) != sequence);
-
-       return mul_u64_u64_shr(*cur_tsc, scale, 64) + offset;
-}
-
-static inline u64 hv_read_tsc_page(const struct ms_hyperv_tsc_page *tsc_pg)
-{
-       u64 cur_tsc;
-
-       return hv_read_tsc_page_tsc(tsc_pg, &cur_tsc);
-}
-
-#else
-static inline struct ms_hyperv_tsc_page *hv_get_tsc_page(void)
-{
-       return NULL;
-}
-
-static inline u64 hv_read_tsc_page_tsc(const struct ms_hyperv_tsc_page *tsc_pg,
-                                      u64 *cur_tsc)
-{
-       BUG();
-       return U64_MAX;
-}
-#endif
 
 #include <asm-generic/mshyperv.h>