From nobody Sun Feb 8 18:55:22 2026 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 BD36328937C; Mon, 30 Jun 2025 12:58:13 +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=1751288295; cv=none; b=t1UB7WXh2wmfp9L9G0L7nOc9G5pvom7zttYn/w760/WbnI8BkMBwvEOufnyDhzJO+QBfgxpyxPQDGHqSv8zia85XtOMMUbrvUpryt3kaKwT06/85nqEaVBxwdYwCh1O898O5dJfMuA+XGsHSHmpZGyAtyYpYqykIY0ThMYXebPY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288295; c=relaxed/simple; bh=Nh/c3hjKu78CEgayyoBcA7xuQFdMtmHRxzXy3TmSi6w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=aPAohiEVXgeP7u0HZOfRERBkPoVKcpTIJDC2LgkXzoKxSwf6Lx+HZNpJnpVaYzKX3beG8hjk5sSmfEK7CB3DHWR1t6QzV4NEbM5ltvC8uycnZSVYYPOH4t/lUwi3vxCE3viTtjYWDnv+m2AT2/rS7bWTPjG3NKdPm3Xp5/ojez4= 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=6rP0z/AF; 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="6rP0z/AF" Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55UC3k8G032278; Mon, 30 Jun 2025 14:57:51 +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= AUY/W3uZYvpU9kGJPaiqG3BU1z09PZZD5SKs655sSYg=; b=6rP0z/AFo2Uy98Hb ct5F0DM7shcvTIRL0tF56qwheeEOs9jA6azlP9BvKg7k/2jKplRnYnd/qITfQTjD AiScKPOACgl/ldlLBz6QlGEXbECIu0KOh4vo5QVcBCoZGB1jtA0w46HED5mW11k1 jNvgN7Kzp6nl29e9Twh+V5J0/QEIiWh+xL4NPALTRM9buC4E0axSw7AHnVSuZo/U Ud8MlidfxQVkdkhHSYkAgjPBkus5qGogCrIISCgHeiSCDRmQb9iUTM9GL6HL/zv6 VkSmyzuDxXyidFbp+51mQa2Uf/ZRiaCSZPppNRStWsVHbsvi5FJ1W7F0YxhSdHJK PzIwHQ== 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 47j79h7b9h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 30 Jun 2025 14:57:51 +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 9481440050; Mon, 30 Jun 2025 14:56:27 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node2.st.com [10.75.129.70]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 700E3B4290D; Mon, 30 Jun 2025 14:55:24 +0200 (CEST) Received: from localhost (10.252.20.7) 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, 30 Jun 2025 14:55:24 +0200 From: =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= Date: Mon, 30 Jun 2025 14:55:13 +0200 Subject: [PATCH v3 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: <20250630-i2c-upstream-v3-1-7a23ab26683a@foss.st.com> References: <20250630-i2c-upstream-v3-0-7a23ab26683a@foss.st.com> In-Reply-To: <20250630-i2c-upstream-v3-0-7a23ab26683a@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.1.7,FMLib:17.12.80.40 definitions=2025-06-30_03,2025-06-27_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") Acked-by: Alain Volmat Signed-off-by: Cl=C3=A9ment Le Goffic Reviewed-by : Pierre-Yves MORDRET --- drivers/i2c/busses/i2c-stm32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-stm32.c b/drivers/i2c/busses/i2c-stm32.c index 157c64e27d0b..272a5dffb08f 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"); @@ -150,7 +150,7 @@ int stm32_i2c_prep_dma_xfer(struct device *dev, struct = stm32_i2c_dma *dma, return 0; =20 err: - dma_unmap_single(chan_dev, dma->dma_buf, dma->dma_len, + dma_unmap_single(dev, dma->dma_buf, dma->dma_len, dma->dma_data_dir); return ret; } --=20 2.43.0 From nobody Sun Feb 8 18:55:22 2026 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 012E22868B4; Mon, 30 Jun 2025 12:58:13 +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=1751288298; cv=none; b=BqmJMqZRjbY6p3HckJQZonGKXd/cMQzgZ6SU6fMHuMks21u9vd47v5ud/Uscu+9M5Do2Jh0AxYFLDZ6kbndFesNLePI4cfs/mQ4KeNhHypj8hDrHjzMLbq9Q4N/4Vif6gWSbC1BZzv4i15X7vbOo1h79L9k3hV92vOf6QKPgfOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288298; c=relaxed/simple; bh=3CRG5cL6WglhSwCH6DI4xdQaiWDa64Jtm8Xm4UcLtaw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=tTnRQp9nXSuOh72EaePgacsGnzIFxSNEACbXssukSvmWKsqZ96lr3GmxslfX+DBmsAXxITsDKzCeJA3cfiLlmyFF3YwCVPbWWMnN+HFFHJYM1WbsAMPnq20gTzCQTa6gCAYrwv8TD29jZOaKJcOszfGYpHazBe5oDQY96jFnIYY= 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=4JnjG6lf; 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="4JnjG6lf" Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55U8mfZl011728; Mon, 30 Jun 2025 14:57:55 +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= OM4qEJBb0Q3JHjpYV6uTT5JxCF8eDkNfwEjYMoecZg8=; b=4JnjG6lf/RxF5fA6 QisoqspaK74+Z9UkDQlz8Lg2md3foRIsHNUFAYpmpnP7YzTRiVUtthx20xEuKNZW PeIJglIDwj+hIwd5cHmOUqAHeyGB0KjixT0iyFKeZ/3Y3l+GGZxuHdUYFtwTl+Il bDQhBvgBKrZD0CDWCwQscW0vFELd/rZf+JEUwfoREa9ffIx/WSYCY5sDLIXgNJrL rjQwFUHuvwohgLVDSrOq0S3CGG/9h7zdeOFSj7sbUVHdpM3nCfT3QG3l0ub1ObAF 9Weq77j5VaW0EteajI1TfSQzhFeCXjbr6jYI/tKkElcxjiM9Mm5zEYYlUE7Y4N39 o6x6cQ== 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 47j79h7b9v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 30 Jun 2025 14:57:55 +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 172BB4004F; Mon, 30 Jun 2025 14:56:27 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node2.st.com [10.75.129.70]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 65C64B42910; Mon, 30 Jun 2025 14:55:25 +0200 (CEST) Received: from localhost (10.252.20.7) 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, 30 Jun 2025 14:55:25 +0200 From: =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= Date: Mon, 30 Jun 2025 14:55:14 +0200 Subject: [PATCH v3 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: <20250630-i2c-upstream-v3-2-7a23ab26683a@foss.st.com> References: <20250630-i2c-upstream-v3-0-7a23ab26683a@foss.st.com> In-Reply-To: <20250630-i2c-upstream-v3-0-7a23ab26683a@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.1.7,FMLib:17.12.80.40 definitions=2025-06-30_03,2025-06-27_01,2025-03-28_01 Fix an issue where the mapped DMA buffer was not unmapped. Fixes: 7ecc8cfde553 ("i2c: i2c-stm32f7: Add DMA support") Acked-by: Alain Volmat Signed-off-by: Cl=C3=A9ment Le Goffic Reviewed-by: Pierre-Yves MORDRET --- drivers/i2c/busses/i2c-stm32f7.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm3= 2f7.c index e4aaeb2262d0..042386b4cabe 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -1554,6 +1554,8 @@ static irqreturn_t stm32f7_i2c_handle_isr_errs(struct= stm32f7_i2c_dev *i2c_dev, 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); } =20 i2c_dev->master_mode =3D false; @@ -1622,6 +1624,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 +1646,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 Feb 8 18:55:22 2026 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 BD3D8289814; Mon, 30 Jun 2025 12:58:13 +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=1751288295; cv=none; b=XfqUCKKp3Xn1VKxuOYOOqgHyHSQUrXKBZ8qZFPtKWBbD5xJNe/GIYSqQCBmWkeID1aYuIvZEfaT4MKX1hzmfzl1knkQ7xvSb7tHuo3gy+5FND3m9IjvQ0HFJUW4Jx6Zsl9Ni8HieO8Vo6wszcuNpPaGE0W6DE2hrThtA4FqnOI8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288295; c=relaxed/simple; bh=2vajiVHjVJ5ffKfGqgBj6UtWWFnXOtI5JNPjqVY8yc4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=bKxHyu+lKl9xtxLGYQH6j/YIx8nZjxOWp9597mFmZpEcq5Y8kQKLJr0MZhYZ8WaXTiq7JdHACw9dQlCS95muQ9unZFaY9KiceG/Jbkd3O/UR4wqhKUkQNUOsPqq65f562aiMqPoQD/xvUI6HSInbfD1gSZPN3H4Du/zzxIeED2Y= 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=G62k8V8R; 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="G62k8V8R" 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 55UBxpaI008960; Mon, 30 Jun 2025 14:57:54 +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= yOw3lCVampqxfyk9oAF3ADllyOFT8WJA9FdDVtqo38s=; b=G62k8V8RY1FfrItE Tvl+AoL9C4pMU7Gy4+slJ3TZTandK1RZ2+SJQk0Ted4pMT+nniEahXVOcHdy3KIz imMPAF4Rxi8yIA3l7nwxq7belA6VB0ADr5ZesovNNw3GSKzTTQ65L8gX7FcQ5d27 vLTqB0PZrZK5XJ4ll4D5PABYQ7fPKhxGkDYfJiviCczscSG16q3QzZhQds8kjzaO VG6wHqsgD3pnDGKlWpaHtuAqu0HLaq20RdoSwfG5DNPZw62YWhWMo/rdrFeuOn3h NrCmCqiKo/RfHdrRN73mpfXSJTdihxFmizHN5cw8sKu7tzUEHN6MTEESmgtcFh2+ 5F0/RA== 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 47j5h8qk4k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 30 Jun 2025 14:57:53 +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 9518940051; Mon, 30 Jun 2025 14:56:31 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node2.st.com [10.75.129.70]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 5D835B42C3E; Mon, 30 Jun 2025 14:55:26 +0200 (CEST) Received: from localhost (10.252.20.7) 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, 30 Jun 2025 14:55:25 +0200 From: =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= Date: Mon, 30 Jun 2025 14:55:15 +0200 Subject: [PATCH v3 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: <20250630-i2c-upstream-v3-3-7a23ab26683a@foss.st.com> References: <20250630-i2c-upstream-v3-0-7a23ab26683a@foss.st.com> In-Reply-To: <20250630-i2c-upstream-v3-0-7a23ab26683a@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.1.7,FMLib:17.12.80.40 definitions=2025-06-30_03,2025-06-27_01,2025-03-28_01 Use the i2c-core-base APIs to allocate a DMA safe buffer when needed. Acked-by: Alain Volmat Signed-off-by: Cl=C3=A9ment Le Goffic Reviewed-by: Pierre-Yves MORDRET --- 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 042386b4cabe..d06f0efdece3 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) { @@ -1626,6 +1636,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; } @@ -1648,6 +1660,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