These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / clocksource / sh_cmt.c

diff --git a/kernel/drivers/clocksource/sh_cmt.c b/kernel/drivers/clocksource/sh_cmt.c
index b8ff3c6..103c493 100644 (file)
--- a/kernel/drivers/clocksource/sh_cmt.c
+++ b/kernel/drivers/clocksource/sh_cmt.c
@@ -538,7 +538,7 @@ static irqreturn_t sh_cmt_interrupt(int irq, void *dev_id)
 
        if (ch->flags & FLAG_CLOCKEVENT) {
                if (!(ch->flags & FLAG_SKIPEVENT)) {
-                       if (ch->ced.mode == CLOCK_EVT_MODE_ONESHOT) {
+                       if (clockevent_state_oneshot(&ch->ced)) {
                                ch->next_match_value = ch->max_match_value;
                                ch->flags |= FLAG_REPROGRAM;
                        }
@@ -554,7 +554,7 @@ static irqreturn_t sh_cmt_interrupt(int irq, void *dev_id)
                sh_cmt_clock_event_program_verify(ch, 1);
 
                if (ch->flags & FLAG_CLOCKEVENT)
-                       if ((ch->ced.mode == CLOCK_EVT_MODE_SHUTDOWN)
+                       if ((clockevent_state_shutdown(&ch->ced))
                            || (ch->match_value == ch->next_match_value))
                                ch->flags &= ~FLAG_REPROGRAM;
        }
@@ -661,6 +661,9 @@ static void sh_cmt_clocksource_suspend(struct clocksource *cs)
 {
        struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);
 
+       if (!ch->cs_enabled)
+               return;
+
        sh_cmt_stop(ch, FLAG_CLOCKSOURCE);
        pm_genpd_syscore_poweroff(&ch->cmt->pdev->dev);
 }
@@ -669,6 +672,9 @@ static void sh_cmt_clocksource_resume(struct clocksource *cs)
 {
        struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);
 
+       if (!ch->cs_enabled)
+               return;
+
        pm_genpd_syscore_poweron(&ch->cmt->pdev->dev);
        sh_cmt_start(ch, FLAG_CLOCKSOURCE);
 }
@@ -720,39 +726,37 @@ static void sh_cmt_clock_event_start(struct sh_cmt_channel *ch, int periodic)
                sh_cmt_set_next(ch, ch->max_match_value);
 }
 
-static void sh_cmt_clock_event_mode(enum clock_event_mode mode,
-                                   struct clock_event_device *ced)
+static int sh_cmt_clock_event_shutdown(struct clock_event_device *ced)
+{
+       struct sh_cmt_channel *ch = ced_to_sh_cmt(ced);
+
+       sh_cmt_stop(ch, FLAG_CLOCKEVENT);
+       return 0;
+}
+
+static int sh_cmt_clock_event_set_state(struct clock_event_device *ced,
+                                       int periodic)
 {
        struct sh_cmt_channel *ch = ced_to_sh_cmt(ced);
 
        /* deal with old setting first */
-       switch (ced->mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-       case CLOCK_EVT_MODE_ONESHOT:
+       if (clockevent_state_oneshot(ced) || clockevent_state_periodic(ced))
                sh_cmt_stop(ch, FLAG_CLOCKEVENT);
-               break;
-       default:
-               break;
-       }
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               dev_info(&ch->cmt->pdev->dev,
-                        "ch%u: used for periodic clock events\n", ch->index);
-               sh_cmt_clock_event_start(ch, 1);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               dev_info(&ch->cmt->pdev->dev,
-                        "ch%u: used for oneshot clock events\n", ch->index);
-               sh_cmt_clock_event_start(ch, 0);
-               break;
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       case CLOCK_EVT_MODE_UNUSED:
-               sh_cmt_stop(ch, FLAG_CLOCKEVENT);
-               break;
-       default:
-               break;
-       }
+       dev_info(&ch->cmt->pdev->dev, "ch%u: used for %s clock events\n",
+                ch->index, periodic ? "periodic" : "oneshot");
+       sh_cmt_clock_event_start(ch, periodic);
+       return 0;
+}
+
+static int sh_cmt_clock_event_set_oneshot(struct clock_event_device *ced)
+{
+       return sh_cmt_clock_event_set_state(ced, 0);
+}
+
+static int sh_cmt_clock_event_set_periodic(struct clock_event_device *ced)
+{
+       return sh_cmt_clock_event_set_state(ced, 1);
 }
 
 static int sh_cmt_clock_event_next(unsigned long delta,
@@ -760,7 +764,7 @@ static int sh_cmt_clock_event_next(unsigned long delta,
 {
        struct sh_cmt_channel *ch = ced_to_sh_cmt(ced);
 
-       BUG_ON(ced->mode != CLOCK_EVT_MODE_ONESHOT);
+       BUG_ON(!clockevent_state_oneshot(ced));
        if (likely(ch->flags & FLAG_IRQCONTEXT))
                ch->next_match_value = delta - 1;
        else
@@ -814,7 +818,9 @@ static int sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
        ced->rating = 125;
        ced->cpumask = cpu_possible_mask;
        ced->set_next_event = sh_cmt_clock_event_next;
-       ced->set_mode = sh_cmt_clock_event_mode;
+       ced->set_state_shutdown = sh_cmt_clock_event_shutdown;
+       ced->set_state_periodic = sh_cmt_clock_event_set_periodic;
+       ced->set_state_oneshot = sh_cmt_clock_event_set_oneshot;
        ced->suspend = sh_cmt_clock_event_suspend;
        ced->resume = sh_cmt_clock_event_resume;
 
@@ -929,9 +935,6 @@ static int sh_cmt_map_memory(struct sh_cmt_device *cmt)
 static const struct platform_device_id sh_cmt_id_table[] = {
        { "sh-cmt-16", (kernel_ulong_t)&sh_cmt_info[SH_CMT_16BIT] },
        { "sh-cmt-32", (kernel_ulong_t)&sh_cmt_info[SH_CMT_32BIT] },
-       { "sh-cmt-32-fast", (kernel_ulong_t)&sh_cmt_info[SH_CMT_32BIT_FAST] },
-       { "sh-cmt-48", (kernel_ulong_t)&sh_cmt_info[SH_CMT_48BIT] },
-       { "sh-cmt-48-gen2", (kernel_ulong_t)&sh_cmt_info[SH_CMT_48BIT_GEN2] },
        { }
 };
 MODULE_DEVICE_TABLE(platform, sh_cmt_id_table);
@@ -959,7 +962,6 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev)
        unsigned int i;
        int ret;
 
-       memset(cmt, 0, sizeof(*cmt));
        cmt->pdev = pdev;
        raw_spin_lock_init(&cmt->lock);