Skip to content

Commit 37640ad

Browse files
Thomas Bogendoerferpaulburton
Thomas Bogendoerfer
authored andcommitted
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: e6308b6 ("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]
1 parent e3d765a commit 37640ad

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

arch/mips/pci/pci-xtalk-bridge.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -306,16 +306,15 @@ static int bridge_set_affinity(struct irq_data *d, const struct cpumask *mask,
306306
struct bridge_irq_chip_data *data = d->chip_data;
307307
int bit = d->parent_data->hwirq;
308308
int pin = d->hwirq;
309-
nasid_t nasid;
310309
int ret, cpu;
311310

312311
ret = irq_chip_set_affinity_parent(d, mask, force);
313312
if (ret >= 0) {
314313
cpu = cpumask_first_and(mask, cpu_online_mask);
315-
nasid = cpu_to_node(cpu);
314+
data->nasid = cpu_to_node(cpu);
316315
bridge_write(data->bc, b_int_addr[pin].addr,
317316
(((data->bc->intr_addr >> 30) & 0x30000) |
318-
bit | (nasid << 8)));
317+
bit | (data->nasid << 8)));
319318
bridge_read(data->bc, b_wid_tflush);
320319
}
321320
return ret;

0 commit comments

Comments
 (0)