MIPS: PCI: remember nasid changed by set interrupt affinity (37640adb) · Commits · 戴 / test

When changing interrupt affinity remember the possible changed nasid, otherwise an interrupt deactivate/activate sequence will incorrectly setup interrupt. Fixes: ("MIPS: SGI-IP27: abstract chipset irq from bridge") Signed-off-by:

Thomas Bogendoerfer <tbogendoerfer@suse.de> Signed-off-by:

Paul Burton <paulburton@kernel.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message