Received-SPF: pass (google.com: domain of linux-kernel+bounces-197475-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Frank Li <Frank.Li@nxp.com>
To: Vinod Koul <vkoul@kernel.org>,
	imx@lists.linux.dev (open list:FREESCALE eDMA DRIVER),
	dmaengine@vger.kernel.org (open list:FREESCALE eDMA DRIVER),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/2] dmaengine: fsl-edma: request per-channel IRQ only when channel is allocated
Date: Fri, 31 May 2024 17:01:51 -0400
Message-Id: <20240531210152.1878443-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?MgMIVQW9YVqGTKV/pgovk5GLO4qM6O6Xk17oGsGyaMiVV3Ga+q+qNikFsahQ?=
 =?us-ascii?Q?4BDIHyA7+DUEidTNAEV9LUDpIBNl0EnahhqqM2jCZbsHak3RPIuU7egyapTw?=
 =?us-ascii?Q?VLcrdWtXFkXOvpV/+wj5v+YeHkqfdSAicSXgFwHqGsuPsEFgOoZPo1dNWUxa?=
 =?us-ascii?Q?R4M+dn328HqOLmSDfYGMgcN4YvI+yWDoVqAPtuYkx0+pCfRdrZIeVQbV0LHp?=
 =?us-ascii?Q?VXFpcnAtcmMd4AaOY1jzpYjWypWaef1IxPE3KAzCrYUF3kjvvb8wPnUZ6toM?=
 =?us-ascii?Q?90yOMQqmlrdwZVNW6nxE48w0p5HChehmyjy0pmtGqRDpXRw81CfArY5kPQDb?=
 =?us-ascii?Q?NOcHB0UaxStWSYQgjCl2XtQjpp+6YCItfjf/2zARJxr74fiIy74pwJcNgatw?=
 =?us-ascii?Q?7/PkmCWbTYzc9w6u4a8peqDh96QAAAE4+RRuItkAbnOZaFE+pp//VbPNYB+C?=
 =?us-ascii?Q?OZQ46a2Zk1tJEG+FxF6Y7gJZHJuvVaF/oDchpEVxyrDBVxL5CxOuuai6HWoo?=
 =?us-ascii?Q?hbNC8cLqluivk6ABQysW3ogpOOvA9ClQkIiEn71vKP27oiyt3bXiNMnc2eKl?=
 =?us-ascii?Q?e7rH/HnMAmlSqFN/e78vdzYvJoPGonIJb7bDfIuUmWmTlCejSvYighd96pIN?=
 =?us-ascii?Q?65/d9SHawQTNvQPf41j/egYFDYZt5xTYVK0N6iG2V5+iZUb8/H9p4mplOOts?=
 =?us-ascii?Q?1al53zRv1UZSxrMjJ7v/qabTjVI4RkT4jMdYEEHx72YpVpu217k3lmW0WFdt?=
 =?us-ascii?Q?U64KTDuQI+LV3plWHqeH8mPnlVwimdAZBcOYSaBj99CxyHNLcVsi4cHjVVZ8?=
 =?us-ascii?Q?nKWcRUn5nCLI/oK9SR1zdktBVcxGv9Vmy3qqIBt/m4PHvKAHPDl2U+yrvTHU?=
 =?us-ascii?Q?Wn3FIxbiyWArVt0cPkQ8eb3Zw2Oq0SwonGOy2AYSKwfByEg5gJrbaGb17wfo?=
 =?us-ascii?Q?w20kW8oOGeHubNxBUc01Ze1Uytb4spwxcXnmajvQ2UmoiTNMkYtsRSMJ+cYs?=
 =?us-ascii?Q?Tpxt+e7Sgb02UqFN4bZVJ7qzm/bAa2d0L49RGIsyj3GNDi3gNVuVvKs3SYEE?=
 =?us-ascii?Q?NhnhP1VjYyLHnpAVtPL0uPgTPVlsnUqX88mmZ2PGMTIIXdafiwSGq908HpGv?=
 =?us-ascii?Q?EjRI0+bIAYa3Js661Muh+ArqFv0sjDnyL2qpnzvGTSy59Pp18+GJKPQCvvP6?=
 =?us-ascii?Q?TVK36CoChpEKxQOjKGSQDIiph53peqdXlO498aWkn97G5FTZbsmBrbZ6itMs?=
 =?us-ascii?Q?EnheU0f9wiBaaBKs8xf6vt8sWHacnqhFPRjUeiRbLDdKwBhHXecVyz2VTs7u?=
 =?us-ascii?Q?DEe32wzZP0GZEj64+xOWY0kScx8qGblM9eCh4LOxd5N8CpQ3oZia34fQQTuG?=
 =?us-ascii?Q?1vYi0ejZJ0jwmCgAI4aIQWhiHQ57cqUvHjjfRcp8+boxBUWm86AvYhvY/hyW?=
 =?us-ascii?Q?dtsTcTg8O/2o+/Roi50bn5xQMx7sQzA4nLey8Lp4n9fjmxEKY+E5rc7ozG7r?=
 =?us-ascii?Q?tLdolf0YQTIaJynm75um8tw9QWHshphFZHjkw1mnVBXXM64gDdK4UOG0k4jA?=
 =?us-ascii?Q?Ll/5n09AzvaMjZvcBHk=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 06a78650-0b14-4fa8-e067-08dc81b4f151
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2024 21:02:12.4323
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: FpMIAzl6f2VJYkOJNcCXtClT7qq9EZonY0MToTXIWLjf6lx348x7Sxi0Ibq7v70oKPh84hz6eSCh8wFuRDz0Jg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9232

