patch for mips build failure in 5.4-stable

patch for mips build failure in 5.4-stable

[Sudip Mukherjee]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

Hi Greg, Sasha,

While backporting 37640adbefd6 ("MIPS: PCI: remember nasid changed by
set interrupt affinity") something went wrong and an extra 'n' was added.
So 'data->nasid' became 'data->nnasid' and the MIPS builds started failing.

Since v5.4.78 is already released I assumed you will need a patch to
fix it. Please consider applying the attached patch, this is only needed
for 5.4-stable tree.

--
Regards
Sudip

[-- Attachment #2: 0001-MIPS-PCI-Fix-MIPS-build.patch --]
[-- Type: text/x-diff, Size: 1403 bytes --]

From 2711bea84e15a5a16d5ac694c9025890158a36dd Mon Sep 17 00:00:00 2001
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Thu, 19 Nov 2020 10:26:33 +0000
Subject: [PATCH v5.4.y] MIPS: PCI: Fix MIPS build

While backporting 37640adbefd6 ("MIPS: PCI: remember nasid changed by
set interrupt affinity") something went wrong and an extra 'n' was added.
So 'data->nasid' became 'data->nnasid' and the MIPS builds started failing.

This is only needed for 5.4-stable tree.

Fixes: 957978aa56f1 ("MIPS: PCI: remember nasid changed by set interrupt affinity")
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
 arch/mips/pci/pci-xtalk-bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/pci/pci-xtalk-bridge.c b/arch/mips/pci/pci-xtalk-bridge.c
index c4b1c6cf2660..adc9f83b2c44 100644
--- a/arch/mips/pci/pci-xtalk-bridge.c
+++ b/arch/mips/pci/pci-xtalk-bridge.c
@@ -284,7 +284,7 @@ static int bridge_set_affinity(struct irq_data *d, const struct cpumask *mask,
 	ret = irq_chip_set_affinity_parent(d, mask, force);
 	if (ret >= 0) {
 		cpu = cpumask_first_and(mask, cpu_online_mask);
-		data->nnasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
+		data->nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
 		bridge_write(data->bc, b_int_addr[pin].addr,
 			     (((data->bc->intr_addr >> 30) & 0x30000) |
 			      bit | (data->nasid << 8)));
-- 
2.11.0

Re: patch for mips build failure in 5.4-stable

[Greg Kroah-Hartman]

On Thu, Nov 19, 2020 at 10:39:11AM +0000, Sudip Mukherjee wrote:
> Hi Greg, Sasha,
> 
> While backporting 37640adbefd6 ("MIPS: PCI: remember nasid changed by
> set interrupt affinity") something went wrong and an extra 'n' was added.
> So 'data->nasid' became 'data->nnasid' and the MIPS builds started failing.
> 
> Since v5.4.78 is already released I assumed you will need a patch to
> fix it. Please consider applying the attached patch, this is only needed
> for 5.4-stable tree.

Now applied, thanks!

greg k-h