diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2016-08-25 14:26:59 +0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-09-29 11:14:21 +0200 |
| commit | 68151411d795b08418cbaf52bb984fac94b914f6 (patch) | |
| tree | e9cc2fe28c9d964715bf161d8f8b9aad7ff2f04e | |
| parent | 25da72e985a27baced282d6f805cc951354b9e49 (diff) | |
| download | linux-68151411d795b08418cbaf52bb984fac94b914f6.tar.gz linux-68151411d795b08418cbaf52bb984fac94b914f6.tar.bz2 linux-68151411d795b08418cbaf52bb984fac94b914f6.zip | |
clocksource/drivers/sun4i: Clear interrupts after stopping timer in probe function
commit b53e7d000d9e6e9fd2c6eb6b82d2783c67fd599e upstream.
The bootloader (U-boot) sometimes uses this timer for various delays.
It uses it as a ongoing counter, and does comparisons on the current
counter value. The timer counter is never stopped.
In some cases when the user interacts with the bootloader, or lets
it idle for some time before loading Linux, the timer may expire,
and an interrupt will be pending. This results in an unexpected
interrupt when the timer interrupt is enabled by the kernel, at
which point the event_handler isn't set yet. This results in a NULL
pointer dereference exception, panic, and no way to reboot.
Clear any pending interrupts after we stop the timer in the probe
function to avoid this.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/clocksource/sun4i_timer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index 4fe6ac85ea1d..b4b0c6a2a00d 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c @@ -118,12 +118,16 @@ static struct clock_event_device sun4i_clockevent = { .set_next_event = sun4i_clkevt_next_event, }; +static void sun4i_timer_clear_interrupt(void) +{ + writel(TIMER_IRQ_EN(0), timer_base + TIMER_IRQ_ST_REG); +} static irqreturn_t sun4i_timer_interrupt(int irq, void *dev_id) { struct clock_event_device *evt = (struct clock_event_device *)dev_id; - writel(0x1, timer_base + TIMER_IRQ_ST_REG); + sun4i_timer_clear_interrupt(); evt->event_handler(evt); return IRQ_HANDLED; @@ -177,6 +181,9 @@ static void __init sun4i_timer_init(struct device_node *node) writel(TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M), timer_base + TIMER_CTL_REG(0)); + /* clear timer0 interrupt */ + sun4i_timer_clear_interrupt(); + sun4i_clockevent.cpumask = cpumask_of(0); clockevents_config_and_register(&sun4i_clockevent, rate, 0x1, |