From d23b5799b608112bb799c9b0e1e11ee1da692d76 Mon Sep 17 00:00:00 2001 From: Gong Tao <gontao0607@gmail.com> Date: Fri, 21 Sep 2012 08:49:58 +0200 Subject: [PATCH] openrisc: mask interrupts in irq_mask_ack function or1k_pic_mask_ack was failing to actually mask the IRQ. Signed-off-by: Gong Tao <gongtao0607@gmail.com> Signed-off-by: Jonas Bonn <jonas@southpole.se> --- arch/openrisc/kernel/irq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c index 61327985f967b8..8ec77bc9f1e7d7 100644 --- a/arch/openrisc/kernel/irq.c +++ b/arch/openrisc/kernel/irq.c @@ -87,9 +87,11 @@ static void or1k_pic_mask_ack(struct irq_data *data) /* Comments for pic_ack apply here, too */ #ifdef CONFIG_OR1K_1200 + mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq)); mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq)); #else WARN(1, "Interrupt handling possibly broken\n"); + mtspr(SPR_PICMR, (1UL << data->hwirq)); mtspr(SPR_PICSR, (1UL << data->hwirq)); #endif } -- GitLab