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

Commit 662e7230 authored by Stephen Boyd's avatar Stephen Boyd Committed by Daniel Lezcano
Browse files

clocksource: sun4i: Switch to sched_clock_register() 



The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface. While we're here, mark the sched_clock function as
notrace to prevent ftrace recursion crashes.

Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent dfded009

drivers/clocksource/sun4i_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static struct irqaction sun4i_timer_irq = { 
	.dev_id = &sun4i_clockevent,

};



static u32 sun4i_timer_sched_read(void)

static u64 notrace sun4i_timer_sched_read(void)

{

	return ~readl(timer_base + TIMER_CNTVAL_REG(1));

}
@@ -170,7 +170,7 @@ static void __init sun4i_timer_init(struct device_node *node) 
	       TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M),

	       timer_base + TIMER_CTL_REG(1));



	setup_sched_clock(sun4i_timer_sched_read, 32, rate);

	sched_clock_register(sun4i_timer_sched_read, 32, rate);

	clocksource_mmio_init(timer_base + TIMER_CNTVAL_REG(1), node->name,

			      rate, 350, 32, clocksource_mmio_readl_down);