From nobody Sun Dec 14 01:57:44 2025 Received: from mx08-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A69F82737EA; Mon, 16 Jun 2025 08:57:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.207.212.93 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750064278; cv=none; b=AQvOUaAz1n9hk8Hb/4QYuvxB6Ox16Dq4aOk/V+D5qhFsCBcwuBow7hVM1eoB8lKEnfYhGQieCa5HsjIHnUITK4VFrbjdtTEhGmM/TbDkg0wBw2YVIBbsw4gkNNF/8TffkKHV8yNMUw2sFrGE2jkdWHgjhG237/ZZAN3aF2q3Gpc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750064278; c=relaxed/simple; bh=QHPhf51rlg3p+1iduys7C5HxwyR91W08dTQkEuaw2pQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=soMxtfOuqAjZWiR4M4z58qQhhRb6M0aEaEcKvL37yBSqevKVBpGQfSwU5FVBhDlshtrUxCiY30qFlK04AMu8CI3XiywWor9Hvqxh3kTG4sLHoIyglzKTftcqvHc2gIDF4ou8uGIjKTlXB5gfQ9XZzQogn3/5bUSmUBW+q8hydf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com; spf=pass smtp.mailfrom=foss.st.com; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b=JqGXJXDp; arc=none smtp.client-ip=91.207.212.93 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=foss.st.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b="JqGXJXDp" Received: from pps.filterd (m0369457.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55G8j90R007215; Mon, 16 Jun 2025 10:57:30 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=selector1; bh= 3WfFafoOzhwEP01k+lNZuQ235Lfi7VkaaDEXOrgCKhQ=; b=JqGXJXDpKHkbljGY WbS3vBo6YHZ9tEh7LnWT8B3i0RNkZsbPjq0iB55CgkclAE/qR4TJ+wfJmPw5Sfs0 Ui3xcREFWJJEhR/pp91VcAwDRgW71z2ryKyLiEFigTk+vYX/zhiZzVxeXL9Z1laI emJtfQ8BwIg3jmFqnJnV0RjHN6c1eRs0cN7iw4AySvXwYG9tSQtjvEF+OQpNWE/8 01HrOn5XxVijBaGV9xG3iD2nUR4GzDNRrUykORQQ2NjQJmu1R3oudcDgGYKDZ7z4 T+Tl8h679DFn5PEFS+hRCxw80OUQUok71tMmnkqTyO+khcUjeOUuVEvDJKOfaYPm XjfiBA== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 479m1nv5fr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 16 Jun 2025 10:57:30 +0200 (MEST) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id AA21840058; Mon, 16 Jun 2025 10:56:06 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node2.st.com [10.75.129.70]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 1CD8E5D40BD; Mon, 16 Jun 2025 10:54:43 +0200 (CEST) Received: from localhost (10.252.14.42) by SHFDAG1NODE2.st.com (10.75.129.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 16 Jun 2025 10:54:42 +0200 From: =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= Date: Mon, 16 Jun 2025 10:53:54 +0200 Subject: [PATCH 1/3] i2c: stm32: fix the device used for the DMA map Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250616-i2c-upstream-v1-1-42d3d5374e65@foss.st.com> References: <20250616-i2c-upstream-v1-0-42d3d5374e65@foss.st.com> In-Reply-To: <20250616-i2c-upstream-v1-0-42d3d5374e65@foss.st.com> To: Pierre-Yves MORDRET , Alain Volmat , Andi Shyti , "Maxime Coquelin" , Alexandre Torgue , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , "M'boumba Cedric Madianga" , Wolfram Sang CC: Pierre-Yves MORDRET , , , , , , , , =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= X-Mailer: b4 0.15-dev-c25d1 X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE2.st.com (10.75.129.70) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-16_03,2025-06-13_01,2025-03-28_01 If the DMA mapping failed, it produced an error log with the wrong device name: "stm32-dma3 40400000.dma-controller: rejecting DMA map of vmalloc memory" Fix this issue by replacing the dev with the I2C dev. Fixes: bb8822cbbc53 ("i2c: i2c-stm32: Add generic DMA API") Signed-off-by: Cl=C3=A9ment Le Goffic Acked-by: Alain Volmat --- drivers/i2c/busses/i2c-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-stm32.c b/drivers/i2c/busses/i2c-stm32.c index 157c64e27d0b..5e0b31aed774 100644 --- a/drivers/i2c/busses/i2c-stm32.c +++ b/drivers/i2c/busses/i2c-stm32.c @@ -118,7 +118,7 @@ int stm32_i2c_prep_dma_xfer(struct device *dev, struct = stm32_i2c_dma *dma, dma->dma_len =3D len; chan_dev =3D dma->chan_using->device->dev; =20 - dma->dma_buf =3D dma_map_single(chan_dev, buf, dma->dma_len, + dma->dma_buf =3D dma_map_single(dev, buf, dma->dma_len, dma->dma_data_dir); if (dma_mapping_error(chan_dev, dma->dma_buf)) { dev_err(dev, "DMA mapping failed\n"); --=20 2.43.0 From nobody Sun Dec 14 01:57:44 2025 Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB07A273816; Mon, 16 Jun 2025 08:57:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.207.212.93 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750064280; cv=none; b=MESH7EyUWM1F9HRayDg5hxoAhIHJja3YHWe36+bZkK2KmNKODY1j+1GobBeQoPIpJzTNBq8s3QtesmX5bu64mVNI8xgOx/tn+U36yPjT1CONUW5fuZmt0OQanpbekwgAFdHigNEXWfmsNdgvQeqc5F9vuAmKOrdV4ksRWUOJpj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750064280; c=relaxed/simple; bh=3iPDBl1UWRwdNoibCWrsPz5d47opfcP+0/LzuJJPoTk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=d9W+bF9tiZ8xvSE+z5rKJynqUlN/9piAyviJwAX6GnzuPM8aL6+BpyZrbr281dtqAqA3B8NN3IUjhpbHmdNd5QQBEzBqdfEgFXlg5Hlx/0yq/TQcMHgKBZBA8IjnCfvAY/fcVes6opy41eAy6fp6XibiIVYKKhS9A+Og/Y8V6gA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com; spf=pass smtp.mailfrom=foss.st.com; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b=8WpuCS/C; arc=none smtp.client-ip=91.207.212.93 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=foss.st.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b="8WpuCS/C" Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55G5bVRv010526; Mon, 16 Jun 2025 10:57:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=selector1; bh= j9gCtZXn8FCUpQCQz+XhhMFUE2JWeUNDp3ENgTfCvvI=; b=8WpuCS/Cd0CRXgFF tc4Z5nD2wMCzQa1jwQBrt/ngnDr7lQW0hvxGU8lW+x7DOH4oavFMAq2LON8YiBwv kFx1OgFpFf26d4Ujf4Zj6FMfVQXlfOOtGhytaQL08Ius3hs6rhJpi6IPoxgrAFDt UgEHGMQ8EiTDNEMbFL6/Ss/dw7m5HeAcQgtkQkB6QhAVN220aW5m3kEpncplIFzw f7SYPa62woJbfRWC8EKv3pIu7zJb43+x7/UxKQoPQcDuQbjvWuE+39eseIDgpnSo SPsWHHJoFzytm/YxV1iqWKZwirAef2RmDq6Q6ABhzTI49UV9nVyDY2B/yb+p9rRe 1LxQKw== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 478x79qk3b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 16 Jun 2025 10:57:25 +0200 (MEST) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id EA5DE40073; Mon, 16 Jun 2025 10:56:06 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node2.st.com [10.75.129.70]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 100F95D5B26; Mon, 16 Jun 2025 10:54:44 +0200 (CEST) Received: from localhost (10.252.14.42) by SHFDAG1NODE2.st.com (10.75.129.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 16 Jun 2025 10:54:43 +0200 From: =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= Date: Mon, 16 Jun 2025 10:53:55 +0200 Subject: [PATCH 2/3] i2c: stm32f7: unmap DMA mapped buffer Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250616-i2c-upstream-v1-2-42d3d5374e65@foss.st.com> References: <20250616-i2c-upstream-v1-0-42d3d5374e65@foss.st.com> In-Reply-To: <20250616-i2c-upstream-v1-0-42d3d5374e65@foss.st.com> To: Pierre-Yves MORDRET , Alain Volmat , Andi Shyti , "Maxime Coquelin" , Alexandre Torgue , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , "M'boumba Cedric Madianga" , Wolfram Sang CC: Pierre-Yves MORDRET , , , , , , , , =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= X-Mailer: b4 0.15-dev-c25d1 X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE2.st.com (10.75.129.70) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-16_03,2025-06-13_01,2025-03-28_01 Fix an issue where the mapped DMA buffer was not unmapped. Fixes: 7ecc8cfde553 ("i2c: i2c-stm32f7: Add DMA support") Signed-off-by: Cl=C3=A9ment Le Goffic --- drivers/i2c/busses/i2c-stm32f7.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm3= 2f7.c index 973a3a8c6d4a..a05cac5ee9db 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -1622,6 +1622,8 @@ static irqreturn_t stm32f7_i2c_isr_event_thread(int i= rq, void *data) if (i2c_dev->use_dma) { stm32f7_i2c_disable_dma_req(i2c_dev); dmaengine_terminate_async(dma->chan_using); + dma_unmap_single(i2c_dev->dev, dma->dma_buf, dma->dma_len, + dma->dma_data_dir); } f7_msg->result =3D -ENXIO; } @@ -1642,6 +1644,8 @@ static irqreturn_t stm32f7_i2c_isr_event_thread(int i= rq, void *data) dev_dbg(i2c_dev->dev, "<%s>: Timed out\n", __func__); stm32f7_i2c_disable_dma_req(i2c_dev); dmaengine_terminate_async(dma->chan_using); + dma_unmap_single(i2c_dev->dev, dma->dma_buf, dma->dma_len, + dma->dma_data_dir); f7_msg->result =3D -ETIMEDOUT; } } --=20 2.43.0 From nobody Sun Dec 14 01:57:44 2025 Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB0EB273817; Mon, 16 Jun 2025 08:57:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.207.212.93 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750064281; cv=none; b=DyloVkrAWfsH63xlp8R+d5VNNBf9MS/3l5XETrs4G1SbvGTzuAVP1v6VI88yKOmK2UGqgML6Awbi/H2/HyapEXLw7dpW+tsg40AJ+K/yNqv2WCsbxZN9gljujJgGHUriHqwJzcfOPa+YGKItS/DrQkCUgTZI1efiLuJ5eRgC9X4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750064281; c=relaxed/simple; bh=ynUHX1BrqMOkhzGuHDQWwsxM2S3eEo8ZU459LAH3FHA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=PdIDBZSeMJJ+vuaf0TSBlj0gG1qgKskS0dCLXsBSZVC4BZhJL0y7YBh0Su5hSei4+dVv3G40nKbsL0H/KbajbhNJCXrAuEoIeX2dhKohhziX2tcIIz0DzwgFzTAuqb9tZOQw9mcjVayisz29WjriB2ad8eLM9Yezwd4tTHsOKbk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com; spf=pass smtp.mailfrom=foss.st.com; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b=hBM20cEq; arc=none smtp.client-ip=91.207.212.93 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=foss.st.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b="hBM20cEq" Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55G8NuR8020887; Mon, 16 Jun 2025 10:57:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=selector1; bh= WquxTis/znwfTHWWzXSC1Y3Hxb2pPZAd4b+1AgQhyFg=; b=hBM20cEqlhrTlxG0 L6S6rqEhEZHrrLAjaPefqAoFWLvm3p8G56eapnyb6j14poXUkSMi+AUXKe3tQLzJ nzgECmwiebWkeL18MqoktVNsUg8b/vSD6J9yHR1FjegmiViYnzpZQYVvGt35TV9/ zb+FdASVsOTA9V/G01JykyECrEU+9LOyaZVvoTrNH35UpwRDSgKg5DtGKrGxnHc4 jMm86FA9aeqZU4jDkms3XEEaLF8p7Di5KhzGN6ZybgGtEwFQFPzXpwFfdroVeX2l w60dr+MnF3XRwW4Bh+P6/uL+BLU70P+ZnvujnQdVONBnqQJBIToyuSbR/QKbs8mo rKypDA== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 478x79qk3c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 16 Jun 2025 10:57:25 +0200 (MEST) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 5C19540075; Mon, 16 Jun 2025 10:56:07 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node2.st.com [10.75.129.70]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id F16FD6CB27A; Mon, 16 Jun 2025 10:54:44 +0200 (CEST) Received: from localhost (10.252.14.42) by SHFDAG1NODE2.st.com (10.75.129.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 16 Jun 2025 10:54:44 +0200 From: =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= Date: Mon, 16 Jun 2025 10:53:56 +0200 Subject: [PATCH 3/3] i2c: stm32f7: support i2c_*_dma_safe_msg_buf APIs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250616-i2c-upstream-v1-3-42d3d5374e65@foss.st.com> References: <20250616-i2c-upstream-v1-0-42d3d5374e65@foss.st.com> In-Reply-To: <20250616-i2c-upstream-v1-0-42d3d5374e65@foss.st.com> To: Pierre-Yves MORDRET , Alain Volmat , Andi Shyti , "Maxime Coquelin" , Alexandre Torgue , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , "M'boumba Cedric Madianga" , Wolfram Sang CC: Pierre-Yves MORDRET , , , , , , , , =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= X-Mailer: b4 0.15-dev-c25d1 X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE2.st.com (10.75.129.70) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-16_03,2025-06-13_01,2025-03-28_01 Use the i2c-core-base APIs to allocate a DMA safe buffer when needed. Signed-off-by: Cl=C3=A9ment Le Goffic Acked-by: Alain Volmat --- drivers/i2c/busses/i2c-stm32f7.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm3= 2f7.c index a05cac5ee9db..5be14c8a2af4 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -742,9 +742,12 @@ static void stm32f7_i2c_dma_callback(void *arg) struct stm32f7_i2c_dev *i2c_dev =3D (struct stm32f7_i2c_dev *)arg; struct stm32_i2c_dma *dma =3D i2c_dev->dma; struct device *dev =3D dma->chan_using->device->dev; + struct stm32f7_i2c_msg *f7_msg =3D &i2c_dev->f7_msg; =20 stm32f7_i2c_disable_dma_req(i2c_dev); dma_unmap_single(dev, dma->dma_buf, dma->dma_len, dma->dma_data_dir); + if (!f7_msg->smbus) + i2c_put_dma_safe_msg_buf(f7_msg->buf, i2c_dev->msg, true); complete(&dma->dma_complete); } =20 @@ -880,6 +883,7 @@ static void stm32f7_i2c_xfer_msg(struct stm32f7_i2c_dev= *i2c_dev, { struct stm32f7_i2c_msg *f7_msg =3D &i2c_dev->f7_msg; void __iomem *base =3D i2c_dev->base; + u8 *dma_buf; u32 cr1, cr2; int ret; =20 @@ -929,17 +933,23 @@ static void stm32f7_i2c_xfer_msg(struct stm32f7_i2c_d= ev *i2c_dev, =20 /* Configure DMA or enable RX/TX interrupt */ i2c_dev->use_dma =3D false; - if (i2c_dev->dma && f7_msg->count >=3D STM32F7_I2C_DMA_LEN_MIN - && !i2c_dev->atomic) { - ret =3D stm32_i2c_prep_dma_xfer(i2c_dev->dev, i2c_dev->dma, - msg->flags & I2C_M_RD, - f7_msg->count, f7_msg->buf, - stm32f7_i2c_dma_callback, - i2c_dev); - if (!ret) - i2c_dev->use_dma =3D true; - else - dev_warn(i2c_dev->dev, "can't use DMA\n"); + if (i2c_dev->dma && !i2c_dev->atomic) { + dma_buf =3D i2c_get_dma_safe_msg_buf(msg, STM32F7_I2C_DMA_LEN_MIN); + if (dma_buf) { + f7_msg->buf =3D dma_buf; + ret =3D stm32_i2c_prep_dma_xfer(i2c_dev->dev, i2c_dev->dma, + msg->flags & I2C_M_RD, + f7_msg->count, f7_msg->buf, + stm32f7_i2c_dma_callback, + i2c_dev); + if (ret) { + dev_warn(i2c_dev->dev, "can't use DMA\n"); + i2c_put_dma_safe_msg_buf(f7_msg->buf, msg, false); + f7_msg->buf =3D msg->buf; + } else { + i2c_dev->use_dma =3D true; + } + } } =20 if (!i2c_dev->use_dma) { @@ -1624,6 +1634,8 @@ static irqreturn_t stm32f7_i2c_isr_event_thread(int i= rq, void *data) dmaengine_terminate_async(dma->chan_using); dma_unmap_single(i2c_dev->dev, dma->dma_buf, dma->dma_len, dma->dma_data_dir); + if (!f7_msg->smbus) + i2c_put_dma_safe_msg_buf(f7_msg->buf, i2c_dev->msg, false); } f7_msg->result =3D -ENXIO; } @@ -1646,6 +1658,8 @@ static irqreturn_t stm32f7_i2c_isr_event_thread(int i= rq, void *data) dmaengine_terminate_async(dma->chan_using); dma_unmap_single(i2c_dev->dev, dma->dma_buf, dma->dma_len, dma->dma_data_dir); + if (!f7_msg->smbus) + i2c_put_dma_safe_msg_buf(f7_msg->buf, i2c_dev->msg, false); f7_msg->result =3D -ETIMEDOUT; } } --=20 2.43.0