Received: by 10.223.185.116 with SMTP id b49csp1010441wrg; Fri, 16 Feb 2018 10:45:49 -0800 (PST) X-Google-Smtp-Source: AH8x227iXA8RRoNgc5ligf6NN7xQ53cAGbeo5GOcXl5/jbXOrJdMYjx+QRXhnRxbNrSuBmkKDT3G X-Received: by 10.99.124.91 with SMTP id l27mr5761873pgn.298.1518806749053; Fri, 16 Feb 2018 10:45:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518806749; cv=none; d=google.com; s=arc-20160816; b=SA7VbhS8EFsekU1BECOyLAgXavqmu4GqUZAFO8uz/qgO/KLYlc4u13S2upDJfPFBW/ N/QkE2vpEa4mdFJo4B5luSeR2Qo5+/PexavGg++E63hjapRDDixZzQ4jsfGF45DQwlN+ 5bD3M53d55qzfms9ZGObnL4X4OqYFLW4+lasSnjAkqJ6DmfSvwylNm5cWdTIScMyM6dU HsMjrj4BkTT9AE/HIxiK/G2QIw57FHTs56p3b1x737qgNCQS2nE0EJUVBzcjzsudh/CT c2BsWZfxzS9EBBqo1FI2bsr0hhJT70NgHHPaeeomDQjmtNF7tuusa/kOi92HUgEOl9em IJDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dmarc-filter :dkim-signature:dkim-signature:arc-authentication-results; bh=qCjcFODlBa60VOe+bppgQEb3NI13/o+d1j23z/I5yss=; b=V9EaAc1up8NOA+eHG1OUdQs3jIQkCKmgrznD8SmHOP5eGWAZldQYmjWv16fRg183W3 0p7ZHeSYkYnkJMWM/g1pDwT5o4Cxv4zpLVYV6gaM/blm3RtkfuDrwp7pmRHUvi2QS7aK Q6gT7P6AaDVkLihnOeYLdZ5yiiCdDzIHvDWTI81G0YzKVzX7sd80rXaxUFjn0JXlccyA 7vOOxVUlmjiAPHSK/As5VeQq8JAU1jOWBlBw3vfkWDIeqwyJnPg4Zft8JU/dL0q56SRY gHnTIA7vc8SNrXbv+2fYOFmv++p1aquHpOJxS2SDbo3oZFu1D1PC4lQj8/WmAqyO8AXo vh8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=PyFsoiNI; dkim=pass header.i=@codeaurora.org header.s=default header.b=AcdPzsrY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m185si345430pfc.278.2018.02.16.10.45.34; Fri, 16 Feb 2018 10:45:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=PyFsoiNI; dkim=pass header.i=@codeaurora.org header.s=default header.b=AcdPzsrY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752162AbeBPEdT (ORCPT + 99 others); Thu, 15 Feb 2018 23:33:19 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:43080 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751515AbeBPEdR (ORCPT ); Thu, 15 Feb 2018 23:33:17 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B13A860F6C; Fri, 16 Feb 2018 04:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1518755596; bh=PTTES4RCZIEgGS9amP/uhiz0joLi8LLFB5lkI39OJJg=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=PyFsoiNIrX/VY5nzEwN3koC0oDDN/kS3yu2WICRstJREcS5KUFTQQbZaEZGd3AHnQ ZEh3MJULia+zL2LxYYYkR99dryzr2M38dNCpqNZdtKbpBE5tsBFbRDAQK/bg07ONk5 uG506uncVLF7soiymkpxlhz6C7gHOCDPjYQSD05A= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from [10.201.3.39] (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sricharan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 877CC60558; Fri, 16 Feb 2018 04:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1518755595; bh=PTTES4RCZIEgGS9amP/uhiz0joLi8LLFB5lkI39OJJg=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=AcdPzsrYFSoQr18LyXSU5zetzkSJbAzqkf0JhFPf6FHqjB2Yj6RxZCKAVFm68Zy7Z MUcLGks7KB7JqXVN55mrdh9lNxiTStGgdNIhY+wSlbd076pzOjoUNYrDeFfCG9IqX4 3fDQFshVuEEP1X2zQ6tf29l84CIE6KsFY5uQlX8k= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 877CC60558 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sricharan@codeaurora.org Subject: Re: [PATCH 06/12] i2c: qup: proper error handling for i2c error in BAM mode To: Abhishek Sahu , Andy Gross , Wolfram Sang Cc: David Brown , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org References: <1517644697-30806-1-git-send-email-absahu@codeaurora.org> <1517644697-30806-7-git-send-email-absahu@codeaurora.org> From: Sricharan R Message-ID: <067d1b54-76a8-06ba-b7b7-e496d8f1e7db@codeaurora.org> Date: Fri, 16 Feb 2018 10:03:11 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1517644697-30806-7-git-send-email-absahu@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/3/2018 1:28 PM, Abhishek Sahu wrote: > Currently the i2c error handling in BAM mode is not working > properly in stress condition. > > 1. After an error, the FIFO are being written with FLUSH and > EOT tags which should not be required since already these tags > have been written in BAM descriptor itself. > > 2. QUP state is being moved to RESET in IRQ handler in case > of error. When QUP HW encounters an error in BAM mode then it > moves the QUP STATE to PAUSE state. In this case, I2C_FLUSH > command needs to be executed while moving to RUN_STATE by writing > to the QUP_STATE register with the I2C_FLUSH bit set to 1. > > 3. In Error case, sometimes, QUP generates more than one > interrupt which will trigger the complete again. After an error, > the flush operation will be scheduled after doing > reinit_completion which should be triggered by BAM IRQ callback. > If the second QUP IRQ comes during this time then it will call > the complete and the transfer function will assume the all the > BAM HW descriptors have been completed. > > 4. The release DMA is being called after each error which > will free the DMA tx and rx channels. The error like NACK is very > common in I2C transfer and every time this will be overhead. Now, > since the error handling is proper so this release channel can be > completely avoided. > > Signed-off-by: Abhishek Sahu > --- > drivers/i2c/busses/i2c-qup.c | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c > index 094be6a..6227a5c 100644 > --- a/drivers/i2c/busses/i2c-qup.c > +++ b/drivers/i2c/busses/i2c-qup.c > @@ -228,9 +228,24 @@ static irqreturn_t qup_i2c_interrupt(int irq, void *dev) > if (bus_err) > writel(bus_err, qup->base + QUP_I2C_STATUS); > > + /* > + * Check for BAM mode and returns if already error has come for current > + * transfer. In Error case, sometimes, QUP generates more than one > + * interrupt. > + */ > + if (qup->use_dma && (qup->qup_err || qup->bus_err)) > + return IRQ_HANDLED; > + > /* Reset the QUP State in case of error */ > if (qup_err || bus_err) { > - writel(QUP_RESET_STATE, qup->base + QUP_STATE); > + /* > + * Don’t reset the QUP state in case of BAM mode. The BAM > + * flush operation needs to be scheduled in transfer function > + * which will clear the remaining schedule descriptors in BAM > + * HW FIFO and generates the BAM interrupt. > + */ > + if (!qup->use_dma) > + writel(QUP_RESET_STATE, qup->base + QUP_STATE); > goto done; > } > > @@ -841,20 +856,12 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg, > goto desc_err; > } > > - if (rx_buf) > - writel(QUP_BAM_INPUT_EOT, > - qup->base + QUP_OUT_FIFO_BASE); > - > - writel(QUP_BAM_FLUSH_STOP, qup->base + QUP_OUT_FIFO_BASE); > - > qup_i2c_flush(qup); > > /* wait for remaining interrupts to occur */ > if (!wait_for_completion_timeout(&qup->xfer, HZ)) > dev_err(qup->dev, "flush timed out\n"); > > - qup_i2c_rel_dma(qup); > - > ret = (qup->bus_err & QUP_I2C_NACK_FLAG) ? -ENXIO : -EIO; > } > > Reviewed-by: Sricharan R Regards, Sricharan -- "QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation