Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
To:     bhelgaas@google.com, rjui@broadcom.com, sbranden@broadcom.com,
        f.fainelli@gmail.com
Cc:     linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
        Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Subject: [PATCH 3/3] PCI: iproc: Set affinity mask on MSI interrupts
Date:   Thu, 30 Jul 2020 15:37:47 +1200
Message-Id: <20200730033747.18931-3-mark.tomlinson@alliedtelesis.co.nz>
In-Reply-To: <20200730033747.18931-1-mark.tomlinson@alliedtelesis.co.nz>
References: <20200730033747.18931-1-mark.tomlinson@alliedtelesis.co.nz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

The core interrupt code expects the irq_set_affinity call to update the
effective affinity for the interrupt. This was not being done, so update
iproc_msi_irq_set_affinity() to do so.

Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
---
 drivers/pci/controller/pcie-iproc-msi.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/contro=
ller/pcie-iproc-msi.c
index 3176ad3ab0e5..908475d27e0e 100644
--- a/drivers/pci/controller/pcie-iproc-msi.c
+++ b/drivers/pci/controller/pcie-iproc-msi.c
@@ -209,15 +209,20 @@ static int iproc_msi_irq_set_affinity(struct irq_da=
ta *data,
 	struct iproc_msi *msi =3D irq_data_get_irq_chip_data(data);
 	int target_cpu =3D cpumask_first(mask);
 	int curr_cpu;
+	int ret;
=20
 	curr_cpu =3D hwirq_to_cpu(msi, data->hwirq);
 	if (curr_cpu =3D=3D target_cpu)
-		return IRQ_SET_MASK_OK_DONE;
+		ret =3D IRQ_SET_MASK_OK_DONE;
+	else {
+		/* steer MSI to the target CPU */
+		data->hwirq =3D hwirq_to_canonical_hwirq(msi, data->hwirq) + target_cp=
u;
+		ret =3D IRQ_SET_MASK_OK;
+	}
=20
-	/* steer MSI to the target CPU */
-	data->hwirq =3D hwirq_to_canonical_hwirq(msi, data->hwirq) + target_cpu=
;
+	irq_data_update_effective_affinity(data, cpumask_of(target_cpu));
=20
-	return IRQ_SET_MASK_OK;
+	return ret;
 }
=20
 static void iproc_msi_irq_compose_msi_msg(struct irq_data *data,
--=20
2.28.0