From: Carlos Song <carlos.song@nxp.com>
To: broonie@kernel.org, frank.li@nxp.com, hawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com
Cc: linux-spi@vger.kernel.org, imx@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Carlos Song <carlos.song@nxp.com>
Subject: [PATCH 4/6] spi: imx: handle DMA submission errors with dma_submit_error()
Date: Tue, 25 Nov 2025 18:06:16 +0800 [thread overview]
Message-ID: <20251125100618.2159770-5-carlos.song@nxp.com> (raw)
In-Reply-To: <20251125100618.2159770-1-carlos.song@nxp.com>
Add error handling for DMA request submission by checking the return
cookie with dma_submit_error(). This prevents propagating submission
failures through the DMA transfer process, which could otherwise lead
to unexpected behavior.
Signed-off-by: Carlos Song <carlos.song@nxp.com>
---
drivers/spi/spi-imx.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 186963d3d2e0..42f64d9535c9 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1445,6 +1445,7 @@ static int spi_imx_dma_submit(struct spi_imx_data *spi_imx,
struct dma_async_tx_descriptor *desc_tx, *desc_rx;
unsigned long transfer_timeout;
unsigned long time_left;
+ dma_cookie_t cookie;
/*
* The TX DMA setup starts the transfer, so make sure RX is configured
@@ -1460,21 +1461,29 @@ static int spi_imx_dma_submit(struct spi_imx_data *spi_imx,
desc_rx->callback = spi_imx_dma_rx_callback;
desc_rx->callback_param = (void *)spi_imx;
- dmaengine_submit(desc_rx);
+ cookie = dmaengine_submit(desc_rx);
+ if (dma_submit_error(cookie)) {
+ dev_err(spi_imx->dev, "submitting DMA RX failed\n");
+ transfer->error |= SPI_TRANS_FAIL_NO_START;
+ goto dmaengine_terminate_rx;
+ }
+
reinit_completion(&spi_imx->dma_rx_completion);
dma_async_issue_pending(controller->dma_rx);
desc_tx = dmaengine_prep_slave_sg(controller->dma_tx,
tx->sgl, tx->nents, DMA_MEM_TO_DEV,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
- if (!desc_tx) {
- dmaengine_terminate_all(controller->dma_rx);
- return -EINVAL;
- }
+ if (!desc_tx)
+ goto dmaengine_terminate_rx;
desc_tx->callback = spi_imx_dma_tx_callback;
desc_tx->callback_param = (void *)spi_imx;
- dmaengine_submit(desc_tx);
+ cookie = dmaengine_submit(desc_tx);
+ if (dma_submit_error(cookie)) {
+ dev_err(spi_imx->dev, "submitting DMA TX failed\n");
+ goto dmaengine_terminate_tx;
+ }
reinit_completion(&spi_imx->dma_tx_completion);
dma_async_issue_pending(controller->dma_tx);
@@ -1502,6 +1511,13 @@ static int spi_imx_dma_submit(struct spi_imx_data *spi_imx,
}
return 0;
+
+dmaengine_terminate_tx:
+ dmaengine_terminate_all(controller->dma_tx);
+dmaengine_terminate_rx:
+ dmaengine_terminate_all(controller->dma_rx);
+
+ return -EINVAL;
}
static void spi_imx_dma_max_wml_find(struct spi_imx_data *spi_imx,
--
2.34.1
next prev parent reply other threads:[~2025-11-25 10:07 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-25 10:06 [PATCH 0/6] Support ECSPI dynamic burst feature for DMA mode Carlos Song
2025-11-25 10:06 ` [PATCH 1/6] spi: imx: group spi_imx_dma_configure() with spi_imx_dma_transfer() Carlos Song
2025-11-25 15:32 ` Frank Li
2025-11-25 10:06 ` [PATCH 2/6] spi: imx: introduce helper to clear DMA mode logic Carlos Song
2025-11-25 15:41 ` Frank Li
2025-11-25 10:06 ` [PATCH 3/6] spi: imx: avoid dmaengine_terminate_all() on TX prep failure Carlos Song
2025-11-25 15:42 ` Frank Li
2025-11-25 10:06 ` Carlos Song [this message]
2025-11-25 15:45 ` [PATCH 4/6] spi: imx: handle DMA submission errors with dma_submit_error() Frank Li
2025-11-25 10:06 ` [PATCH 5/6] spi: imx: support dynamic burst length for ECSPI DMA mode Carlos Song
2025-11-25 12:10 ` Marc Kleine-Budde
2025-11-26 7:42 ` Carlos Song
2025-11-26 8:31 ` Marc Kleine-Budde
2025-11-26 9:51 ` [EXT] " Carlos Song
2025-11-26 11:17 ` Carlos Song
2025-11-26 12:36 ` Marc Kleine-Budde
2025-11-27 2:36 ` [EXT] " Carlos Song
2025-11-26 8:11 ` Marc Kleine-Budde
2025-11-26 8:18 ` [EXT] " Carlos Song
2025-11-26 8:20 ` Marc Kleine-Budde
2025-11-26 8:34 ` [EXT] " Carlos Song
2025-11-26 8:44 ` Marc Kleine-Budde
2025-11-26 8:27 ` Marc Kleine-Budde
2025-11-26 8:43 ` [EXT] " Carlos Song
2025-11-26 12:22 ` Marc Kleine-Budde
2025-11-26 12:29 ` [EXT] " Carlos Song
2025-11-26 12:52 ` Marc Kleine-Budde
2025-11-27 2:58 ` Carlos Song
2025-11-25 10:06 ` [PATCH 6/6] spi: imx: enable DMA mode for target operation Carlos Song
2025-11-25 16:05 ` Frank Li
2025-11-26 2:11 ` Carlos Song
2025-12-02 7:00 ` Carlos Song
2025-11-26 12:18 ` Marc Kleine-Budde
2025-11-26 12:30 ` [EXT] " Carlos Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251125100618.2159770-5-carlos.song@nxp.com \
--to=carlos.song@nxp.com \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=frank.li@nxp.com \
--cc=hawnguo@kernel.org \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox