Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e40fc4b authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano
Browse files

xtensa/time: Migrate to new 'set-state' interface 



Migrate xtensa 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: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 3078c8df

arch/xtensa/kernel/time.c

+26 −27
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ static struct clocksource ccount_clocksource = { 


static int ccount_timer_set_next_event(unsigned long delta,

		struct clock_event_device *dev);

static void ccount_timer_set_mode(enum clock_event_mode mode,

		struct clock_event_device *evt);

struct ccount_timer {

	struct clock_event_device evt;

	int irq_enabled;
@@ -77,35 +75,34 @@ static int ccount_timer_set_next_event(unsigned long delta, 
	return ret;

}



static void ccount_timer_set_mode(enum clock_event_mode mode,

		struct clock_event_device *evt)

{

	struct ccount_timer *timer =

		container_of(evt, struct ccount_timer, evt);



/*

 * There is no way to disable the timer interrupt at the device level,

 * only at the intenable register itself. Since enable_irq/disable_irq

 * calls are nested, we need to make sure that these calls are

 * balanced.

 */

	switch (mode) {

	case CLOCK_EVT_MODE_SHUTDOWN:

	case CLOCK_EVT_MODE_UNUSED:

static int ccount_timer_shutdown(struct clock_event_device *evt)

{

	struct ccount_timer *timer =

		container_of(evt, struct ccount_timer, evt);



	if (timer->irq_enabled) {

		disable_irq(evt->irq);

		timer->irq_enabled = 0;

	}

		break;

	case CLOCK_EVT_MODE_RESUME:

	case CLOCK_EVT_MODE_ONESHOT:

	return 0;

}



static int ccount_timer_set_oneshot(struct clock_event_device *evt)

{

	struct ccount_timer *timer =

		container_of(evt, struct ccount_timer, evt);



	if (!timer->irq_enabled) {

		enable_irq(evt->irq);

		timer->irq_enabled = 1;

	}

	default:

		break;

	}

	return 0;

}



static irqreturn_t timer_interrupt(int irq, void *dev_id);
@@ -126,7 +123,9 @@ void local_timer_setup(unsigned cpu) 
	clockevent->features = CLOCK_EVT_FEAT_ONESHOT;

	clockevent->rating = 300;

	clockevent->set_next_event = ccount_timer_set_next_event;

	clockevent->set_mode = ccount_timer_set_mode;

	clockevent->set_state_shutdown = ccount_timer_shutdown;

	clockevent->set_state_oneshot = ccount_timer_set_oneshot;

	clockevent->tick_resume = ccount_timer_set_oneshot;

	clockevent->cpumask = cpumask_of(cpu);

	clockevent->irq = irq_create_mapping(NULL, LINUX_TIMER_INT);

	if (WARN(!clockevent->irq, "error: can't map timer irq"))