Skip to contentSkip to conversation

Input: i8042 - Fix the selftest retry logic

PATCH In review AceLan Kao 3 participants 6 messages Mar 5, 2020 – Mar 17, 2020

Subsystems (2)
lore
Share & tools
lore

AceLan Kao

author
#0 lore raw

PATCH 1/1 Input: i8042 - Fix the selftest retry logic

It returns -NODEV at the first selftest timeout, so the retry logic doesn't work. Move the return outside of the while loop to make it real retry 5 times before returns -ENODEV.

BTW, the origin loop will retry 6 times, also fix this.

---
 drivers/input/serio/i8042.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/input/serio/i8042.c +6 -5
index 20ff2bed3917..3f6433a5c8e6 100644
@@ -944,10 +944,9 @@ static int i8042_controller_selftest(void)
 	 */
 	do {
 
-		if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-			pr_err("i8042 controller selftest timeout\n");
-			return -ENODEV;
-		}
+		if (i8042_command(&param, I8042_CMD_CTL_TEST))
+			pr_err("i8042 controller selftest timeout (%d/5)\n",
+			       i+1);
 
 		if (param == I8042_RET_CTL_TEST)
 			return 0;
@@ -955,7 +954,9 @@ static int i8042_controller_selftest(void)
 		dbg("i8042 controller selftest: %#x != %#x\n",
 		    param, I8042_RET_CTL_TEST);
 		msleep(50);
-	} while (i++ < 5);
+	} while (++i < 5);
+	if (i == 5)
+		return -ENODEV;
 
 #ifdef CONFIG_X86
 	/*
Signature · 1 line
2.17.1
maintainer
#1 lore raw

Hi AceLan,

Quoted 3 lines · AceLan Kao

It returns -NODEV at the first selftest timeout, so the retry logic doesn't work. Move the return outside of the while loop to make it real retry 5 times before returns -ENODEV.

The retry logic here was for the controller not returning the expected selftest value, not the controller refusing to communicate at all.

Could you pease tell me what device requires this change?

Thanks.

Signature · 1 line
Dmitry
author
#2 lore raw

Hi Dmitry,

We have a Dell desktop with ps2 addon card, after S3, the ps2 keyboard lost function and got below errors

Jan 15 07:10:08 Rh-MT kernel: [  346.575353] i8042: i8042 controller
selftest timeout
Jan 15 07:10:08 Rh-MT kernel: [  346.575358] PM: Device i8042 failed

to resume: error -19

Adding this patch, I found the selftest passes at the second retry and the keyboard continue working fine.

Best regards,
AceLan Kao.

Dmitry Torokhov <[email protected]> 於 2020年3月6日 週五 下午12:16寫道:

Quoted 17 lines

Hi AceLan,

Quoted 3 lines · AceLan Kao

It returns -NODEV at the first selftest timeout, so the retry logic doesn't work. Move the return outside of the while loop to make it real retry 5 times before returns -ENODEV.

The retry logic here was for the controller not returning the expected selftest value, not the controller refusing to communicate at all.

Could you pease tell me what device requires this change?

Thanks.

--
Dmitry

#3 lore raw
In reply to AceLan Kao

drivers/input/serio/i8042.c static int i8042_controller_selftest(void) · line 959

Quoted 8 lines · AceLan Kao
drivers/input/serio/i8042.c +3 -1
@@ -955,7 +954,9 @@ static int i8042_controller_selftest(void)
 		dbg("i8042 controller selftest: %#x != %#x\n",
 		    param, I8042_RET_CTL_TEST);
 		msleep(50);
-	} while (i++ < 5);
+	} while (++i < 5);
+	if (i == 5)
+		return -ENODEV;

I would like to propose a V2 for this. The original logic allows continuation to device probe when selftest returns a different value than expected, and this is no longer available with this patch.

drivers/input/serio/i8042.c static int i8042_controller_selftest(void)

Quoted 3 lines
drivers/input/serio/i8042.c +0 -0
 #ifdef CONFIG_X86
 	/*
 

You-Sheng Yang

#4 lore raw

PATCH v2 1/1 Input: i8042 - fix the selftest retry logic

From: You-Sheng Yang <[email protected]>

It returns -NODEV at the first selftest timeout, so the retry logic doesn't work. Move the return outside of the while loop to make it real retry 5 times before returns -ENODEV.

BTW, the origin loop will retry 6 times, also fix this.

---
 drivers/input/serio/i8042.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/input/serio/i8042.c +13 -10
index 20ff2bed3917..e8f2004071d4 100644
@@ -937,25 +937,28 @@ static int i8042_controller_selftest(void)
 {
 	unsigned char param;
 	int i = 0;
+	int ret;
 
 	/*
 	 * We try this 5 times; on some really fragile systems this does not
 	 * take the first time...
 	 */
-	do {
-
-		if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-			pr_err("i8042 controller selftest timeout\n");
-			return -ENODEV;
-		}
+	while (i++ < 5) {
 
-		if (param == I8042_RET_CTL_TEST)
+		ret = i8042_command(&param, I8042_CMD_CTL_TEST);
+		if (ret)
+			pr_err("i8042 controller selftest timeout (%d/5)\n", i);
+		else if (param == I8042_RET_CTL_TEST)
 			return 0;
+		else
+			dbg("i8042 controller selftest: %#x != %#x\n",
+			    param, I8042_RET_CTL_TEST);
 
-		dbg("i8042 controller selftest: %#x != %#x\n",
-		    param, I8042_RET_CTL_TEST);
 		msleep(50);
-	} while (i++ < 5);
+	}
+
+	if (ret)
+		return -ENODEV;
 
 #ifdef CONFIG_X86
 	/*
Signature · 1 line
2.25.0
author
#5 lore raw

Re: [PATCH v2] Input: i8042 - fix the selftest retry logic

This v2 fix my issue, too.
Please consider to merge this patch.
Thanks.

You-Sheng Yang <[email protected]> 於 2020年3月10日 週二 上午11:37寫道:

Quoted 60 lines

From: You-Sheng Yang <[email protected]>

It returns -NODEV at the first selftest timeout, so the retry logic doesn't work. Move the return outside of the while loop to make it real retry 5 times before returns -ENODEV.

BTW, the origin loop will retry 6 times, also fix this.

---
 drivers/input/serio/i8042.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/input/serio/i8042.c +13 -11
index 20ff2bed3917..e8f2004071d4 100644
@@ -937,25 +937,28 @@ static int i8042_controller_selftest(void)
 {
        unsigned char param;
        int i = 0;
+       int ret;
 
        /*
         * We try this 5 times; on some really fragile systems this does not
         * take the first time...
         */
-       do {
-
-               if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-                       pr_err("i8042 controller selftest timeout\n");
-                       return -ENODEV;
-               }
+       while (i++ < 5) {
 
-               if (param == I8042_RET_CTL_TEST)
+               ret = i8042_command(&param, I8042_CMD_CTL_TEST);
+               if (ret)
+                       pr_err("i8042 controller selftest timeout (%d/5)\n", i);
+               else if (param == I8042_RET_CTL_TEST)
                        return 0;
+               else
+                       dbg("i8042 controller selftest: %#x != %#x\n",
+                           param, I8042_RET_CTL_TEST);
 
-               dbg("i8042 controller selftest: %#x != %#x\n",
-                   param, I8042_RET_CTL_TEST);
                msleep(50);
-       } while (i++ < 5);
+       }
+
+       if (ret)
+               return -ENODEV;
 
 #ifdef CONFIG_X86
        /*
--

2.25.0