Commit cc353c30 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras

powerpc/mpic: Don't reset affinity for secondary MPIC on boot

Kexec/kdump currently fails on the IBM QS2x blades when the kexec happens
on a CPU other than the initial boot CPU.  It turns out that this is the
result of mpic_init trying to set affinity of each interrupt vector to the
current boot CPU.

As far as I can tell,  the same problem is likely to exist on any
secondary MPIC, because they have to deliver interrupts to the first
output all the time. There are two potential solutions for this: either
not set up affinity at all for secondary MPICs, or assume that a single
CPU output is connected to the upstream interrupt controller and hardcode
affinity to that per architecture.

This patch implements the second approach, defaulting to the first output.
Currently, all known secondary MPICs are routed to their upstream port
using the first destination, so we hardcode that.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d015fe99
...@@ -1271,6 +1271,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count) ...@@ -1271,6 +1271,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count)
void __init mpic_init(struct mpic *mpic) void __init mpic_init(struct mpic *mpic)
{ {
int i; int i;
int cpu;
BUG_ON(mpic->num_sources == 0); BUG_ON(mpic->num_sources == 0);
...@@ -1313,6 +1314,11 @@ void __init mpic_init(struct mpic *mpic) ...@@ -1313,6 +1314,11 @@ void __init mpic_init(struct mpic *mpic)
mpic_pasemi_msi_init(mpic); mpic_pasemi_msi_init(mpic);
if (mpic->flags & MPIC_PRIMARY)
cpu = hard_smp_processor_id();
else
cpu = 0;
for (i = 0; i < mpic->num_sources; i++) { for (i = 0; i < mpic->num_sources; i++) {
/* start with vector = source number, and masked */ /* start with vector = source number, and masked */
u32 vecpri = MPIC_VECPRI_MASK | i | u32 vecpri = MPIC_VECPRI_MASK | i |
...@@ -1323,8 +1329,7 @@ void __init mpic_init(struct mpic *mpic) ...@@ -1323,8 +1329,7 @@ void __init mpic_init(struct mpic *mpic)
continue; continue;
/* init hw */ /* init hw */
mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri); mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri);
mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu);
1 << hard_smp_processor_id());
} }
/* Init spurious vector */ /* Init spurious vector */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment