Re: Really annoying bug in the mouse driver

[Dmitry Torokhov <dtor_core@ameritech.net>]

On Saturday 15 January 2005 08:16, Victor Hahn wrote:
> Jan 15 13:33:36 vic kernel: psmouse.c: bad data from KBC - bad parity
> Jan 15 13:33:38 vic kernel: psmouse.c: Wheel Mouse at 
> isa0060/serio1/input0 lost
>  synchronization, throwing 3 bytes away.
> 
> Sometimes, only one of these messages appears; the number of bytes in 
> the second message varies, but mostly it is 3.
> 

Hi,

Could you please try the patch below?

Thanks!

-- 
Dmitry

===== psmouse-base.c 1.88 vs edited =====
--- 1.88/drivers/input/mouse/psmouse-base.c	2005-01-27 02:13:43 -05:00
+++ edited/psmouse-base.c	2005-01-28 00:05:08 -05:00
@@ -154,9 +154,19 @@
 				flags & SERIO_TIMEOUT ? " timeout" : "",
 				flags & SERIO_PARITY ? " bad parity" : "");
 		ps2_cmd_aborted(&psmouse->ps2dev);
+		if (psmouse->resend || serio_write(serio, PSMOUSE_CMD_RESEND)) {
+			psmouse->resend = 0;
+			psmouse->state = PSMOUSE_IGNORE;
+			serio_reconnect(serio);
+		} else {
+			psmouse->pktcnt = 0;
+			psmouse->resend = 1;
+		}
 		goto out;
 	}
 
+	psmouse->resend = 0;
+
 	if (unlikely(psmouse->ps2dev.flags & PS2_FLAG_ACK))
 		if  (ps2_handle_ack(&psmouse->ps2dev, data))
 			goto out;
@@ -173,6 +183,10 @@
 		printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
 		       psmouse->name, psmouse->phys, psmouse->pktcnt);
 		psmouse->pktcnt = 0;
+		if (serio_write(serio, PSMOUSE_CMD_RESEND) == 0) {
+			psmouse->resend = 1;
+			psmouse->last = jiffies;
+		}
 	}
 
 	psmouse->last = jiffies;
===== psmouse.h 1.25 vs edited =====
--- 1.25/drivers/input/mouse/psmouse.h	2004-10-16 06:15:31 -05:00
+++ edited/psmouse.h	2005-01-28 00:04:47 -05:00
@@ -13,6 +13,7 @@
 #define PSMOUSE_CMD_ENABLE	0x00f4
 #define PSMOUSE_CMD_DISABLE	0x00f5
 #define PSMOUSE_CMD_RESET_DIS	0x00f6
+#define PSMOUSE_CMD_RESEND	0x00fe
 #define PSMOUSE_CMD_RESET_BAT	0x02ff
 
 #define PSMOUSE_RET_BAT		0xaa
@@ -45,6 +46,7 @@
 	unsigned char pktsize;
 	unsigned char type;
 	unsigned char model;
+	unsigned char resend;
 	unsigned long last;
 	unsigned long out_of_sync;
 	enum psmouse_state state;