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=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 BAE7FC433EF for ; Thu, 23 Sep 2021 08:40:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 874B96103C for ; Thu, 23 Sep 2021 08:40:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 874B96103C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=foss.st.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=MrP9rrOAEzFu6Eucd4O43Qs8hSoqYaMzavStAY2MAp0=; b=dI+e3HyjJ7Kej/pXQgaxPFKuVL AB1IUTG6L0AQDh9uc+cXOyURIli0BPotG9tlwGEXzpUXsCxk9NvCz3HXXKBl9YsfFBsd1K5CnM0Zi YLUpbLYqNQdMEIBx7o3lM14MjMAxTiu+FbhMiYnUod6+nbUeHGKtoFJz+ljbOlie4fU7iEEITwOqs Wd0JIJpf+nhIZiHbMnSRdNWPiyuQsSMGlAN3lbly0pjtPOHhieKEzQbOzcsdW2m4pfM4nDHTElhiW 8ZmBxh78nnGYo8TEg772EQgi4zHsxxjZp2qwwsDiZFyXylFU3JlJWgXkC3YfSqxcV9iADbvCA07KH dTkZvhxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTKEu-00AecU-Pm; Thu, 23 Sep 2021 08:37:56 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTKEq-00AebQ-Bd for linux-arm-kernel@lists.infradead.org; Thu, 23 Sep 2021 08:37:54 +0000 Received: from pps.filterd (m0241204.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18N730CH022195; Thu, 23 Sep 2021 10:37:48 +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=TLQuNxzXQJo8WyYaZHT4cvzN8bWtsCyHzawgU+TB/6o=; b=l2+YDvp7PCb+Rgpxwq3IWE/mY2fYCxZdGjslyFiWJcc6282uiagBydPtHWKRAJtvQ7FZ ObYS7BmWaHPpkVVblxhhe3ogQxlsyAb2xWyspYWpWzI/ECnJMcD5N68DvmIyCiHCLHSQ Fq2E9naQuJjZfZeWrFLCCNSzpb9DF5PMLN50Nck8aNQ0EOm0rbZbTa8uEW0qw6Kqll5s LyCt9MeoRY3JpE0Bh012oesPpQ8mpUUWi9h7XFCistKbyCNWUFSXKEUGyvgfToYkWKGQ WCrs1ZGCQEhNquR5iIqCN4WwmQkoHPc4plxZs8sMA7JGtlb0H0v1bU3Unon2zz0mzJf4 Vw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 3b8mur8p97-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Sep 2021 10:37:48 +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 7293810002A; Thu, 23 Sep 2021 10:37:47 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 697022248BE; Thu, 23 Sep 2021 10:37:47 +0200 (CEST) Received: from lmecxl1060.lme.st.com (10.75.127.51) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 23 Sep 2021 10:37:46 +0200 Subject: Re: [PATCH 3/4] i2c: stm32f7: stop dma transfer in case of NACK To: Alain Volmat , CC: , , , , , , References: <1632151292-18503-1-git-send-email-alain.volmat@foss.st.com> <1632151292-18503-4-git-send-email-alain.volmat@foss.st.com> From: Pierre Yves MORDRET Message-ID: Date: Thu, 23 Sep 2021 10:37:45 +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-4-git-send-email-alain.volmat@foss.st.com> Content-Language: en-US X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG2NODE1.st.com (10.75.127.4) 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210923_013752_762167_65595211 X-CRM114-Status: GOOD ( 24.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Alain Look good to me Reviewed-by: Pierre-Yves MORDRET Regards On 9/20/21 5:21 PM, Alain Volmat wrote: > In case of receiving a NACK, the dma transfer should be stopped > to avoid feeding data into the FIFO. > Also ensure to properly return the proper error code and avoid > waiting for the end of the dma completion in case of > error happening during the transmission. > > Fixes: 7ecc8cfde553 ("i2c: i2c-stm32f7: Add DMA support") > > Signed-off-by: Alain Volmat > --- > drivers/i2c/busses/i2c-stm32f7.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c > index ad3459a3bc5e..50d5ae81d227 100644 > --- a/drivers/i2c/busses/i2c-stm32f7.c > +++ b/drivers/i2c/busses/i2c-stm32f7.c > @@ -1493,6 +1493,7 @@ static irqreturn_t stm32f7_i2c_isr_event(int irq, void *data) > { > struct stm32f7_i2c_dev *i2c_dev = data; > struct stm32f7_i2c_msg *f7_msg = &i2c_dev->f7_msg; > + struct stm32_i2c_dma *dma = i2c_dev->dma; > void __iomem *base = i2c_dev->base; > u32 status, mask; > int ret = IRQ_HANDLED; > @@ -1518,6 +1519,10 @@ static irqreturn_t stm32f7_i2c_isr_event(int irq, void *data) > dev_dbg(i2c_dev->dev, "<%s>: Receive NACK (addr %x)\n", > __func__, f7_msg->addr); > 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); > + } > f7_msg->result = -ENXIO; > } > > @@ -1533,7 +1538,7 @@ static irqreturn_t stm32f7_i2c_isr_event(int irq, void *data) > /* Clear STOP flag */ > writel_relaxed(STM32F7_I2C_ICR_STOPCF, base + STM32F7_I2C_ICR); > > - if (i2c_dev->use_dma) { > + if (i2c_dev->use_dma && !f7_msg->result) { > ret = IRQ_WAKE_THREAD; > } else { > i2c_dev->master_mode = false; > @@ -1546,7 +1551,7 @@ static irqreturn_t stm32f7_i2c_isr_event(int irq, void *data) > if (f7_msg->stop) { > mask = STM32F7_I2C_CR2_STOP; > stm32f7_i2c_set_bits(base + STM32F7_I2C_CR2, mask); > - } else if (i2c_dev->use_dma) { > + } else if (i2c_dev->use_dma && !f7_msg->result) { > ret = IRQ_WAKE_THREAD; > } else if (f7_msg->smbus) { > stm32f7_i2c_smbus_rep_start(i2c_dev); > -- -- ~ Py MORDRET -- _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel