i2c: recovery: require either get_sda or set_sda

For bus recovery, we either need to bail out early if we can read SDA or
we need to send STOP after every pulse. Otherwise recovery might be
misinterpreted as an unwanted write. So, require one of those SDA
handling functions to avoid this problem.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 301285c54603fda6ded7653ad2446c8421cb2ee2..871a9731894fb6c4cf10479cf7ec47fcc120aae6 100644 (file)
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -202,7 +202,8 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap)
                /*
                 * If we can set SDA, we will always create STOP here to ensure
                 * the additional pulses will do no harm. This is achieved by
-                * letting SDA follow SCL half a cycle later.
+                * letting SDA follow SCL half a cycle later. Check the
+                * 'incomplete_write_byte' fault injector for details.
                 */
                ndelay(RECOVERY_NDELAY / 2);
                if (bri->set_sda)
@@ -274,6 +275,10 @@ static void i2c_init_recovery(struct i2c_adapter *adap)
                        err_str = "no {get|set}_scl() found";
                        goto err;
                }
+               if (!bri->set_sda && !bri->get_sda) {
+                       err_str = "either get_sda() or set_sda() needed";
+                       goto err;
+               }
        }
 
        return;

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 24acd69c88742ce595004431298191db9c0e177f..4c4360f947869465f8387e663dfd6273013a34b9 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -581,12 +581,12 @@ struct i2c_timings {
  *      recovery. Populated internally for generic GPIO recovery.
  * @set_scl: This sets/clears the SCL line. Mandatory for generic SCL recovery.
  *      Populated internally for generic GPIO recovery.
- * @get_sda: This gets current value of SDA line. Optional for generic SCL
- *      recovery. Populated internally, if sda_gpio is a valid GPIO, for generic
- *      GPIO recovery.
- * @set_sda: This sets/clears the SDA line. Optional for generic SCL recovery.
- *     Populated internally, if sda_gpio is a valid GPIO, for generic GPIO
- *     recovery.
+ * @get_sda: This gets current value of SDA line. This or set_sda() is mandatory
+ *     for generic SCL recovery. Populated internally, if sda_gpio is a valid
+ *     GPIO, for generic GPIO recovery.
+ * @set_sda: This sets/clears the SDA line. This or get_sda() is mandatory for
+ *     generic SCL recovery. Populated internally, if sda_gpio is a valid GPIO,
+ *     for generic GPIO recovery.
  * @prepare_recovery: This will be called before starting recovery. Platform may
  *     configure padmux here for SDA/SCL line or something else they want.
  * @unprepare_recovery: This will be called after completing recovery. Platform