Received-SPF: pass (google.com: domain of linux-kernel+bounces-41935-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Stefan Wahren <wahrenst@gmx.net>
To: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>
Cc: Lino Sanfilippo <LinoSanfilippo@gmx.de>,
	Florian Fainelli <f.fainelli@gmail.com>,
	netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Stefan Wahren <wahrenst@gmx.net>,
	Jacob Keller <jacob.e.keller@intel.com>
Subject: [PATCH V4 03/15 net-next] qca_spi: Improve SPI IRQ handling
Date: Sun, 28 Jan 2024 21:10:47 +0100
Message-Id: <20240128201059.6259-4-wahrenst@gmx.net>
In-Reply-To: <20240128201059.6259-1-wahrenst@gmx.net>
References: <20240128201059.6259-1-wahrenst@gmx.net>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:qugKrmXZGRc=;I7ZoPvnut6nxSVLeyeeLCLFwlL9
 uuE/hgVWJs5Q0jTUTqmz+lowGz5ZORbsgPX1QWgAeRhm+/7CPjdfACuIz46Iq6KKvmw3LZlD4
 bMfHfHj/oAeQNfHIlcqlDgFgJnm5QhMDTOPH7twMfJfMvGaaGEJXBPeNpauu3Nhwg5jYZaPJn
 Vrj5pz53vuguG11PoKBEupBwqZkklkeUGss+IOQ1yvsbwyp5n40RpT68fN9qnu2Y8mBy/1NbF
 Bu5K8GqzCKpiIsGvlm+cwV+SJyFT43Yc857VmHKWHOKLuDM6oii57TiI2N4qmnXVpzsvn12EP
 jof2Xv4zkfv2d8Rn4/2rOEQRsfLCaohQY5L9WxEHPfbT67pcRwQVpatcmLrOhXGnIS1Wt/3uM
 RZ/XGX+9Qis7Wv+ieJPr/FUJ5IfRDWrstB4tpxKB/mVlyZeDxzklKDNTPq+8P+Ec2xNfic2sK
 4ZTjp+eMW/eLoXvDM8ajJYmCttZQadm8EoaRnrqVGU63gQzc7f1dwefRoJ+1rqAUvJb4BU6Pf
 ONRZjLYn1TNmFNCeG20XqcueVl2L1x/RfLGIJofX46h9FFOS3Ut5QnY0j4tUuAZrDRABheaZJ
 sEW7MA28IgoPUkp8lAEI5xWaBKak/V+Qty3cXGckBLWu3eqZs/b5Hoy4hlRu1FhxYf/TJFpHu
 R5o7mYKHeZIoDuTtcBvpCwYKh1opFMG6jhm6PyZvo6GRLxZTPcBscbiwIVAD+JVPssFvcP90g
 ftxWfivIXKIOon9FfzezQKQ/4J109zs91SdvmPYvt9F5MOSj1/7moFaAAMDO6PnwEpWJbNTCw
 n6tyrpiRsOBk8AnwwexOeRcErvVcevCN8Hs5tYQeIMC8wb+xBMOM+vRG3hWc5iBL6gEV0i9mA
 bZrJ1IzzkpDbiuKv8RHse7bs7YtmjX3mPWsZCtHSXOFrmSi1qJzMS2Ix82VGVJtQ3SkT6Qlic
 0WmxXWmNCKSK9OHhwjfduOz5wpE=

The functions qcaspi_netdev_open/close are responsible of request &
free of the SPI interrupt, which wasn't the best choice because
allocation problems are discovered not during probe. So let us split
IRQ allocation & enabling, so we can take advantage of a device
managed IRQ.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
=2D--
 drivers/net/ethernet/qualcomm/qca_spi.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/etherne=
t/qualcomm/qca_spi.c
index fe50c2dd7cc8..3f7e38a11ba0 100644
=2D-- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -688,7 +688,6 @@ qcaspi_netdev_open(struct net_device *dev)
 {
 	struct qcaspi *qca =3D netdev_priv(dev);
 	struct task_struct *thread;
-	int ret =3D 0;

 	if (!qca)
 		return -EINVAL;
@@ -709,14 +708,7 @@ qcaspi_netdev_open(struct net_device *dev)

 	qca->spi_thread =3D thread;

-	ret =3D request_irq(qca->spi_dev->irq, qcaspi_intr_handler, 0,
-			  dev->name, qca);
-	if (ret) {
-		netdev_err(dev, "%s: unable to get IRQ %d (irqval=3D%d).\n",
-			   QCASPI_DRV_NAME, qca->spi_dev->irq, ret);
-		kthread_stop(qca->spi_thread);
-		return ret;
-	}
+	enable_irq(qca->spi_dev->irq);

 	/* SPI thread takes care of TX queue */

@@ -731,7 +723,7 @@ qcaspi_netdev_close(struct net_device *dev)
 	netif_stop_queue(dev);

 	qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, 0, wr_verify);
-	free_irq(qca->spi_dev->irq, qca);
+	disable_irq(qca->spi_dev->irq);

 	if (qca->spi_thread) {
 		kthread_stop(qca->spi_thread);
@@ -989,6 +981,15 @@ qca_spi_probe(struct spi_device *spi)

 	spi_set_drvdata(spi, qcaspi_devs);

+	ret =3D devm_request_irq(&spi->dev, spi->irq, qcaspi_intr_handler,
+			       IRQF_NO_AUTOEN, qca->net_dev->name, qca);
+	if (ret) {
+		dev_err(&spi->dev, "Unable to get IRQ %d (irqval=3D%d).\n",
+			spi->irq, ret);
+		free_netdev(qcaspi_devs);
+		return ret;
+	}
+
 	ret =3D of_get_ethdev_address(spi->dev.of_node, qca->net_dev);
 	if (ret) {
 		eth_hw_addr_random(qca->net_dev);
=2D-
2.34.1