From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36E87C433EF for ; Thu, 23 Sep 2021 08:38:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20E8061090 for ; Thu, 23 Sep 2021 08:38:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240009AbhIWIjv (ORCPT ); Thu, 23 Sep 2021 04:39:51 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:48150 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S239825AbhIWIjt (ORCPT ); Thu, 23 Sep 2021 04:39:49 -0400 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18N2qx2N000635; Thu, 23 Sep 2021 10:38:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=jZB2v7cRtiNx2ClUgCrZhsw4GjZEOLW21gZOD4Egx74=; b=g4kDDX76uJWvBkxeIxrMOu4ZAS3aMX0w3N9V/bcTwqvfI6B5Bon6LfpxeZx7kcsw81n+ LW7zqqMngAAReuXoJ9QlF1JcSB0L+CUMPsJRHCTxUNIyHxgJowRhMK5Ya1gKc/iiiBAE 2FJ988R6cCnl1es9Mx2v0a67bcrt/hCxl5TDIM2kV1R+tmYLHAD3wgxVsDa+1NJ8n42r QCBXLZ0LIEu1u/azEttDsbYon8NeE6B07o+q+a/rydqxtwHecO3WBKpqcLrih2r3guEX Zxr5uEvk+5NzBFeZ6ljao2MnPcncYXRqdgxXJ+3QLqGoMAI4p++JqUp5f3Jm9+NgZmZv bQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 3b8h6f9u94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Sep 2021 10:38:12 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 59ED910002A; Thu, 23 Sep 2021 10:38:11 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 50F6C2248BF; Thu, 23 Sep 2021 10:38:11 +0200 (CEST) Received: from lmecxl1060.lme.st.com (10.75.127.48) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 23 Sep 2021 10:38:09 +0200 Subject: Re: [PATCH 4/4] i2c: stm32f7: use proper DMAENGINE API for termination To: Alain Volmat , CC: , , , , , , References: <1632151292-18503-1-git-send-email-alain.volmat@foss.st.com> <1632151292-18503-5-git-send-email-alain.volmat@foss.st.com> From: Pierre Yves MORDRET Message-ID: <1b717a3f-8e2f-2e78-4509-63b04648659b@foss.st.com> Date: Thu, 23 Sep 2021 10:38:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <1632151292-18503-5-git-send-email-alain.volmat@foss.st.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG1NODE2.st.com (10.75.127.2) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-23_02,2021-09-22_01,2020-04-07_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Alain Look good to me Reviewed-by: Pierre-Yves MORDRET Regards On 9/20/21 5:21 PM, Alain Volmat wrote: > dmaengine_terminate_all() is deprecated in favor of explicitly saying if > it should be sync or async. Here, we use dmaengine_terminate_sync in > i2c_xfer and i2c_smbus_xfer handlers and rely on > dmaengine_terminate_async within interrupt handlers > (transmission error cases). > dmaengine_synchronize is added within i2c_xfer and i2c_smbus_xfer handler > to finalize terminate started in interrupt handlers. > > Signed-off-by: Alain Volmat > --- > drivers/i2c/busses/i2c-stm32f7.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c > index 50d5ae81d227..66145d2b9b55 100644 > --- a/drivers/i2c/busses/i2c-stm32f7.c > +++ b/drivers/i2c/busses/i2c-stm32f7.c > @@ -1521,7 +1521,7 @@ static irqreturn_t stm32f7_i2c_isr_event(int irq, void *data) > writel_relaxed(STM32F7_I2C_ICR_NACKCF, base + STM32F7_I2C_ICR); > if (i2c_dev->use_dma) { > stm32f7_i2c_disable_dma_req(i2c_dev); > - dmaengine_terminate_all(dma->chan_using); > + dmaengine_terminate_async(dma->chan_using); > } > f7_msg->result = -ENXIO; > } > @@ -1588,7 +1588,7 @@ static irqreturn_t stm32f7_i2c_isr_event_thread(int irq, void *data) > if (!ret) { > dev_dbg(i2c_dev->dev, "<%s>: Timed out\n", __func__); > stm32f7_i2c_disable_dma_req(i2c_dev); > - dmaengine_terminate_all(dma->chan_using); > + dmaengine_terminate_async(dma->chan_using); > f7_msg->result = -ETIMEDOUT; > } > > @@ -1665,7 +1665,7 @@ static irqreturn_t stm32f7_i2c_isr_error(int irq, void *data) > /* Disable dma */ > if (i2c_dev->use_dma) { > stm32f7_i2c_disable_dma_req(i2c_dev); > - dmaengine_terminate_all(dma->chan_using); > + dmaengine_terminate_async(dma->chan_using); > } > > i2c_dev->master_mode = false; > @@ -1702,6 +1702,9 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap, > i2c_dev->adap.timeout); > ret = f7_msg->result; > if (ret) { > + if (i2c_dev->use_dma) > + dmaengine_synchronize(dma->chan_using); > + > /* > * It is possible that some unsent data have already been > * written into TXDR. To avoid sending old data in a > @@ -1716,7 +1719,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap, > dev_dbg(i2c_dev->dev, "Access to slave 0x%x timed out\n", > i2c_dev->msg->addr); > if (i2c_dev->use_dma) > - dmaengine_terminate_all(dma->chan_using); > + dmaengine_terminate_sync(dma->chan_using); > stm32f7_i2c_wait_free_bus(i2c_dev); > ret = -ETIMEDOUT; > } > @@ -1761,6 +1764,9 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, > i2c_dev->adap.timeout); > ret = f7_msg->result; > if (ret) { > + if (i2c_dev->use_dma) > + dmaengine_synchronize(dma->chan_using); > + > /* > * It is possible that some unsent data have already been > * written into TXDR. To avoid sending old data in a > @@ -1774,7 +1780,7 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, > if (!timeout) { > dev_dbg(dev, "Access to slave 0x%x timed out\n", f7_msg->addr); > if (i2c_dev->use_dma) > - dmaengine_terminate_all(dma->chan_using); > + dmaengine_terminate_sync(dma->chan_using); > stm32f7_i2c_wait_free_bus(i2c_dev); > ret = -ETIMEDOUT; > goto pm_free; > -- -- ~ Py MORDRET --