[PATCH] powerpc: mpc52xx_pic, fix main interrupt masking

Sylvain Munaut tnt at 246tNt.com
Wed Apr 11 08:27:49 EST 2007


From: Domen Puncer <domen.puncer at telargo.com>

The bit setting was off by one.
Tested with RTC and GPIO_WKUP interrupts.

Signed-off-by: Domen Puncer <domen.puncer at telargo.com>
Signed-off-by: Sylvain Munaut <tnt at 246tNt.com>
---
Hi Paulus,

If you still accept patch for 2.6.21, could you pickup that one ?
It's a quite serious issue with interrupt masking and I dumbly put it
into my "for-2.6.22" queue instead of forwarding it when I received it ...

If it's too late, just tell me and I'll include it in my 'for-2.6.22' batch
end of this week.


Thanks,

	Sylvain
---
 arch/powerpc/platforms/52xx/mpc52xx_pic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index c751925..fbfff95 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -128,7 +128,7 @@ static void mpc52xx_main_mask(unsigned int virq)
 
 	pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
 
-	io_be_setbit(&intr->main_mask, 15 - l2irq);
+	io_be_setbit(&intr->main_mask, 16 - l2irq);
 }
 
 static void mpc52xx_main_unmask(unsigned int virq)
@@ -141,7 +141,7 @@ static void mpc52xx_main_unmask(unsigned int virq)
 
 	pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
 
-	io_be_clrbit(&intr->main_mask, 15 - l2irq);
+	io_be_clrbit(&intr->main_mask, 16 - l2irq);
 }
 
 static struct irq_chip mpc52xx_main_irqchip = {
-- 
1.5.0.1




More information about the Linuxppc-dev mailing list