drivers/hv: Migrate to new 'set-state' interface

Migrate hv driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.

This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.

Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: devel@linuxdriverproject.org
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 19 insertions, 26 deletions

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index fd93cfde96d0..c641faf92e60 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -274,7 +274,7 @@ static int hv_ce_set_next_event(unsigned long delta,
 {
         cycle_t current_tick;
 
-        WARN_ON(evt->mode != CLOCK_EVT_MODE_ONESHOT);
+        WARN_ON(!clockevent_state_oneshot(evt));
 
         rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
         current_tick += delta;
@@ -282,31 +282,24 @@ static int hv_ce_set_next_event(unsigned long delta,
         return 0;
 }
 
-static void hv_ce_setmode(enum clock_event_mode mode,
-                          struct clock_event_device *evt)
+static int hv_ce_shutdown(struct clock_event_device *evt)
+{
+        wrmsrl(HV_X64_MSR_STIMER0_COUNT, 0);
+        wrmsrl(HV_X64_MSR_STIMER0_CONFIG, 0);
+
+        return 0;
+}
+
+static int hv_ce_set_oneshot(struct clock_event_device *evt)
 {
         union hv_timer_config timer_cfg;
 
-        switch (mode) {
-        case CLOCK_EVT_MODE_PERIODIC:
-                /* unsupported */
-                break;
-
-        case CLOCK_EVT_MODE_ONESHOT:
-                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);
-                break;
-
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-                wrmsrl(HV_X64_MSR_STIMER0_COUNT, 0);
-                wrmsrl(HV_X64_MSR_STIMER0_CONFIG, 0);
-                break;
-        case CLOCK_EVT_MODE_RESUME:
-                break;
-        }
+        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);
+
+        return 0;
 }
 
 static void hv_init_clockevent_device(struct clock_event_device *dev, int cpu)
@@ -321,7 +314,8 @@ static void hv_init_clockevent_device(struct clock_event_device *dev, int cpu)
          * references to the hv_vmbus module making it impossible to unload.
          */
 
-        dev->set_mode = hv_ce_setmode;
+        dev->set_state_shutdown = hv_ce_shutdown;
+        dev->set_state_oneshot = hv_ce_set_oneshot;
         dev->set_next_event = hv_ce_set_next_event;
 }
 
@@ -515,8 +509,7 @@ void hv_synic_cleanup(void *arg)
 
         /* Turn off clockevent device */
         if (ms_hyperv.features & HV_X64_MSR_SYNTIMER_AVAILABLE)
-                hv_ce_setmode(CLOCK_EVT_MODE_SHUTDOWN,
-                              hv_context.clk_evt[cpu]);
+                hv_ce_shutdown(hv_context.clk_evt[cpu]);
 
         rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);