Commit 1d4a1adb authored by Robert Hancock's avatar Robert Hancock Committed by Andi Shyti
Browse files

i2c: xiic: Try re-initialization on bus busy timeout 



In the event that the I2C bus was powered down when the I2C controller
driver loads, or some spurious pulses occur on the I2C bus, it's
possible that the controller detects a spurious I2C "start" condition.
In this situation it may continue to report the bus is busy indefinitely
and block the controller from working.

The "single-master" DT flag can be specified to disable bus busy checks
entirely, but this may not be safe to use in situations where other I2C
masters may potentially exist.

In the event that the controller reports "bus busy" for too long when
starting a transaction, we can try reinitializing the controller to see
if the busy condition clears. This allows recovering from this scenario.

Fixes: e1d5b659 ("i2c: Add support for Xilinx XPS IIC Bus Interface")
Signed-off-by: default avatarRobert Hancock <robert.hancock@calian.com>
Cc: <stable@vger.kernel.org> # v2.6.34+
Reviewed-by: default avatarManikanta Guntupalli <manikanta.guntupalli@amd.com>
Acked-by: default avatarMichal Simek <michal.simek@amd.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 521da1e9

drivers/i2c/busses/i2c-xiic.c

+26 −15
Original line number Diff line number Diff line
@@ -843,23 +843,11 @@ static int xiic_bus_busy(struct xiic_i2c *i2c) 
	return (sr & XIIC_SR_BUS_BUSY_MASK) ? -EBUSY : 0;

}



static int xiic_busy(struct xiic_i2c *i2c)

static int xiic_wait_not_busy(struct xiic_i2c *i2c)

{

	int tries = 3;

	int err;



	if (i2c->tx_msg || i2c->rx_msg)

		return -EBUSY;



	/* In single master mode bus can only be busy, when in use by this

	 * driver. If the register indicates bus being busy for some reason we

	 * should ignore it, since bus will never be released and i2c will be

	 * stuck forever.

	 */

	if (i2c->singlemaster) {

		return 0;

	}



	/* for instance if previous transfer was terminated due to TX error

	 * it might be that the bus is on it's way to become available

	 * give it at most 3 ms to wake
@@ -1103,13 +1091,36 @@ static int xiic_start_xfer(struct xiic_i2c *i2c, struct i2c_msg *msgs, int num) 


	mutex_lock(&i2c->lock);



	ret = xiic_busy(i2c);

	if (ret) {

	if (i2c->tx_msg || i2c->rx_msg) {

		dev_err(i2c->adap.dev.parent,

			"cannot start a transfer while busy\n");

		ret = -EBUSY;

		goto out;

	}



	/* In single master mode bus can only be busy, when in use by this

	 * driver. If the register indicates bus being busy for some reason we

	 * should ignore it, since bus will never be released and i2c will be

	 * stuck forever.

	 */

	if (!i2c->singlemaster) {

		ret = xiic_wait_not_busy(i2c);

		if (ret) {

			/* If the bus is stuck in a busy state, such as due to spurious low

			 * pulses on the bus causing a false start condition to be detected,

			 * then try to recover by re-initializing the controller and check

			 * again if the bus is still busy.

			 */

			dev_warn(i2c->adap.dev.parent, "I2C bus busy timeout, reinitializing\n");

			ret = xiic_reinit(i2c);

			if (ret)

				goto out;

			ret = xiic_wait_not_busy(i2c);

			if (ret)

				goto out;

		}

	}



	i2c->tx_msg = msgs;

	i2c->rx_msg = NULL;

	i2c->nmsgs = num;