Drivers: hv: vmbus: Get the current time from the current clocksource

The current code uses the MSR based mechanism to get the current tick.
Use the current clock source as that might be more optimal.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index fba1007139243b21081b6bfa114bed588e6f4e8e..18325dcdb7f12e192e387c2c74faba6ca437000b 100644 (file)
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -137,7 +137,6 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)
        }
 }
 
-#define hv_get_current_tick(tick) rdmsrl(HV_X64_MSR_TIME_REF_COUNT, tick)
 #define hv_init_timer(timer, tick) wrmsrl(timer, tick)
 #define hv_init_timer_config(config, val) wrmsrl(config, val)
 

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 12e7baecb84ef4ac2becfd29040421a891e06f98..61fc8ce169a5523adf78ae838f7723afb9c0d4cf 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -96,7 +96,7 @@ static int hv_ce_set_next_event(unsigned long delta,
 
        WARN_ON(!clockevent_state_oneshot(evt));
 
-       hv_get_current_tick(current_tick);
+       current_tick = hyperv_cs->read(NULL);
        current_tick += delta;
        hv_init_timer(HV_X64_MSR_STIMER0_COUNT, current_tick);
        return 0;