Comment 23 for bug 650529

Revision history for this message
Bruce Kearns (brkearns67) wrote :

I have been looking into this problem, especially Dmitry Torokhov's work around this issue. It appears that there is a patch that has been implemented in Gentoo for the 2.6.32 kernel series. Since this patch is dated 2010-07-29, I am wondering if this patch has been incorporated into the mainline kernel builds. Please confirm. If it has not, I plan to build a kernel that incorporates this patch.

Patch is as follows

--- a/drivers/input/mouse/synaptics.c 2010-07-29 09:14:58.000000000 -0400
+++ b/drivers/input/mouse/synaptics.c 2010-07-29 09:16:34.000000000 -0400
@@ -136,8 +136,14 @@ static int synaptics_capability(struct p
   return -1;
  priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
  priv->ext_cap = 0;
- if (!SYN_CAP_VALID(priv->capabilities))
+
+ /*
+ * Older firmwares had submodel ID fixed to 0x47
+ */
+ if (SYN_ID_FULL(priv->identity) < 0x705 &&
+ SYN_CAP_SUBMODEL_ID(priv->capabilities) != 0x47) {
   return -1;
+ }

  /*
   * Unless capExtended is set the rest of the flags should be ignored
--- a/drivers/input/mouse/synaptics.h 2010-07-29 09:15:00.000000000 -0400
+++ b/drivers/input/mouse/synaptics.h 2010-07-29 09:17:10.000000000 -0400
@@ -45,7 +45,7 @@
 #define SYN_CAP_FOUR_BUTTON(c) ((c) & (1 << 3))
 #define SYN_CAP_MULTIFINGER(c) ((c) & (1 << 1))
 #define SYN_CAP_PALMDETECT(c) ((c) & (1 << 0))
-#define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47)
+#define SYN_CAP_SUBMODEL_ID(c) (((c) & 0x00ff00) >> 8)
 #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20)
 #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12)

@@ -61,6 +61,7 @@
 #define SYN_ID_MODEL(i) (((i) >> 4) & 0x0f)
 #define SYN_ID_MAJOR(i) ((i) & 0x0f)
 #define SYN_ID_MINOR(i) (((i) >> 16) & 0xff)
+#define SYN_ID_FULL(i) ((SYN_ID_MAJOR(i) << 8) | SYN_ID_MINOR(i))
 #define SYN_ID_IS_SYNAPTICS(i) ((((i) >> 8) & 0xff) == 0x47)

 /* synaptics special commands */