[PATCH v2 2/3] i2c: imx: unmap the DMA buffer when a transfer is terminated

From: Mehmet Fide

Date: Thu Nov 19 2026 - 08:43:15 EST


From: Mehmet Fide <mehmet.fide@xxxxxxxxxxxxxxxxxx>

The buffer of a DMA transfer is unmapped in the DMA completion callback
only. When the wait for the completion times out the transfer is
terminated, the callback does not run and the mapping is never released.

Unmap the buffer where the transfer is waited for, after the transfer
has completed or has been terminated.

Fixes: ce1a78840ff7 ("i2c: imx: add DMA support for freescale i2c driver")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Mehmet Fide <mehmet.fide@xxxxxxxxxxxxxxxxxx>
---
drivers/i2c/busses/i2c-imx.c | 41 ++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index f20727ffb5ce..fbfabceb29ac 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -469,11 +469,26 @@ static void i2c_imx_dma_callback(void *arg)
struct imx_i2c_struct *i2c_imx = (struct imx_i2c_struct *)arg;
struct imx_i2c_dma *dma = i2c_imx->dma;

- dma_unmap_single(dma->chan_using->device->dev, dma->dma_buf,
- dma->dma_len, dma->dma_data_dir);
complete(&dma->cmd_complete);
}

+static int i2c_imx_dma_wait(struct imx_i2c_struct *i2c_imx)
+{
+ struct imx_i2c_dma *dma = i2c_imx->dma;
+ int result = 0;
+
+ if (!wait_for_completion_timeout(&dma->cmd_complete,
+ msecs_to_jiffies(DMA_TIMEOUT)))
+ result = -ETIMEDOUT;
+
+ if (result)
+ dmaengine_terminate_sync(dma->chan_using);
+ dma_unmap_single(dma->chan_using->device->dev, dma->dma_buf,
+ dma->dma_len, dma->dma_data_dir);
+
+ return result;
+}
+
static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx,
struct i2c_msg *msgs)
{
@@ -1192,7 +1207,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
struct i2c_msg *msgs)
{
int result;
- unsigned long time_left;
unsigned int temp = 0;
unsigned long orig_jiffies = jiffies;
struct imx_i2c_dma *dma = i2c_imx->dma;
@@ -1217,13 +1231,9 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
* The first byte must be transmitted by the CPU.
*/
imx_i2c_write_reg(i2c_imx_addr_byte(msgs), i2c_imx, IMX_I2C_I2DR);
- time_left = wait_for_completion_timeout(
- &i2c_imx->dma->cmd_complete,
- msecs_to_jiffies(DMA_TIMEOUT));
- if (time_left == 0) {
- dmaengine_terminate_sync(dma->chan_using);
- return -ETIMEDOUT;
- }
+ result = i2c_imx_dma_wait(i2c_imx);
+ if (result)
+ return result;

/* Waiting for transfer complete. */
while (1) {
@@ -1298,7 +1308,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
struct i2c_msg *msgs, bool is_lastmsg)
{
int result;
- unsigned long time_left;
unsigned int temp;
unsigned long orig_jiffies = jiffies;
struct imx_i2c_dma *dma = i2c_imx->dma;
@@ -1321,13 +1330,9 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
if (result)
return result;

- time_left = wait_for_completion_timeout(
- &i2c_imx->dma->cmd_complete,
- msecs_to_jiffies(DMA_TIMEOUT));
- if (time_left == 0) {
- dmaengine_terminate_sync(dma->chan_using);
- return -ETIMEDOUT;
- }
+ result = i2c_imx_dma_wait(i2c_imx);
+ if (result)
+ return result;

/* waiting for transfer complete. */
while (1) {
--
2.56.0