Re: [PATCH V5 7/8] clockevents: misc: migrate to ->set_dev_mode()

On 06/02/2014 11:50 PM, Viresh Kumar wrote:

Clockevents core now supports ->set_dev_mode() (as a replacement to ->set_mode()), with capability to return error codes.

This patch migrates clockevent drivers for all architectures that had a single clockevent driver (in order to limit patch count).

Drivers now return -ENOSYS when a unsupported mode is passed to their ->set_dev_mode() callbacks and return 0 on success.

Most of the changes are automated with help of Coccinelle (http://coccinelle.lip6.fr/) and the ones left are around the switch block which are handled manually.

Some drivers had a WARN()/BUG()/pr_err()/empty-implementation for unsupported modes. These statements and unsupported modes are removed now as proper error handling with a WARN_ON() is done at clockevents core.

A simplified version of the semantic patch is:

@@ identifier m,c,setmode; @@ -void +int setmode(enum clock_event_mode m, struct clock_event_device *c);

@@ identifier setmode; @@ -void +int setmode(enum clock_event_mode, struct clock_event_device *);

@fixret@ identifier m,c,setmode; @@ -void +int setmode(enum clock_event_mode m, struct clock_event_device *c) { ...

• return 0;

}

@depends on fixret@ identifier ced; identifier fixret.setmode; @@ ... struct clock_event_device ced = { ..., -.set_mode +.set_dev_mode = setmode, };

@depends on fixret@ expression ced; identifier fixret.setmode; @@

• ced->set_mode

• ced->set_dev_mode

= setmode

@depends on fixret@ identifier fixret.setmode; @@ { . -set_mode +set_dev_mode = setmode }

@depends on fixret@ expression ced; identifier fixret.setmode; @@

• ced.set_mode

• ced.set_dev_mode

= setmode

Signed-off-by: Viresh Kumar viresh.kumar@linaro.org

arch/alpha/kernel/time.c | 31 +++++++++++++++++++++++++++---- arch/arc/kernel/time.c | 11 +++++++---- arch/avr32/kernel/time.c | 7 ++++--- arch/blackfin/kernel/time-ts.c | 14 ++++++++++---- arch/c6x/platforms/timer64.c | 7 +++++-- arch/hexagon/kernel/time.c | 11 ++++++++--- arch/m68k/platform/coldfire/pit.c | 7 +++++-- arch/microblaze/kernel/timer.c | 7 +++++-- arch/mn10300/kernel/cevt-mn10300.c | 14 ++++++++++++-- arch/openrisc/kernel/time.c | 7 +++++-- arch/powerpc/kernel/time.c | 20 ++++++++++++++++---- arch/s390/kernel/time.c | 14 ++++++++++++-- arch/score/kernel/time.c | 7 ++++--- arch/sh/kernel/localtimer.c | 15 +++++++++++++-- arch/tile/kernel/time.c | 15 +++++++++++++-- arch/um/kernel/time.c | 7 +++++-- arch/unicore32/kernel/time.c | 7 +++++-- arch/xtensa/kernel/time.c | 9 +++++---- kernel/time/tick-broadcast-hrtimer.c | 11 ++++++++--- 19 files changed, 169 insertions(+), 52 deletions(-)

diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index ee39cee..bae51cd 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c @@ -104,11 +104,22 @@ rtc_timer_interrupt(int irq, void *dev) return IRQ_HANDLED; }

-static void +static int rtc_ce_set_mode(enum clock_event_mode mode, struct clock_event_device *ce) { /* The mode member of CE is updated in generic code. Since we only support periodic events, nothing to do. */

• switch (mode) {
• case CLOCK_EVT_MODE_PERIODIC:
• case CLOCK_EVT_MODE_UNUSED:
• case CLOCK_EVT_MODE_SHUTDOWN:
• case CLOCK_EVT_MODE_RESUME:

• break;
  

• default:

• return -ENOSYS;
  

• }
• return 0;

}

static int @@ -129,7 +140,7 @@ init_rtc_clockevent(void) .features = CLOCK_EVT_FEAT_PERIODIC, .rating = 100, .cpumask = cpumask_of(cpu),

• .set_mode = rtc_ce_set_mode,
  

• .set_dev_mode = rtc_ce_set_mode,
  

  .set_next_event = rtc_ce_set_next_event, };

@@ -161,12 +172,24 @@ static struct clocksource qemu_cs = {

• The QEMU alarm as a clock_event_device primitive.

*/

-static void +static int qemu_ce_set_mode(enum clock_event_mode mode, struct clock_event_device *ce) { /* The mode member of CE is updated for us in generic code. Just make sure that the event is disabled. */ qemu_set_alarm_abs(0);

• switch (mode) {
• case CLOCK_EVT_MODE_ONESHOT:
• case CLOCK_EVT_MODE_UNUSED:
• case CLOCK_EVT_MODE_SHUTDOWN:
• case CLOCK_EVT_MODE_RESUME:

• break;
  

• default:

• return -ENOSYS;
  

• }
• return 0;

}

static int @@ -197,7 +220,7 @@ init_qemu_clockevent(void) .features = CLOCK_EVT_FEAT_ONESHOT, .rating = 400, .cpumask = cpumask_of(cpu),

• .set_mode = qemu_ce_set_mode,
  

• .set_dev_mode = qemu_ce_set_mode,
  

  .set_next_event = qemu_ce_set_next_event, };

diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c index 71c4252..5a9d348 100644 --- a/arch/arc/kernel/time.c +++ b/arch/arc/kernel/time.c @@ -163,7 +163,7 @@ static int arc_clkevent_set_next_event(unsigned long delta, return 0; }

