mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
MIPS: PCI: remember nasid changed by set interrupt affinity
When changing interrupt affinity remember the possible changed nasid,
otherwise an interrupt deactivate/activate sequence will incorrectly
setup interrupt.
Fixes: e6308b6d35 ("MIPS: SGI-IP27: abstract chipset irq from bridge")
Signed-off-by: Thomas Bogendoerfer <[email protected]>
Signed-off-by: Paul Burton <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: James Hogan <[email protected]>
Cc: [email protected]
Cc: [email protected]
This commit is contained in:
1 parent
e3d765a941
commit
37640adbef
1 file changed
+2
-3
@@ -306,16 +306,15 @@ static int bridge_set_affinity(struct irq_data *d, const struct cpumask *mask,
|
||||
struct bridge_irq_chip_data *data = d->chip_data;
|
||||
int bit = d->parent_data->hwirq;
|
||||
int pin = d->hwirq;
|
||||
nasid_t nasid;
|
||||
int ret, cpu;
|
||||
|
||||
ret = irq_chip_set_affinity_parent(d, mask, force);
|
||||
if (ret >= 0) {
|
||||
cpu = cpumask_first_and(mask, cpu_online_mask);
|
||||
nasid = cpu_to_node(cpu);
|
||||
data->nasid = cpu_to_node(cpu);
|
||||
bridge_write(data->bc, b_int_addr[pin].addr,
|
||||
(((data->bc->intr_addr >> 30) & 0x30000) |
|
||||
bit | (nasid << 8)));
|
||||
bit | (data->nasid << 8)));
|
||||
bridge_read(data->bc, b_wid_tflush);
|
||||
}
|
||||
return ret;
|
||||
|
||||
Reference in new issue
Block a user