Received-SPF: pass (google.com: domain of linux-kernel+bounces-37748-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
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 V3 02/14 next] qca_spi: Improve SPI IRQ handling
Date: Wed, 24 Jan 2024 23:31:59 +0100
Message-Id: <20240124223211.4687-3-wahrenst@gmx.net>
In-Reply-To: <20240124223211.4687-1-wahrenst@gmx.net>
References: <20240124223211.4687-1-wahrenst@gmx.net>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:PpK0zX9pg1Y=;GZXcBir7R06/D2XQlG2oEyGhOCS
 grTnmSIjwzsyZlg/L1yL9OwCx+WXOYzjPR85KZwn+t0h1G7jOICV9vVRpshcjVmtkp1C/dWES
 fuuEyEn60yE9xuvNOcMnxwZad/h5hThCWLf4VITkMMZRQyZdFzgsyQgL86kW9Mrox2jcesOa6
 HbowcOkhoOO0OpLJGce2lZEscXGLkqm6buCWJZ+N/Gi3OEB272iUUolqM/IyhHkntHybFrhdr
 kqwZAEVB2t5gPj4MFfJXFWcf3m76ccbcR6OZB/cnjylhR74f26gmgj8kP453pqgWTeFDfmjNF
 45uXxFYrbfen2+7bA12Y0ubreazyrkWM9JO0DOL0DNkvLdKauzTlJdBVnEATj3XUndisiJ0lm
 W89MKOK1C+gUnUb7/76M0r/KYOIkh/ClhIbqJlISNcvxqkg7Pk4478RfJ7DH7UZghrzAT8xUL
 60xh8y3rElSUB+pfC+JJ4CebiyUlGeZ7nyV9W9v57nhzKXSTj+Nz2TCPdXFQn/br0Y2T24LXN
 +L46eDYcbG7CUUVAbm5oA/pdIzG/owNcmXbf36W8hJMks0MXYcOKbiS0qP9n/rJL5p6CI1tb4
 BAlyeqEDWBfeL0QtpqCC5fFnYkHkFSdCclmcRLkgnS7ggcmMuKZ+KENmeJcvmQCANw6aCki6N
 F7UT64wyqA4NW7bF8qAsVg+3E8oFHv30BM2indy+yQk3IK2ieuRrm98/vdj//nffrXZEPbgz7
 QIN143ThNSgqf31Zf3LPjaI6Xn/z4DUgixCqkU7fS1WcsvZLSzTuHTXlrCqfPW7OvMuzEWHwi
 PY82GPr0BDSLGbCiQ3T8HZpHmW/p49M57oMc4BBCLQuBxYxNdZsw4Nu/0CI8XPjYYp1O6kKxT
 Xu/pmZnk7LMx3UgOXx+CA5AVcJIJrUxVjvR3E9igyb2M3n7lw2DvCuEZnLjzJVJB8KcvvZjWk
 YHPOng==

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 | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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

 	if (!qca)
 		return -EINVAL;
@@ -697,13 +696,7 @@ qcaspi_netdev_open(struct net_device *dev)
 	qca->sync =3D QCASPI_SYNC_UNKNOWN;
 	qcafrm_fsm_init_spi(&qca->frm_handle);

-	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);
-		return ret;
-	}
+	enable_irq(qca->spi_dev->irq);

 	/* SPI thread takes care of TX queue */
 	kthread_unpark(qca->spi_thread);
@@ -720,7 +713,7 @@ qcaspi_netdev_close(struct net_device *dev)
 	kthread_park(qca->spi_thread);

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

 	return 0;
 }
@@ -987,6 +980,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