i2c: omap: Trigger bus recovery in lockup case

commit 93367bfca98f36cece57c01dbce6ea1b4ac58245 upstream

A very conservative check for bus activity (to prevent interference
in multimaster setups) prevented the bus recovery methods from being
triggered in the case that SDA or SCL was stuck low.
This defeats the purpose of the recovery mechanism, which was introduced
for exactly this situation (a slave device keeping SDA pulled down).

Also added a check to make sure SDA is low before attempting recovery.
If SDA is not stuck low, recovery will not help, so we can skip it.

Note that bus lockups can persist across reboots. The only other options
are to reset or power cycle the offending slave device, and many i2c
slaves do not even have a reset pin.

If we see that one of the lines is low for the entire timeout duration,
we can actually be sure that there is no other master driving the bus.
It is therefore save for us to attempt a bus recovery.

Signed-off-by: Claudio Foellmi <claudio.foellmi@ergon.ch>
Tested-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
[wsa: fixed one return code to -EBUSY]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 12ba183693d6924a24f26a9eda3bfbd96bb849d0..a03564f41ad0a231a6bc16df3d6107053f10a7b9 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -486,6 +486,22 @@ static int omap_i2c_init(struct omap_i2c_dev *omap)
        return 0;
 }
 
+/*
+ * Try bus recovery, but only if SDA is actually low.
+ */
+static int omap_i2c_recover_bus(struct omap_i2c_dev *omap)
+{
+       u16 systest;
+
+       systest = omap_i2c_read_reg(omap, OMAP_I2C_SYSTEST_REG);
+       if ((systest & OMAP_I2C_SYSTEST_SCL_I_FUNC) &&
+           (systest & OMAP_I2C_SYSTEST_SDA_I_FUNC))
+               return 0; /* bus seems to already be fine */
+       if (!(systest & OMAP_I2C_SYSTEST_SCL_I_FUNC))
+               return -EBUSY; /* recovery would not fix SCL */
+       return i2c_recover_bus(&omap->adapter);
+}
+
 /*
  * Waiting on Bus Busy
  */
@@ -496,7 +512,7 @@ static int omap_i2c_wait_for_bb(struct omap_i2c_dev *omap)
        timeout = jiffies + OMAP_I2C_TIMEOUT;
        while (omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG) & OMAP_I2C_STAT_BB) {
                if (time_after(jiffies, timeout))
-                       return i2c_recover_bus(&omap->adapter);
+                       return omap_i2c_recover_bus(omap);
                msleep(1);
        }
 
@@ -577,8 +593,13 @@ static int omap_i2c_wait_for_bb_valid(struct omap_i2c_dev *omap)
                }
 
                if (time_after(jiffies, timeout)) {
+                       /*
+                        * SDA or SCL were low for the entire timeout without
+                        * any activity detected. Most likely, a slave is
+                        * locking up the bus with no master driving the clock.
+                        */
                        dev_warn(omap->dev, "timeout waiting for bus ready\n");
-                       return -ETIMEDOUT;
+                       return omap_i2c_recover_bus(omap);
                }
 
                msleep(1);