Drivers: hv: vmbus: Restructure the clockevents code

Move the relevant code that programs the hypervisor to an architecture
specific file.

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 b57b470ac2a7b3baba55a2e0618dedad939a6127..a58c201f34120d3869587017665c6e7628de172f 100644 (file)
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -136,6 +136,10 @@ 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)
+
 void hyperv_callback_vector(void);
 #ifdef CONFIG_TRACING
 #define trace_hyperv_callback_vector hyperv_callback_vector

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index d28a8731baa016f331e5f339f6e3fde1da909130..ae5436e9c8a42ceea51de56892b2cfdcc034d520 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -118,16 +118,16 @@ static int hv_ce_set_next_event(unsigned long delta,
 
        WARN_ON(!clockevent_state_oneshot(evt));
 
-       rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+       hv_get_current_tick(current_tick);
        current_tick += delta;
-       wrmsrl(HV_X64_MSR_STIMER0_COUNT, current_tick);
+       hv_init_timer(HV_X64_MSR_STIMER0_COUNT, current_tick);
        return 0;
 }
 
 static int hv_ce_shutdown(struct clock_event_device *evt)
 {
-       wrmsrl(HV_X64_MSR_STIMER0_COUNT, 0);
-       wrmsrl(HV_X64_MSR_STIMER0_CONFIG, 0);
+       hv_init_timer(HV_X64_MSR_STIMER0_COUNT, 0);
+       hv_init_timer_config(HV_X64_MSR_STIMER0_CONFIG, 0);
 
        return 0;
 }
@@ -139,7 +139,7 @@ static int hv_ce_set_oneshot(struct clock_event_device *evt)
        timer_cfg.enable = 1;
        timer_cfg.auto_enable = 1;
        timer_cfg.sintx = VMBUS_MESSAGE_SINT;
-       wrmsrl(HV_X64_MSR_STIMER0_CONFIG, timer_cfg.as_uint64);
+       hv_init_timer_config(HV_X64_MSR_STIMER0_CONFIG, timer_cfg.as_uint64);
 
        return 0;
 }