i2c: generic recovery: check SCL before SDA

Message ID 1507207454-25158-1-git-send-email-claudio.foellmi@ergon.ch
State Accepted
Headers show
Series
  • i2c: generic recovery: check SCL before SDA
Related show

Commit Message

Claudio Foellmi Oct. 5, 2017, 12:44 p.m.
Move the check for a stuck SCL before the check for a high SDA.
This prevent false positives in the specific case that SDA is fine
and SCL is stuck, which previously returned 0.

Also check SDA again after the loop, if we can.
Together, these changes should lead to a lot more failed
recoveries being caught and returning error codes.

Signed-off-by: Claudio Foellmi <claudio.foellmi@ergon.ch>
---
I'm not sure if the null check for get_sda really is necessary
(are there really any drivers that can access scl but not sda?),
but I kept it in just in case.

 drivers/i2c/i2c-core-base.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Wolfram Sang Oct. 28, 2017, 8:55 p.m. | #1
On Thu, Oct 05, 2017 at 02:44:14PM +0200, Claudio Foellmi wrote:
> Move the check for a stuck SCL before the check for a high SDA.
> This prevent false positives in the specific case that SDA is fine
> and SCL is stuck, which previously returned 0.
> 
> Also check SDA again after the loop, if we can.
> Together, these changes should lead to a lot more failed
> recoveries being caught and returning error codes.
> 
> Signed-off-by: Claudio Foellmi <claudio.foellmi@ergon.ch>

Applied to for-next, thanks!

Huh, I thought we already fixed the add-SDA-check-after-loop, but seems
I was wrong :( I am not super happy with the now doubled SDA check, but
refactoring the whole loop is a seperate change IMO which can be done
later.

Patch

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 56e4658..65a0415 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -205,9 +205,6 @@  static int i2c_generic_recovery(struct i2c_adapter *adap)
 	 */
 	while (i++ < RECOVERY_CLK_CNT * 2) {
 		if (val) {
-			/* Break if SDA is high */
-			if (bri->get_sda && bri->get_sda(adap))
-					break;
 			/* SCL shouldn't be low here */
 			if (!bri->get_scl(adap)) {
 				dev_err(&adap->dev,
@@ -215,6 +212,9 @@  static int i2c_generic_recovery(struct i2c_adapter *adap)
 				ret = -EBUSY;
 				break;
 			}
+			/* Break if SDA is high */
+			if (bri->get_sda && bri->get_sda(adap))
+				break;
 		}
 
 		val = !val;
@@ -222,6 +222,10 @@  static int i2c_generic_recovery(struct i2c_adapter *adap)
 		ndelay(RECOVERY_NDELAY);
 	}
 
+	/* check if recovery actually succeeded */
+	if (bri->get_sda && !bri->get_sda(adap))
+		ret = -EBUSY;
+
 	if (bri->unprepare_recovery)
 		bri->unprepare_recovery(adap);