adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] powerpc: Fix PowerMac IRQ handling bug

Browse source 
The port to genirq & the new powerpc interrupt model in 2.6.18 introduced a
bug in the legacy PowerMac PIC code (used on older machines) because of a
typo potentially causing hangs due to interrupt storms.  This fixes it,
along with a performance issue causing us to do spurrious retriggers after
masking an interrupt.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Benjamin Herrenschmidt 2006-08-31 21:27:50 -07:00 committed by Linus Torvalds
parent d565dd3b08
commit ca72945d2d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/powerpc/platforms/powermac/pic.c
View file

@ -87,8 +87,8 @@ static void __pmac_retrigger(unsigned int irq_nr)
static void pmac_mask_and_ack_irq(unsigned int virq) static void pmac_mask_and_ack_irq(unsigned int virq)
{ {
unsigned int src = irq_map[virq].hwirq; unsigned int src = irq_map[virq].hwirq;
unsigned long bit = 1UL << (virq & 0x1f); unsigned long bit = 1UL << (src & 0x1f);
int i = virq >> 5; int i = src >> 5;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&pmac_pic_lock, flags); spin_lock_irqsave(&pmac_pic_lock, flags);
@ -175,7 +175,7 @@ static void pmac_mask_irq(unsigned int virq)
spin_lock_irqsave(&pmac_pic_lock, flags); spin_lock_irqsave(&pmac_pic_lock, flags);
__clear_bit(src, ppc_cached_irq_mask); __clear_bit(src, ppc_cached_irq_mask);
__pmac_set_irq_mask(src, 0); __pmac_set_irq_mask(src, 1);
spin_unlock_irqrestore(&pmac_pic_lock, flags); spin_unlock_irqrestore(&pmac_pic_lock, flags);
} }