-static void arc_clkevent_set_mode(enum clock_event_mode mode, +static int arc_clkevent_set_mode(enum clock_event_mode mode, struct clock_event_device *dev) { switch (mode) { @@ -171,12 +171,15 @@ static void arc_clkevent_set_mode(enum clock_event_mode mode, arc_timer_event_setup(arc_get_core_freq() / HZ); break; case CLOCK_EVT_MODE_ONESHOT:

• case CLOCK_EVT_MODE_UNUSED:
• case CLOCK_EVT_MODE_SHUTDOWN:
• case CLOCK_EVT_MODE_RESUME: break; default:

• break;
  

• return -ENOSYS;
  

  }

• return;

• return 0;

}

static DEFINE_PER_CPU(struct clock_event_device, arc_clockevent_device) = { @@ -186,7 +189,7 @@ static DEFINE_PER_CPU(struct clock_event_device, arc_clockevent_device) = { .rating = 300, .irq = TIMER0_IRQ, /* hardwired, no need for resources */ .set_next_event = arc_clkevent_set_next_event,

• .set_mode = arc_clkevent_set_mode,

• .set_dev_mode = arc_clkevent_set_mode,

};

static irqreturn_t timer_irq_handler(int irq, void *dev_id) diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c index d0f771b..3f82011 100644 --- a/arch/avr32/kernel/time.c +++ b/arch/avr32/kernel/time.c @@ -80,7 +80,7 @@ static int comparator_next_event(unsigned long delta, return 0; }

-static void comparator_mode(enum clock_event_mode mode, +static int comparator_mode(enum clock_event_mode mode, struct clock_event_device *evdev) { switch (mode) { @@ -108,8 +108,9 @@ static void comparator_mode(enum clock_event_mode mode, } break; default:

• BUG();
  

• return -ENOSYS;
  

  }
• return 0;

}

static struct clock_event_device comparator = { @@ -118,7 +119,7 @@ static struct clock_event_device comparator = { .shift = 16, .rating = 50, .set_next_event = comparator_next_event,

• .set_mode = comparator_mode,

• .set_dev_mode = comparator_mode,

};

void read_persistent_clock(struct timespec *ts) diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c index cb0a484..b1592a1 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c @@ -136,7 +136,7 @@ static int bfin_gptmr0_set_next_event(unsigned long cycles, return 0; }

-static void bfin_gptmr0_set_mode(enum clock_event_mode mode, +static int bfin_gptmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *evt) { switch (mode) { @@ -173,7 +173,10 @@ static void bfin_gptmr0_set_mode(enum clock_event_mode mode, break; case CLOCK_EVT_MODE_RESUME: break;

• default:

• return -ENOSYS;
  

  }
• return 0;

}

static void bfin_gptmr0_ack(void) @@ -217,7 +220,7 @@ static struct clock_event_device clockevent_gptmr0 = { .shift = 32, .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .set_next_event = bfin_gptmr0_set_next_event,

• .set_mode = bfin_gptmr0_set_mode,

• .set_dev_mode = bfin_gptmr0_set_mode,

};

static void __init bfin_gptmr0_clockevent_init(struct clock_event_device *evt) @@ -250,7 +253,7 @@ static int bfin_coretmr_set_next_event(unsigned long cycles, return 0; }

-static void bfin_coretmr_set_mode(enum clock_event_mode mode, +static int bfin_coretmr_set_mode(enum clock_event_mode mode, struct clock_event_device *evt) { switch (mode) { @@ -279,7 +282,10 @@ static void bfin_coretmr_set_mode(enum clock_event_mode mode, break; case CLOCK_EVT_MODE_RESUME: break;

• default:

• return -ENOSYS;
  

  }
• return 0;

}

void bfin_coretmr_init(void) @@ -335,7 +341,7 @@ void bfin_coretmr_clockevent_init(void) evt->shift = 32; evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; evt->set_next_event = bfin_coretmr_set_next_event;

• evt->set_mode = bfin_coretmr_set_mode;

• evt->set_dev_mode = bfin_coretmr_set_mode;

  clock_tick = get_cclk() / TIME_SCALE; evt->mult = div_sc(clock_tick, NSEC_PER_SEC, evt->shift);

diff --git a/arch/c6x/platforms/timer64.c b/arch/c6x/platforms/timer64.c index 3c73d74..3eef8fb 100644 --- a/arch/c6x/platforms/timer64.c +++ b/arch/c6x/platforms/timer64.c @@ -126,7 +126,7 @@ static int next_event(unsigned long delta, return 0; }

-static void set_clock_mode(enum clock_event_mode mode, +static int set_clock_mode(enum clock_event_mode mode, struct clock_event_device *evt) { switch (mode) { @@ -146,14 +146,17 @@ static void set_clock_mode(enum clock_event_mode mode, break; case CLOCK_EVT_MODE_RESUME: break;

• default:

• return -ENOSYS;
  

  }
• return 0;

}

static struct clock_event_device t64_clockevent_device = { .name = "TIMER64_EVT32_TIMER", .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC, .rating = 200,

• .set_mode = set_clock_mode,

• .set_dev_mode = set_clock_mode, .set_next_event = next_event,

};

diff --git a/arch/hexagon/kernel/time.c b/arch/hexagon/kernel/time.c index 17fbf45..540b138 100644 --- a/arch/hexagon/kernel/time.c +++ b/arch/hexagon/kernel/time.c @@ -100,15 +100,20 @@ static int set_next_event(unsigned long delta, struct clock_event_device *evt) /*

• Sets the mode (periodic, shutdown, oneshot, etc) of a timer.

*/ -static void set_mode(enum clock_event_mode mode, +static int set_mode(enum clock_event_mode mode, struct clock_event_device *evt) { switch (mode) { case CLOCK_EVT_MODE_SHUTDOWN: /* XXX implement me */

• default:

• case CLOCK_EVT_MODE_UNUSED:
• case CLOCK_EVT_MODE_ONESHOT:
• case CLOCK_EVT_MODE_RESUME: break;
• default:

• return -ENOSYS;
  

  }
• return 0;

}

#ifdef CONFIG_SMP @@ -125,7 +130,7 @@ static struct clock_event_device hexagon_clockevent_dev = { .rating = 400, .irq = RTOS_TIMER_INT, .set_next_event = set_next_event,

• .set_mode = set_mode,

• .set_dev_mode = set_mode,

#ifdef CONFIG_SMP .broadcast = broadcast, #endif diff --git a/arch/m68k/platform/coldfire/pit.c b/arch/m68k/platform/coldfire/pit.c index 493b311..993561a 100644 --- a/arch/m68k/platform/coldfire/pit.c +++ b/arch/m68k/platform/coldfire/pit.c @@ -42,7 +42,7 @@ static u32 pit_cnt;

• This is also called after resume to bring the PIT into operation again.

*/

-static void init_cf_pit_timer(enum clock_event_mode mode, +static int init_cf_pit_timer(enum clock_event_mode mode, struct clock_event_device *evt) { switch (mode) { @@ -72,7 +72,10 @@ static void init_cf_pit_timer(enum clock_event_mode mode, case CLOCK_EVT_MODE_RESUME: /* Nothing to do here */ break;

• default:

• return -ENOSYS;
  

  }
• return 0;

}

/* @@ -90,7 +93,7 @@ static int cf_pit_next_event(unsigned long delta, struct clock_event_device cf_pit_clockevent = { .name = "pit", .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

• .set_mode = init_cf_pit_timer,

• .set_dev_mode = init_cf_pit_timer, .set_next_event = cf_pit_next_event, .shift = 32, .irq = MCF_IRQ_PIT1,

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index dd96f0e..21c17db 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -121,7 +121,7 @@ static int xilinx_timer_set_next_event(unsigned long delta, return 0; }

-static void xilinx_timer_set_mode(enum clock_event_mode mode, +static int xilinx_timer_set_mode(enum clock_event_mode mode, struct clock_event_device *evt) { switch (mode) { @@ -142,7 +142,10 @@ static void xilinx_timer_set_mode(enum clock_event_mode mode, case CLOCK_EVT_MODE_RESUME: pr_info("%s: resume\n", __func__); break;

• default:

• return -ENOSYS;
  

  }
• return 0;

}

static struct clock_event_device clockevent_xilinx_timer = { @@ -151,7 +154,7 @@ static struct clock_event_device clockevent_xilinx_timer = { .shift = 8, .rating = 300, .set_next_event = xilinx_timer_set_next_event,

• .set_mode = xilinx_timer_set_mode,

• .set_dev_mode = xilinx_timer_set_mode,

};

static inline void timer_ack(void) diff --git a/arch/mn10300/kernel/cevt-mn10300.c b/arch/mn10300/kernel/cevt-mn10300.c index 60f64ca..668906a 100644 --- a/arch/mn10300/kernel/cevt-mn10300.c +++ b/arch/mn10300/kernel/cevt-mn10300.c @@ -41,10 +41,20 @@ static int next_event(unsigned long delta, return 0; }

-static void set_clock_mode(enum clock_event_mode mode, +static int set_clock_mode(enum clock_event_mode mode, struct clock_event_device *evt) {

• switch (mode) {
• case CLOCK_EVT_MODE_ONESHOT:
• case CLOCK_EVT_MODE_UNUSED:
• case CLOCK_EVT_MODE_SHUTDOWN:
• case CLOCK_EVT_MODE_RESUME: /* Nothing to do ... */

• break;
  

• default:

• return -ENOSYS;
  

• }
• return 0;

}

static DEFINE_PER_CPU(struct clock_event_device, mn10300_clockevent_device); @@ -108,7 +118,7 @@ int __init init_clockevents(void)

cd->rating = 200; cd->cpumask = cpumask_of(smp_processor_id());

• cd->set_mode = set_clock_mode;

• cd->set_dev_mode = set_clock_mode; cd->event_handler = event_handler; cd->set_next_event = next_event;

diff --git a/arch/openrisc/kernel/time.c b/arch/openrisc/kernel/time.c index 7c52e94..024bc1f 100644 --- a/arch/openrisc/kernel/time.c +++ b/arch/openrisc/kernel/time.c @@ -48,7 +48,7 @@ static int openrisc_timer_set_next_event(unsigned long delta, return 0; }

-static void openrisc_timer_set_mode(enum clock_event_mode mode, +static int openrisc_timer_set_mode(enum clock_event_mode mode, struct clock_event_device *evt) { switch (mode) { @@ -68,7 +68,10 @@ static void openrisc_timer_set_mode(enum clock_event_mode mode, case CLOCK_EVT_MODE_RESUME: pr_debug(KERN_INFO "%s: resume\n", __func__); break;

• default:

• return -ENOSYS;
  

  }
• return 0;

}

/* This is the clock event device based on the OR1K tick timer. @@ -82,7 +85,7 @@ static struct clock_event_device clockevent_openrisc_timer = { .features = CLOCK_EVT_FEAT_ONESHOT, .rating = 300, .set_next_event = openrisc_timer_set_next_event,

• .set_mode = openrisc_timer_set_mode,

• .set_dev_mode = openrisc_timer_set_mode,

};

static inline void timer_ack(void) diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 122a580..a254fd1 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -98,7 +98,7 @@ static struct clocksource clocksource_timebase = {

static int decrementer_set_next_event(unsigned long evt, struct clock_event_device *dev); -static void decrementer_set_mode(enum clock_event_mode mode, +static int decrementer_set_mode(enum clock_event_mode mode, struct clock_event_device *dev);

struct clock_event_device decrementer_clockevent = { @@ -106,7 +106,7 @@ struct clock_event_device decrementer_clockevent = { .rating = 200, .irq = 0, .set_next_event = decrementer_set_next_event,

• .set_mode = decrementer_set_mode,

• .set_dev_mode = decrementer_set_mode, .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP,

}; EXPORT_SYMBOL(decrementer_clockevent); @@ -826,11 +826,23 @@ static int decrementer_set_next_event(unsigned long evt, return 0; }

-static void decrementer_set_mode(enum clock_event_mode mode, +static int decrementer_set_mode(enum clock_event_mode mode, struct clock_event_device *dev) {

• if (mode != CLOCK_EVT_MODE_ONESHOT)

• int ret = 0;
• switch (mode) {
• default:

• ret = -ENOSYS;
  

• case CLOCK_EVT_MODE_UNUSED:
• case CLOCK_EVT_MODE_SHUTDOWN:
• case CLOCK_EVT_MODE_RESUME: decrementer_set_next_event(DECREMENTER_MAX, dev);

• break;
  

What about CLOCK_EVT_MODE_PERIODIC? That can come along with the other modes above.

• case CLOCK_EVT_MODE_ONESHOT:

• break;
  

• }
• return ret;

}

Regards Preeti U Murthy