Skip to content

Commit

Permalink
[PATCH] genirq: Mask irqs when migrating them.
Browse files Browse the repository at this point in the history
move_native_irqs tries to do the right thing when migrating irqs
by disabling them.  However disabling them is a software logical
thing, not a hardware thing.  This has always been a little flaky
and after Ingo's latest round of changes it is guaranteed to not
mask the apic.

So this patch fixes move_native_irq to directly call the mask and
unmask chip methods to guarantee that we mask the irq when we
are migrating it.  We must do this as it is required by
all code that call into the path.

Since we don't know the masked status when IRQ_DISABLED is
set so we will not be able to restore it.   The patch makes the code
just give up and trying again the next time this routing is called.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
ebiederm authored and Linus Torvalds committed Feb 26, 2007
1 parent 6101429 commit 2a786b4
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions kernel/irq/migration.c
Expand Up @@ -65,12 +65,11 @@ void move_native_irq(int irq)
if (likely(!(desc->status & IRQ_MOVE_PENDING)))
return;

if (likely(!(desc->status & IRQ_DISABLED)))
desc->chip->disable(irq);
if (unlikely(desc->status & IRQ_DISABLED))
return;

desc->chip->mask(irq);
move_masked_irq(irq);

if (likely(!(desc->status & IRQ_DISABLED)))
desc->chip->enable(irq);
desc->chip->unmask(irq);
}

0 comments on commit 2a786b4

Please sign in to comment.