diff mbox series

[5.4,140/203] MIPS: PCI: remember nasid changed by set interrupt affinity

Message ID 20200116231757.243032912@linuxfoundation.org (mailing list archive)
State Not Applicable
Delegated to: Paul Burton
Headers show
Series None | expand

Commit Message

Greg Kroah-Hartman Jan. 16, 2020, 11:17 p.m. UTC 
From: Thomas Bogendoerfer <tbogendoerfer@suse.de>

commit 37640adbefd66491cb8083a438f7bf366ac09bc7 upstream.

When changing interrupt affinity remember the possible changed nasid,
otherwise an interrupt deactivate/activate sequence will incorrectly
setup interrupt.

Fixes: e6308b6d35ea ("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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/mips/pci/pci-xtalk-bridge.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Sudip Mukherjee Nov. 18, 2020, 9:41 p.m. UTC | #1 
Hi Greg,

On Fri, Jan 17, 2020 at 12:17:37AM +0100, Greg Kroah-Hartman wrote:
> From: Thomas Bogendoerfer <tbogendoerfer@suse.de>
> 
> commit 37640adbefd66491cb8083a438f7bf366ac09bc7 upstream.
> 

<snip>

> 
> ---
>  arch/mips/pci/pci-xtalk-bridge.c |    5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> --- a/arch/mips/pci/pci-xtalk-bridge.c
> +++ b/arch/mips/pci/pci-xtalk-bridge.c
> @@ -279,16 +279,15 @@ static int bridge_set_affinity(struct ir
>  	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 = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
> +		data->nnasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));

This will be 'data->nasid' and its causing mips builds to fail.
diff mbox series

Patch

--- a/arch/mips/pci/pci-xtalk-bridge.c
+++ b/arch/mips/pci/pci-xtalk-bridge.c
@@ -279,16 +279,15 @@  static int bridge_set_affinity(struct ir
 	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 = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
+		data->nnasid = COMPACT_TO_NASID_NODEID(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;