Skip to contentSkip to conversation

psmouse: disable the synaptics extension on OLPC machines.

PATCH In review Andres Salomon 3 participants 8 messages Dec 18, 2010 – Dec 19, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 psmouse: disable the synaptics extension on OLPC machines.

OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode).

---
 drivers/input/mouse/synaptics.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
drivers/input/mouse/synaptics.c +30 -0
index 2e300a4..75fbf33 100644
@@ -744,15 +744,45 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
 #endif
 };
 
+static bool broken_olpc_ec;
+
+static const struct dmi_system_id __initconst olpc_dmi_table[] = {
+#if defined(CONFIG_DMI) && defined(CONFIG_OLPC)
+	{
+		/* OLPC XO-1 or XO-1.5 */
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "OLPC"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "XO"),
+		},
+	},
+	{ }
+#endif
+};
+
 void __init synaptics_module_init(void)
 {
 	impaired_toshiba_kbc = dmi_check_system(toshiba_dmi_table);
+	broken_olpc_ec = dmi_check_system(olpc_dmi_table);
 }
 
 int synaptics_init(struct psmouse *psmouse)
 {
 	struct synaptics_data *priv;
 
+	/*
+	 * The OLPC XO has issues with Synaptics' absolute mode; similarly to
+	 * the HGPK, it quickly degrades and the hardware becomes jumpy and
+	 * overly sensitive.  Not only that, but the constant packet spew
+	 * (even at a lowered 40pps rate) overloads the EC such that key
+	 * presses on the keyboard are missed.  Given all of that, don't
+	 * even attempt to use Synaptics mode.  Relative mode seems to work
+	 * just fine.
+	 */
+	if (broken_olpc_ec) {
+		printk(KERN_INFO "synaptics: OLPC XO detected, not enabling Synaptics protocol.\n");
+		return -ENODEV;
+	}
+
 	psmouse->private = priv = kzalloc(sizeof(struct synaptics_data), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
Signature · 1 line
1.7.2.3
maintainer
#1 lore raw
Quoted 7 lines · Andres Salomon

OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode).

Andres,

Can we do what hgpk does and add "depend on !OLPC" to the Kconfig instead?

Thanks.

Signature · 1 line
Dmitry
#2 lore raw
Quoted 7 lines · On Fri, 17 Dec 2010 21:49:28 -0800 Dmitry Torokhov <[email protected]>…
Quoted 6 lines · Andres Salomon

OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode).

Quoted 9 lines
Quoted 1 line

Andres,

Can we do what hgpk does and add "depend on !OLPC" to the Kconfig instead?

Thanks.

That wouldn't work for distro kernels, unfortunately. Currently the kernels that OLPC releases disable CONFIG_MOUSE_PS2_SYNAPTICS. I'd like to use a stock distribution kernel, which would need to enable both CONFIG_OLPC *and* CONFIG_MOUSE_PS2_SYNAPTICS.. Hence the motivation for this patch. :)

maintainer
#3 lore raw
Quoted 17 lines · Andres Salomon
Quoted 14 lines · On Fri, 17 Dec 2010 21:49:28 -0800 Dmitry Torokhov <[email protected]>…
Quoted 7 lines · Andres Salomon

OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode).

Andres,

Can we do what hgpk does and add "depend on !OLPC" to the Kconfig instead?

Quoted 8 lines
Quoted 2 lines

Thanks.

That wouldn't work for distro kernels, unfortunately. Currently the kernels that OLPC releases disable CONFIG_MOUSE_PS2_SYNAPTICS. I'd like to use a stock distribution kernel, which would need to enable both CONFIG_OLPC *and* CONFIG_MOUSE_PS2_SYNAPTICS.. Hence the motivation for this patch. :)

What about just adding psmouse.proto=exps then?

Signature · 1 line
Dmitry
#4 lore raw
Quoted 1 line · Dmitry Torokhov

What about just adding psmouse.proto=exps then?

It's not quite that simple either, because we want the same distro image to work on all versions of XO. XO's can come with either hgpk, synaptics, or sentelic touchpads. In the sentelic and hgpk cases, we'd want the "real" drivers to kick in.

Daniel

maintainer
#5 lore raw
Quoted 8 lines · Daniel Drake
Quoted 1 line · Dmitry Torokhov

What about just adding psmouse.proto=exps then?

It's not quite that simple either, because we want the same distro image to work on all versions of XO. XO's can come with either hgpk, synaptics, or sentelic touchpads. In the sentelic and hgpk cases, we'd want the "real" drivers to kick in.

Hmm, I am confused. HGPK depends on OLPC so your distribution must have it defined. Are there general purpose distributions that enable OLPC?

Thanks.

Signature · 1 line
Dmitry
#6 lore raw
Quoted 11 lines · On Sun, 19 Dec 2010 00:20:27 -0800 Dmitry Torokhov <[email protected]>…
Quoted 9 lines · Daniel Drake
Quoted 1 line · Dmitry Torokhov

What about just adding psmouse.proto=exps then?

It's not quite that simple either, because we want the same distro image to work on all versions of XO. XO's can come with either hgpk, synaptics, or sentelic touchpads. In the sentelic and hgpk cases, we'd want the "real" drivers to kick in.

Quoted 3 lines

Hmm, I am confused. HGPK depends on OLPC so your distribution must have it defined. Are there general purpose distributions that enable OLPC?

Yes, Debian enables CONFIG_OLPC in its 486 kernel (and one of these days, I'll open up a bug for them to enable it in their 686 kernel).

There are 3 types of touchpads in OLPC XO machines (hgpk, synaptics, and sentelics). If the hardware is either hgpk or sentelics, we want those extensions to load. If the hardware is synaptics, we want the extension not to load. Doing this via kernel
arg doesn't work, as a generic distributions (and even those built specifically for OLPC XOs) will not know which touchpad hardware will be in use.

maintainer
#7 lore raw
Quoted 22 lines · Andres Salomon
Quoted 11 lines · On Sun, 19 Dec 2010 00:20:27 -0800 Dmitry Torokhov <[email protected]>…
Quoted 9 lines · Daniel Drake
Quoted 1 line · Dmitry Torokhov

What about just adding psmouse.proto=exps then?

It's not quite that simple either, because we want the same distro image to work on all versions of XO. XO's can come with either hgpk, synaptics, or sentelic touchpads. In the sentelic and hgpk cases, we'd want the "real" drivers to kick in.

Quoted 3 lines

Hmm, I am confused. HGPK depends on OLPC so your distribution must have it defined. Are there general purpose distributions that enable OLPC?

Yes, Debian enables CONFIG_OLPC in its 486 kernel (and one of these days, I'll open up a bug for them to enable it in their 686 kernel).

Quoted 8 lines

There are 3 types of touchpads in OLPC XO machines (hgpk, synaptics, and sentelics). If the hardware is either hgpk or sentelics, we want those extensions to load. If the hardware is synaptics, we want the extension not to load. Doing this via kernel
arg doesn't work, as a generic distributions (and even those built specifically for OLPC XOs) will not know which touchpad hardware will be in use.

It still should be theoretically possible to do it in userspace (playing with protocol settings via sysfs) but I think in kernel is less painful. I'll apply the patch.

Thanks for the explanations.

Signature · 1 line
Dmitry