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

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

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



Migrate sparc drivers 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.

We weren't doing anything which switching to few clockevent modes and so
their callbacks aren't implemented.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent d5ed65d8

arch/sparc/kernel/sun4m_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs) 


	ce = &per_cpu(sparc32_clockevent, cpu);



	if (ce->mode & CLOCK_EVT_MODE_PERIODIC)

	if (clockevent_state_periodic(ce))

		sun4m_clear_profile_irq(cpu);

	else

		sparc_config.load_profile_irq(cpu, 0); /* Is this needless? */

arch/sparc/kernel/time_32.c

+27 −30
Original line number Diff line number Diff line
@@ -101,21 +101,18 @@ irqreturn_t notrace timer_interrupt(int dummy, void *dev_id) 
	return IRQ_HANDLED;

}



static void timer_ce_set_mode(enum clock_event_mode mode,

			      struct clock_event_device *evt)

static int timer_ce_shutdown(struct clock_event_device *evt)

{

	switch (mode) {

		case CLOCK_EVT_MODE_PERIODIC:

		case CLOCK_EVT_MODE_RESUME:

			timer_ce_enabled = 1;

			break;

		case CLOCK_EVT_MODE_SHUTDOWN:

	timer_ce_enabled = 0;

			break;

		default:

			break;

	smp_mb();

	return 0;

}



static int timer_ce_set_periodic(struct clock_event_device *evt)

{

	timer_ce_enabled = 1;

	smp_mb();

	return 0;

}



static __init void setup_timer_ce(void)
@@ -127,7 +124,9 @@ static __init void setup_timer_ce(void) 
	ce->name     = "timer_ce";

	ce->rating   = 100;

	ce->features = CLOCK_EVT_FEAT_PERIODIC;

	ce->set_mode = timer_ce_set_mode;

	ce->set_state_shutdown = timer_ce_shutdown;

	ce->set_state_periodic = timer_ce_set_periodic;

	ce->tick_resume = timer_ce_set_periodic;

	ce->cpumask  = cpu_possible_mask;

	ce->shift    = 32;

	ce->mult     = div_sc(sparc_config.clock_rate, NSEC_PER_SEC,
@@ -183,24 +182,20 @@ static __init int setup_timer_cs(void) 
}



#ifdef CONFIG_SMP

static void percpu_ce_setup(enum clock_event_mode mode,

			struct clock_event_device *evt)

static int percpu_ce_shutdown(struct clock_event_device *evt)

{

	int cpu = cpumask_first(evt->cpumask);



	switch (mode) {

		case CLOCK_EVT_MODE_PERIODIC:

			sparc_config.load_profile_irq(cpu,

						      SBUS_CLOCK_RATE / HZ);

			break;

		case CLOCK_EVT_MODE_ONESHOT:

		case CLOCK_EVT_MODE_SHUTDOWN:

		case CLOCK_EVT_MODE_UNUSED:

	sparc_config.load_profile_irq(cpu, 0);

			break;

		default:

			break;

	return 0;

}



static int percpu_ce_set_periodic(struct clock_event_device *evt)

{

	int cpu = cpumask_first(evt->cpumask);



	sparc_config.load_profile_irq(cpu, SBUS_CLOCK_RATE / HZ);

	return 0;

}



static int percpu_ce_set_next_event(unsigned long delta,
@@ -224,7 +219,9 @@ void register_percpu_ce(int cpu) 
	ce->name           = "percpu_ce";

	ce->rating         = 200;

	ce->features       = features;

	ce->set_mode       = percpu_ce_setup;

	ce->set_state_shutdown = percpu_ce_shutdown;

	ce->set_state_periodic = percpu_ce_set_periodic;

	ce->set_state_oneshot = percpu_ce_shutdown;

	ce->set_next_event = percpu_ce_set_next_event;

	ce->cpumask        = cpumask_of(cpu);

	ce->shift          = 32;

arch/sparc/kernel/time_64.c

+10 −23
Original line number Diff line number Diff line
@@ -674,28 +674,15 @@ static int sparc64_next_event(unsigned long delta, 
	return tick_ops->add_compare(delta) ? -ETIME : 0;

}



static void sparc64_timer_setup(enum clock_event_mode mode,

				struct clock_event_device *evt)

static int sparc64_timer_shutdown(struct clock_event_device *evt)

{

	switch (mode) {

	case CLOCK_EVT_MODE_ONESHOT:

	case CLOCK_EVT_MODE_RESUME:

		break;



	case CLOCK_EVT_MODE_SHUTDOWN:

	tick_ops->disable_irq();

		break;



	case CLOCK_EVT_MODE_PERIODIC:

	case CLOCK_EVT_MODE_UNUSED:

		WARN_ON(1);

		break;

	}

	return 0;

}



static struct clock_event_device sparc64_clockevent = {

	.features		= CLOCK_EVT_FEAT_ONESHOT,

	.set_mode	= sparc64_timer_setup,

	.set_state_shutdown	= sparc64_timer_shutdown,

	.set_next_event		= sparc64_next_event,

	.rating			= 100,

	.shift			= 30,