clockevents/drivers/mtk: Fix spurious interrupt leading to crash
After analysis done by Yingjoe Chen, the timer appears to have a pending interrupt when it is enabled. Fix this by acknowledging the pending interrupt when enabling the timer interrupt. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Tested-by: Yingjoe Chen <yingjoe.chen@mediatek.com>hifive-unleashed-5.1
parent
c8d75aa47d
commit
fc686d0037
|
@ -141,14 +141,6 @@ static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mtk_timer_global_reset(struct mtk_clock_event_device *evt)
|
|
||||||
{
|
|
||||||
/* Disable all interrupts */
|
|
||||||
writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);
|
|
||||||
/* Acknowledge all interrupts */
|
|
||||||
writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
|
mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
|
||||||
{
|
{
|
||||||
|
@ -168,6 +160,12 @@ static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer)
|
||||||
{
|
{
|
||||||
u32 val;
|
u32 val;
|
||||||
|
|
||||||
|
/* Disable all interrupts */
|
||||||
|
writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);
|
||||||
|
|
||||||
|
/* Acknowledge all spurious pending interrupts */
|
||||||
|
writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);
|
||||||
|
|
||||||
val = readl(evt->gpt_base + GPT_IRQ_EN_REG);
|
val = readl(evt->gpt_base + GPT_IRQ_EN_REG);
|
||||||
writel(val | GPT_IRQ_ENABLE(timer),
|
writel(val | GPT_IRQ_ENABLE(timer),
|
||||||
evt->gpt_base + GPT_IRQ_EN_REG);
|
evt->gpt_base + GPT_IRQ_EN_REG);
|
||||||
|
@ -220,8 +218,6 @@ static void __init mtk_timer_init(struct device_node *node)
|
||||||
}
|
}
|
||||||
rate = clk_get_rate(clk);
|
rate = clk_get_rate(clk);
|
||||||
|
|
||||||
mtk_timer_global_reset(evt);
|
|
||||||
|
|
||||||
if (request_irq(evt->dev.irq, mtk_timer_interrupt,
|
if (request_irq(evt->dev.irq, mtk_timer_interrupt,
|
||||||
IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt)) {
|
IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt)) {
|
||||||
pr_warn("failed to setup irq %d\n", evt->dev.irq);
|
pr_warn("failed to setup irq %d\n", evt->dev.irq);
|
||||||
|
|
Loading…
Reference in New Issue