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>
mariux64 · Oct 11, 2012 · d23b579 · d23b579
1 parent 8eea8a6
commit d23b579
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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
 }