From: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
To: <linux-i2c@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <nicolas.ferre@microchip.com>, <alexandre.belloni@bootlin.com>,
<ludovic.desroches@microchip.com>, <andrew@sanpeople.com>,
<mhoffman@lightlink.com>, <khali@linux-fr.org>, <wsa@kernel.org>,
"Codrin Ciubotariu" <codrin.ciubotariu@microchip.com>
Subject: [PATCH 2/3] i2c: at91: keep the controller disabled when it is not used
Date: Tue, 27 Jul 2021 14:15:53 +0300 [thread overview]
Message-ID: <20210727111554.1338832-3-codrin.ciubotariu@microchip.com> (raw)
In-Reply-To: <20210727111554.1338832-1-codrin.ciubotariu@microchip.com>
The controller (master mode) should be disabled when it is not used, to
avoid potential glitches on the bus. The controller must be disabled
only when the controller is not running.
This fixes an issue on Microchip's SAMA5D4 platform when pinctrl changes
the I2C's pin states between GPIO and I2C, done when GPIO recovery is used.
Fixes: 813e30e9ab91 ("i2c: New Atmel AT91 bus driver")
Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
---
drivers/i2c/busses/i2c-at91-master.c | 34 ++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-at91-master.c b/drivers/i2c/busses/i2c-at91-master.c
index 0352dc09d697..1f91829438fd 100644
--- a/drivers/i2c/busses/i2c-at91-master.c
+++ b/drivers/i2c/busses/i2c-at91-master.c
@@ -38,7 +38,7 @@ void at91_init_twi_bus_master(struct at91_twi_dev *dev)
/* FIFO should be enabled immediately after the software reset */
if (dev->fifo_size)
at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_FIFOEN);
- at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_MSEN);
+ at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_MSDIS);
at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_SVDIS);
at91_twi_write(dev, AT91_TWI_CWGR, dev->twi_cwgr_reg);
@@ -593,7 +593,6 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
if (time_left == 0) {
dev->transfer_status |= at91_twi_read(dev, AT91_TWI_SR);
dev_err(dev->dev, "controller timed out\n");
- at91_init_twi_bus(dev);
ret = -ETIMEDOUT;
goto error;
}
@@ -642,6 +641,26 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
return ret;
}
+static void at91_twi_disable(struct at91_twi_dev *dev)
+{
+ /* return if previous operation is completed */
+ if (!(at91_twi_read(dev, AT91_TWI_SR) & AT91_TWI_TXCOMP)) {
+ /* wait for previous command to complete before disabling the controller */
+ dev_dbg(dev->dev, "wait for command to complete...\n");
+ reinit_completion(&dev->cmd_complete);
+ dev->transfer_status = 0;
+ at91_twi_write(dev, AT91_TWI_IER, AT91_TWI_TXCOMP);
+ wait_for_completion_timeout(&dev->cmd_complete, dev->adapter.timeout);
+ if (!(dev->transfer_status & AT91_TWI_TXCOMP)) {
+ dev_dbg(dev->dev, "IP still busy, resetting the controller...\n");
+ at91_init_twi_bus(dev);
+ return;
+ }
+ }
+
+ at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_MSDIS);
+}
+
static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num)
{
struct at91_twi_dev *dev = i2c_get_adapdata(adap);
@@ -656,6 +675,8 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num)
if (ret < 0)
goto out;
+ at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_MSEN);
+
if (num == 2) {
int internal_address = 0;
int i;
@@ -699,13 +720,22 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num)
ret = at91_do_twi_transfer(dev);
if (ret < 0) {
+ /* disable controller before using GPIO recovery */
+ if (!dev->pdata->has_clear_cmd)
+ at91_twi_disable(dev);
+
/*
* 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);
+
+ /* disable controller if not disabled before */
+ if (dev->pdata->has_clear_cmd)
+ at91_twi_disable(dev);
} else {
+ at91_twi_disable(dev);
ret = num;
}
--
2.30.2
next prev parent reply other threads:[~2021-07-27 11:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 11:15 [PATCH 0/3] i2c: at91: Fixes and updates Codrin Ciubotariu
2021-07-27 11:15 ` [PATCH 1/3] i2c: at91: move i2c_recover_bus() outside of at91_do_twi_transfer() Codrin Ciubotariu
2021-11-29 10:39 ` Wolfram Sang
2021-07-27 11:15 ` Codrin Ciubotariu [this message]
2021-07-27 11:15 ` [PATCH 3/3] i2c: at91: add advanced digital filtering support for SAMA5D4 Codrin Ciubotariu
2021-11-29 10:41 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210727111554.1338832-3-codrin.ciubotariu@microchip.com \
--to=codrin.ciubotariu@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@sanpeople.com \
--cc=khali@linux-fr.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=mhoffman@lightlink.com \
--cc=nicolas.ferre@microchip.com \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).