1 files changed, 4 insertions, 152 deletions

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index a1ea482183e8..6188fb7dda42 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -16,6 +16,7 @@
 #include <linux/version.h>
 #include <linux/random.h>
 #include <linux/clockchips.h>
+#include <clocksource/hyperv_timer.h>
 #include <asm/mshyperv.h>
 #include "hyperv_vmbus.h"
 
@@ -23,21 +24,6 @@
 struct hv_context hv_context;
 
 /*
- * If false, we're using the old mechanism for stimer0 interrupts
- * where it sends a VMbus message when it expires. The old
- * mechanism is used when running on older versions of Hyper-V
- * that don't support Direct Mode. While Hyper-V provides
- * four stimer's per CPU, Linux uses only stimer0.
- */
-static bool direct_mode_enabled;
-static int stimer0_irq;
-static int stimer0_vector;
-
-#define HV_TIMER_FREQUENCY (10 * 1000 * 1000) /* 100ns period */
-#define HV_MAX_MAX_DELTA_TICKS 0xffffffff
-#define HV_MIN_DELTA_TICKS 1
-
-/*
  * hv_init - Main initialization routine.
  *
  * This routine must be called before any other routines in here are called
@@ -47,9 +33,6 @@ int hv_init(void)
         hv_context.cpu_context = alloc_percpu(struct hv_per_cpu_context);
         if (!hv_context.cpu_context)
                 return -ENOMEM;
-
-        direct_mode_enabled = ms_hyperv.misc_features &
-                        HV_STIMER_DIRECT_MODE_AVAILABLE;
         return 0;
 }
 
@@ -88,89 +71,6 @@ int hv_post_message(union hv_connection_id connection_id,
         return status & 0xFFFF;
 }
 
-/*
- * ISR for when stimer0 is operating in Direct Mode.  Direct Mode
- * does not use VMbus or any VMbus messages, so process here and not
- * in the VMbus driver code.
- */
-
-static void hv_stimer0_isr(void)
-{
-        struct hv_per_cpu_context *hv_cpu;
-
-        hv_cpu = this_cpu_ptr(hv_context.cpu_context);
-        hv_cpu->clk_evt->event_handler(hv_cpu->clk_evt);
-        add_interrupt_randomness(stimer0_vector, 0);
-}
-
-static int hv_ce_set_next_event(unsigned long delta,
-                                struct clock_event_device *evt)
-{
-        u64 current_tick;
-
-        WARN_ON(!clockevent_state_oneshot(evt));
-
-        current_tick = hyperv_cs->read(NULL);
-        current_tick += delta;
-        hv_init_timer(0, current_tick);
-        return 0;
-}
-
-static int hv_ce_shutdown(struct clock_event_device *evt)
-{
-        hv_init_timer(0, 0);
-        hv_init_timer_config(0, 0);
-        if (direct_mode_enabled)
-                hv_disable_stimer0_percpu_irq(stimer0_irq);
-
-        return 0;
-}
-
-static int hv_ce_set_oneshot(struct clock_event_device *evt)
-{
-        union hv_stimer_config timer_cfg;
-
-        timer_cfg.as_uint64 = 0;
-        timer_cfg.enable = 1;
-        timer_cfg.auto_enable = 1;
-        if (direct_mode_enabled) {
-                /*
-                 * When it expires, the timer will directly interrupt
-                 * on the specified hardware vector/IRQ.
-                 */
-                timer_cfg.direct_mode = 1;
-                timer_cfg.apic_vector = stimer0_vector;
-                hv_enable_stimer0_percpu_irq(stimer0_irq);
-        } else {
-                /*
-                 * When it expires, the timer will generate a VMbus message,
-                 * to be handled by the normal VMbus interrupt handler.
-                 */
-                timer_cfg.direct_mode = 0;
-                timer_cfg.sintx = VMBUS_MESSAGE_SINT;
-        }
-        hv_init_timer_config(0, timer_cfg.as_uint64);
-        return 0;
-}
-
-static void hv_init_clockevent_device(struct clock_event_device *dev, int cpu)
-{
-        dev->name = "Hyper-V clockevent";
-        dev->features = CLOCK_EVT_FEAT_ONESHOT;
-        dev->cpumask = cpumask_of(cpu);
-        dev->rating = 1000;
-        /*
-         * Avoid settint dev->owner = THIS_MODULE deliberately as doing so will
-         * result in clockevents_config_and_register() taking additional
-         * references to the hv_vmbus module making it impossible to unload.
-         */
-
-        dev->set_state_shutdown = hv_ce_shutdown;
-        dev->set_state_oneshot = hv_ce_set_oneshot;
-        dev->set_next_event = hv_ce_set_next_event;
-}
-
-
 int hv_synic_alloc(void)
 {
         int cpu;
@@ -199,14 +99,6 @@ int hv_synic_alloc(void)
                 tasklet_init(&hv_cpu->msg_dpc,
                              vmbus_on_msg_dpc, (unsigned long) hv_cpu);
 
-                hv_cpu->clk_evt = kzalloc(sizeof(struct clock_event_device),
-                                          GFP_KERNEL);
-                if (hv_cpu->clk_evt == NULL) {
-                        pr_err("Unable to allocate clock event device\n");
-                        goto err;
-                }
-                hv_init_clockevent_device(hv_cpu->clk_evt, cpu);
-
                 hv_cpu->synic_message_page =
                         (void *)get_zeroed_page(GFP_ATOMIC);
                 if (hv_cpu->synic_message_page == NULL) {
@@ -229,11 +121,6 @@ int hv_synic_alloc(void)
                 INIT_LIST_HEAD(&hv_cpu->chan_list);
         }
 
-        if (direct_mode_enabled &&
-            hv_setup_stimer0_irq(&stimer0_irq, &stimer0_vector,
-                                hv_stimer0_isr))
-                goto err;
-
         return 0;
 err:
         /*
@@ -252,7 +139,6 @@ void hv_synic_free(void)
                 struct hv_per_cpu_context *hv_cpu
                         = per_cpu_ptr(hv_context.cpu_context, cpu);
 
-                kfree(hv_cpu->clk_evt);
                 free_page((unsigned long)hv_cpu->synic_event_page);
                 free_page((unsigned long)hv_cpu->synic_message_page);
                 free_page((unsigned long)hv_cpu->post_msg_page);
@@ -311,36 +197,9 @@ int hv_synic_init(unsigned int cpu)
 
         hv_set_synic_state(sctrl.as_uint64);
 
-        /*
-         * Register the per-cpu clockevent source.
-         */
-        if (ms_hyperv.features & HV_MSR_SYNTIMER_AVAILABLE)
-                clockevents_config_and_register(hv_cpu->clk_evt,
-                                                HV_TIMER_FREQUENCY,
-                                                HV_MIN_DELTA_TICKS,
-                                                HV_MAX_MAX_DELTA_TICKS);
-        return 0;
-}
-
-/*
- * hv_synic_clockevents_cleanup - Cleanup clockevent devices
- */
-void hv_synic_clockevents_cleanup(void)
-{
-        int cpu;
+        hv_stimer_init(cpu);
 
-        if (!(ms_hyperv.features & HV_MSR_SYNTIMER_AVAILABLE))
-                return;
-
-        if (direct_mode_enabled)
-                hv_remove_stimer0_irq(stimer0_irq);
-
-        for_each_present_cpu(cpu) {
-                struct hv_per_cpu_context *hv_cpu
-                        = per_cpu_ptr(hv_context.cpu_context, cpu);
-
-                clockevents_unbind_device(hv_cpu->clk_evt, cpu);
-        }
+        return 0;
 }
 
 /*
@@ -388,14 +247,7 @@ int hv_synic_cleanup(unsigned int cpu)
         if (channel_found && vmbus_connection.conn_state == CONNECTED)
                 return -EBUSY;
 
-        /* Turn off clockevent device */
-        if (ms_hyperv.features & HV_MSR_SYNTIMER_AVAILABLE) {
-                struct hv_per_cpu_context *hv_cpu
-                        = this_cpu_ptr(hv_context.cpu_context);
-
-                clockevents_unbind_device(hv_cpu->clk_evt, cpu);
-                hv_ce_shutdown(hv_cpu->clk_evt);
-        }
+        hv_stimer_cleanup(cpu);
 
         hv_get_synint_state(VMBUS_MESSAGE_SINT, shared_sint.as_uint64);