From patchwork Tue Jun 14 10:13:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Codrin Ciubotariu X-Patchwork-Id: 12880887 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 23DF5C433EF for ; Tue, 14 Jun 2022 10:15:47 +0000 (UTC) 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: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=n8/x4vOktR45gJtS4mzNEHvZkpS2vRqCSOBnl5RhbU0=; b=I3AnBXzncw31+H bLKIcAWSKfhGryZjvzxXYaP3Sn2dvFIR5AMIFs+MQVx+clw6G4lU4AkWy9vPEv02J58XLVwtV8gj0 15cTmLtubtGoHACn+z24nWEQuWLOiDxjOnbITh14lTsHz+8TS7Q1C5gppA1hw9V64D1YwVjygG1zS c1oiqBhmtpQPenBl3MiGBLQUKlMY+Wqx1YO2Zi1EFrceUsapuoI5Ae+y3EFeJ6xaia8g4gf26CGaO dQVSK4pJqw5fXYCJmvEcxn5OuRaKz9uyVopmLHhaYJjn8OLHUZUsfMgfHkjWAXYPhJ3Sv4t9B7efv IvSy7eoVg9gWU8olv53w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o13ZL-008xdm-0C; Tue, 14 Jun 2022 10:14:43 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o13Yp-008xST-M9 for linux-arm-kernel@lists.infradead.org; Tue, 14 Jun 2022 10:14:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1655201651; x=1686737651; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pgiEnpbzfxx0xiXD6WVAkT4RHdqsHlan76yu59uc6B8=; b=BejxgrJ7HShSO5ow+qM2AnSmwEZcRjRdi0tw7VpngJgA/0kWPKknEjHb zcxN5E5vf2oWXrdYNQ1XI956DfNuT3nNYgLMAXBuQdsdhZM0jInsvYLVB TGlN8du97LHHSHDToBa5K4oLkgvhj3k+DLl/5rqCg7Yp8+R3uACBbNLj1 iC0sjwGPbOfkQzfoDf7RiW2lNUVDh4+UQY6X7nQL0un4GM6Hs+86k6i69 s4RNO9hPfdAUtwcZNX6CUkt1qPmQY5487Dt0/aVmuQIXLm4pWZAGhmIoS X5Snibc/i8h8MEZ5du8tReM3J7g2X11napL0dkACMGiybdm76HV9fJb2q g==; X-IronPort-AV: E=Sophos;i="5.91,299,1647327600"; d="scan'208";a="99927268" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jun 2022 03:14:10 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Jun 2022 03:14:10 -0700 Received: from rob-ult-m19940.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Tue, 14 Jun 2022 03:14:07 -0700 From: Codrin Ciubotariu To: , , Subject: [RESEND 1/3] i2c: at91: move i2c_recover_bus() outside of at91_do_twi_transfer() Date: Tue, 14 Jun 2022 13:13:45 +0300 Message-ID: <20220614101347.16910-2-codrin.ciubotariu@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220614101347.16910-1-codrin.ciubotariu@microchip.com> References: <20220614101347.16910-1-codrin.ciubotariu@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220614_031411_828510_C52BF730 X-CRM114-Status: GOOD ( 11.13 ) 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: , Cc: alexandre.belloni@bootlin.com, wsa@kernel.org, mhoffman@lightlink.com, ludovic.desroches@microchip.com, khali@linux-fr.org, andrew@sanpeople.com, Codrin Ciubotariu , peda@axentia.se Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch doesn't add a functional change, it just separates the recovery from the transfer itself. Signed-off-by: Codrin Ciubotariu --- Removed 'Fixes' tag drivers/i2c/busses/i2c-at91-master.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-at91-master.c b/drivers/i2c/busses/i2c-at91-master.c index c0c35785a0dc..34df1614bc37 100644 --- a/drivers/i2c/busses/i2c-at91-master.c +++ b/drivers/i2c/busses/i2c-at91-master.c @@ -639,13 +639,6 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) AT91_TWI_THRCLR | AT91_TWI_LOCKCLR); } - /* - * some faulty I2C slave devices might hold SDA down; - * we can send a bus clear command, hoping that the pins will be - * released - */ - i2c_recover_bus(&dev->adapter); - return ret; } @@ -716,7 +709,17 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) ret = at91_do_twi_transfer(dev); i2c_put_dma_safe_msg_buf(dma_buf, m_start, !ret); - ret = (ret < 0) ? ret : num; + if (ret < 0) { + /* + * some faulty I2C slave devices might hold SDA down; + * we can send a bus clear command, hoping that the pins will be + * released + */ + i2c_recover_bus(&dev->adapter); + } else { + ret = num; + } + out: pm_runtime_mark_last_busy(dev->dev); pm_runtime_put_autosuspend(dev->dev);