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

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

clockevents/drivers/arm_arch_timer: Migrate to new 'set-state' interface 



Migrate arm_arch_timer driver to the new 'set-state' interface provided
by the 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: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent d74892c5

drivers/clocksource/arm_arch_timer.c

+22 −30
Original line number Original line Diff line number Diff line
@@ -181,44 +181,36 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq, void *dev_id) 
	return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt);

	return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt);

}

}





static __always_inline void timer_set_mode(const int access, int mode,

static __always_inline int timer_shutdown(const int access,

					  struct clock_event_device *clk)

					  struct clock_event_device *clk)

{

{

	unsigned long ctrl;

	unsigned long ctrl;

	switch (mode) {



	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	ctrl = arch_timer_reg_read(access, ARCH_TIMER_REG_CTRL, clk);

	ctrl = arch_timer_reg_read(access, ARCH_TIMER_REG_CTRL, clk);

	ctrl &= ~ARCH_TIMER_CTRL_ENABLE;

	ctrl &= ~ARCH_TIMER_CTRL_ENABLE;

	arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);

	arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);

		break;



	default:

	return 0;

		break;

	}

}

}





static void arch_timer_set_mode_virt(enum clock_event_mode mode,

static int arch_timer_shutdown_virt(struct clock_event_device *clk)

				     struct clock_event_device *clk)

{

{

	timer_set_mode(ARCH_TIMER_VIRT_ACCESS, mode, clk);

	return timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk);

}

}





static void arch_timer_set_mode_phys(enum clock_event_mode mode,

static int arch_timer_shutdown_phys(struct clock_event_device *clk)

				     struct clock_event_device *clk)

{

{

	timer_set_mode(ARCH_TIMER_PHYS_ACCESS, mode, clk);

	return timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk);

}

}





static void arch_timer_set_mode_virt_mem(enum clock_event_mode mode,

static int arch_timer_shutdown_virt_mem(struct clock_event_device *clk)

					 struct clock_event_device *clk)

{

{

	timer_set_mode(ARCH_TIMER_MEM_VIRT_ACCESS, mode, clk);

	return timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk);

}

}





static void arch_timer_set_mode_phys_mem(enum clock_event_mode mode,

static int arch_timer_shutdown_phys_mem(struct clock_event_device *clk)

					 struct clock_event_device *clk)

{

{

	timer_set_mode(ARCH_TIMER_MEM_PHYS_ACCESS, mode, clk);

	return timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk);

}

}





static __always_inline void set_next_event(const int access, unsigned long evt,

static __always_inline void set_next_event(const int access, unsigned long evt,
@@ -273,11 +265,11 @@ static void __arch_timer_setup(unsigned type, 
		clk->cpumask = cpumask_of(smp_processor_id());

		clk->cpumask = cpumask_of(smp_processor_id());

		if (arch_timer_use_virtual) {

		if (arch_timer_use_virtual) {

			clk->irq = arch_timer_ppi[VIRT_PPI];

			clk->irq = arch_timer_ppi[VIRT_PPI];

			clk->set_mode = arch_timer_set_mode_virt;

			clk->set_state_shutdown = arch_timer_shutdown_virt;

			clk->set_next_event = arch_timer_set_next_event_virt;

			clk->set_next_event = arch_timer_set_next_event_virt;

		} else {

		} else {

			clk->irq = arch_timer_ppi[PHYS_SECURE_PPI];

			clk->irq = arch_timer_ppi[PHYS_SECURE_PPI];

			clk->set_mode = arch_timer_set_mode_phys;

			clk->set_state_shutdown = arch_timer_shutdown_phys;

			clk->set_next_event = arch_timer_set_next_event_phys;

			clk->set_next_event = arch_timer_set_next_event_phys;

		}

		}

	} else {

	} else {
@@ -286,17 +278,17 @@ static void __arch_timer_setup(unsigned type, 
		clk->rating = 400;

		clk->rating = 400;

		clk->cpumask = cpu_all_mask;

		clk->cpumask = cpu_all_mask;

		if (arch_timer_mem_use_virtual) {

		if (arch_timer_mem_use_virtual) {

			clk->set_mode = arch_timer_set_mode_virt_mem;

			clk->set_state_shutdown = arch_timer_shutdown_virt_mem;

			clk->set_next_event =

			clk->set_next_event =

				arch_timer_set_next_event_virt_mem;

				arch_timer_set_next_event_virt_mem;

		} else {

		} else {

			clk->set_mode = arch_timer_set_mode_phys_mem;

			clk->set_state_shutdown = arch_timer_shutdown_phys_mem;

			clk->set_next_event =

			clk->set_next_event =

				arch_timer_set_next_event_phys_mem;

				arch_timer_set_next_event_phys_mem;

		}

		}

	}

	}





	clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, clk);

	clk->set_state_shutdown(clk);





	clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff);

	clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff);

}

}
@@ -506,7 +498,7 @@ static void arch_timer_stop(struct clock_event_device *clk) 
			disable_percpu_irq(arch_timer_ppi[PHYS_NONSECURE_PPI]);

			disable_percpu_irq(arch_timer_ppi[PHYS_NONSECURE_PPI]);

	}

	}





	clk->set_mode(CLOCK_EVT_MODE_UNUSED, clk);

	clk->set_state_shutdown(clk);

}

}





static int arch_timer_cpu_notify(struct notifier_block *self,

static int arch_timer_cpu_notify(struct notifier_block *self,