From patchwork Fri Oct 2 15:23:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 11813827 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D8239112E for ; Fri, 2 Oct 2020 15:26:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 AA910206DC for ; Fri, 2 Oct 2020 15:26:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VfDE+vth" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA910206DC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arri.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bsJ6gWsEqEBUNOQ4ZlcnTkTGXTDuN3TEUg+JkwYBfnA=; b=VfDE+vth/o/ErmCXBduT9WGHv 1t1SLzGEi3BlNOuqrYUNkVFSO4mN1bcZMD8IZ6U57jIU+YSHhWEB8iiFeYFYaoZmBrfGBlVTjRy8n hH8g0wJQRSOpyMAqddS2IjlkZpJSseIYcqOW5IZl9EFNCDK8fnqJ0EUsRhGQzLbP0/FfDulEIhIaF OxeP+faCg3sngHUElkYNckoTpGPOcTtiXbcwWOxRqFSNlbB453WSUvfHGygKDy/XaQIS9lFKksWhy zDZq1iC+iHbng40GSPAaIj0vKz5lEpoXG9Ccd9j5VnGgEiOL3WFFxXJEXAoSMK8QPLD0vAF95T90S 1Y+8jJR1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOMwt-0002ku-Do; Fri, 02 Oct 2020 15:26:19 +0000 Received: from mailout04.rmx.de ([94.199.90.94]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOMwq-0002jk-6A for linux-arm-kernel@lists.infradead.org; Fri, 02 Oct 2020 15:26:17 +0000 Received: from kdin02.retarus.com (kdin02.dmz1.retloc [172.19.17.49]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout04.rmx.de (Postfix) with ESMTPS id 4C2v380fkFz3qxK9; Fri, 2 Oct 2020 17:26:12 +0200 (CEST) Received: from mta.arri.de (unknown [217.111.95.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by kdin02.retarus.com (Postfix) with ESMTPS id 4C2v2K2Psbz2TSGr; Fri, 2 Oct 2020 17:25:29 +0200 (CEST) Received: from N95HX1G2.wgnetz.xx (192.168.54.33) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 2 Oct 2020 17:25:02 +0200 From: Christian Eggers To: Oleksij Rempel , Shawn Guo , Sascha Hauer , Fabio Estevam , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Subject: [PATCH v2 2/3] i2c: imx: Check for I2SR_IAL after every byte Date: Fri, 2 Oct 2020 17:23:04 +0200 Message-ID: <20201002152305.4963-3-ceggers@arri.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002152305.4963-1-ceggers@arri.de> References: <20201002152305.4963-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.33] X-RMX-ID: 20201002-172529-4C2v2K2Psbz2TSGr-0@kdin02 X-RMX-SOURCE: 217.111.95.66 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_112616_337161_551BDA36 X-CRM114-Status: GOOD ( 15.82 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [94.199.90.94 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [94.199.90.94 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , Christian Eggers , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Arbitration Lost (IAL) can happen after every single byte transfer. If arbitration is lost, the I2C hardware will autonomously switch from master mode to slave. If a transfer is not aborted in this state, consecutive transfers will not be executed by the hardware and will timeout. Signed-off-by: Christian Eggers Cc: stable@vger.kernel.org Tested-by: Krzysztof Kozlowski --- drivers/i2c/busses/i2c-imx.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 34648df7f1a6..1db1e2f5296e 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -483,6 +483,24 @@ static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx, bool atomic) dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); return -ETIMEDOUT; } + + /* check for arbitration lost */ + if (i2c_imx->i2csr & I2SR_IAL) { + unsigned int temp; + + dev_dbg(&i2c_imx->adapter.dev, "<%s> Arbitration lost\n", __func__); + /* + * i2sr_clr_opcode is the value to clear all interrupts. + * Here we want to clear only I2SR_IAL, so we write + * ~i2sr_clr_opcode with just the I2SR_IAL bit toggled. + */ + temp = ~i2c_imx->hwdata->i2sr_clr_opcode ^ I2SR_IAL; + imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR); + + i2c_imx->i2csr = 0; + return -EAGAIN; + } + dev_dbg(&i2c_imx->adapter.dev, "<%s> TRX complete\n", __func__); i2c_imx->i2csr = 0; return 0;