summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuresh Siddha <suresh.b.siddha@intel.com>2009-10-26 14:24:32 -0800
committerIngo Molnar <mingo@elte.hu>2009-11-02 15:56:35 +0100
commit84e21493a3b28c9fefe99fe827fc0c0c101a813d (patch)
tree5e879cd8a6ed1e927eccc60a515b6006c8b915c3
parent7a7732bc0f7c46f217dbec723f25366b6285cc42 (diff)
downloadblackbird-op-linux-84e21493a3b28c9fefe99fe827fc0c0c101a813d.tar.gz
blackbird-op-linux-84e21493a3b28c9fefe99fe827fc0c0c101a813d.zip
x86, intr-remap: Avoid irq_chip mask/unmask in fixup_irqs() for intr-remapping
In the presence of interrupt-remapping, irqs will be migrated in the process context and we don't do (and there is no need to) irq_chip mask/unmask while migrating the interrupt. Similarly fix the fixup_irqs() that get called during cpu offline and avoid calling irq_chip mask/unmask for irqs that are ok to be migrated in the process context. While we didn't observe any race condition with the existing code, this change takes complete advantage of interrupt-remapping in the newer generation platforms and avoids any potential HW lockup's (that often worry Eric :) Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Acked-by: Eric W. Biederman <ebiederm@xmission.com> Cc: garyhade@us.ibm.com LKML-Reference: <20091026230001.661423939@sbs-t61.sc.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 3ea66556e5e1..342bcbca19b4 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -310,7 +310,7 @@ void fixup_irqs(void)
affinity = cpu_all_mask;
}
- if (desc->chip->mask)
+ if (!(desc->status & IRQ_MOVE_PCNTXT) && desc->chip->mask)
desc->chip->mask(irq);
if (desc->chip->set_affinity)
@@ -318,7 +318,7 @@ void fixup_irqs(void)
else if (!(warned++))
set_affinity = 0;
- if (desc->chip->unmask)
+ if (!(desc->status & IRQ_MOVE_PCNTXT) && desc->chip->unmask)
desc->chip->unmask(irq);
spin_unlock(&desc->lock);
OpenPOWER on IntegriCloud