The edma feature individual IRQs for each DMA channel at some devices.
Given the presence of numerous eDMA instances, each with multiple channels,
IRQ request during probe results in an extensive list at /proc/interrupts.
However, a significant portion of these channels remains unused by the
system.

Request irq only when a DMA client driver requests a DMA channel.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/dma/fsl-edma-common.c | 15 +++++++++++++++
 drivers/dma/fsl-edma-common.h |  1 +
 drivers/dma/fsl-edma-main.c   | 29 +++++++++++++++--------------
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index ac04a2ce4fa1f..91a4c11b7cbfd 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -805,6 +805,7 @@ void fsl_edma_issue_pending(struct dma_chan *chan)
 int fsl_edma_alloc_chan_resources(struct dma_chan *chan)
 {
 	struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+	int ret;
 
 	if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK)
 		clk_prepare_enable(fsl_chan->clk);
@@ -813,6 +814,17 @@ int fsl_edma_alloc_chan_resources(struct dma_chan *chan)
 				fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_TCD64 ?
 				sizeof(struct fsl_edma_hw_tcd64) : sizeof(struct fsl_edma_hw_tcd),
 				32, 0);
+
+	if (fsl_chan->txirq) {
+		ret = request_irq(fsl_chan->txirq, fsl_chan->irq_handler, IRQF_SHARED,
+				 fsl_chan->chan_name, fsl_chan);
+
+		if (ret) {
+			dma_pool_destroy(fsl_chan->tcd_pool);
+			return ret;
+		}
+	}
+
 	return 0;
 }
 
@@ -832,6 +844,9 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan)
 	fsl_edma_unprep_slave_dma(fsl_chan);
 	spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
 
+	if (fsl_chan->txirq)
+		free_irq(fsl_chan->txirq, fsl_chan);
+
 	vchan_dma_desc_free_list(&fsl_chan->vchan, &head);
 	dma_pool_destroy(fsl_chan->tcd_pool);
 	fsl_chan->tcd_pool = NULL;
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index dfbdcc922ceea..c5a766da02b88 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -172,6 +172,7 @@ struct fsl_edma_chan {
 	int                             priority;
 	int				hw_chanid;
 	int				txirq;
+	irqreturn_t			(*irq_handler)(int irq, void *dev_id);
 	bool				is_rxchan;
 	bool				is_remote;
 	bool				is_multi_fifo;
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index a1c3c4ed869c5..82ac56be2d832 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -65,6 +65,13 @@ static irqreturn_t fsl_edma3_tx_handler(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
+static irqreturn_t fsl_edma2_tx_handler(int irq, void *devi_id)
+{
+	struct fsl_edma_chan *fsl_chan = devi_id;
+
+	return fsl_edma_tx_handler(irq, fsl_chan->edma);
+}
+
 static irqreturn_t fsl_edma_err_handler(int irq, void *dev_id)
 {
 	struct fsl_edma_engine *fsl_edma = dev_id;
@@ -228,7 +235,6 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma
 
 static int fsl_edma3_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma)
 {
-	int ret;
 	int i;
 
 	for (i = 0; i < fsl_edma->n_chans; i++) {
@@ -243,13 +249,7 @@ static int fsl_edma3_irq_init(struct platform_device *pdev, struct fsl_edma_engi
 		if (fsl_chan->txirq < 0)
 			return  -EINVAL;
 
-		ret = devm_request_irq(&pdev->dev, fsl_chan->txirq,
-			fsl_edma3_tx_handler, IRQF_SHARED,
-			fsl_chan->chan_name, fsl_chan);
-		if (ret) {
-			dev_err(&pdev->dev, "Can't register chan%d's IRQ.\n", i);
-			return -EINVAL;
-		}
+		fsl_chan->irq_handler = fsl_edma3_tx_handler;
 	}
 
 	return 0;
@@ -278,19 +278,20 @@ fsl_edma2_irq_init(struct platform_device *pdev,
 	 */
 	for (i = 0; i < count; i++) {
 		irq = platform_get_irq(pdev, i);
+		ret = 0;
 		if (irq < 0)
 			return -ENXIO;
 
 		/* The last IRQ is for eDMA err */
-		if (i == count - 1)
+		if (i == count - 1) {
 			ret = devm_request_irq(&pdev->dev, irq,
 						fsl_edma_err_handler,
 						0, "eDMA2-ERR", fsl_edma);
-		else
-			ret = devm_request_irq(&pdev->dev, irq,
-						fsl_edma_tx_handler, 0,
-						fsl_edma->chans[i].chan_name,
-						fsl_edma);
+		} else {
+			fsl_edma->chans[i].txirq = irq;
+			fsl_edma->chans[i].irq_handler = fsl_edma2_tx_handler;
+		}
+
 		if (ret)
 			return ret;
 	}
-- 
2.34.1