[PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols

Subsystems: alps ps/2 touchpad driver, input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE4143d

4 messages, 4 authors, 2015-03-31 · open the first message on its own page

[PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2015-03-22 03:37:05

Commit 3296f71cd2fde7a2ad52e66a27eae419f6328066 ("Input: ALPS - consolidate
setting protocol parameters") inadvertently moved call to
alps_dolphin_get_device_area() from v5 to v7 protocol, causing both
protocols report incorrect maximum values for X and Y axes which resulted
in crash in Synaptics X driver.

Reported-by: Santiago Gala <redacted>
Reported-by: Pali Rohár <redacted>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/mouse/alps.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 1bd15eb..33198b9 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c

@@ -2281,10 +2281,12 @@ static int alps_set_protocol(struct psmouse *psmouse,
 		priv->set_abs_params = alps_set_abs_params_mt;
 		priv->nibble_commands = alps_v3_nibble_commands;
 		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-		priv->x_max = 1360;
-		priv->y_max = 660;
 		priv->x_bits = 23;
 		priv->y_bits = 12;
+
+		if (alps_dolphin_get_device_area(psmouse, priv))
+			return -EIO;
+
 		break;
 
 	case ALPS_PROTO_V6:

@@ -2303,9 +2305,8 @@ static int alps_set_protocol(struct psmouse *psmouse,
 		priv->set_abs_params = alps_set_abs_params_mt;
 		priv->nibble_commands = alps_v3_nibble_commands;
 		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-
-		if (alps_dolphin_get_device_area(psmouse, priv))
-			return -EIO;
+		priv->x_max = 0xfff;
+		priv->y_max = 0x7ff;
 
 		if (priv->fw_ver[1] != 0xba)
 			priv->flags |= ALPS_BUTTONPAD;

-- 
2.2.0.rc0.207.ga3a616c


-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols

From: Hans de Goede <hidden>
Date: 2015-03-22 10:50:57

Hi,

On 22-03-15 04:36, Dmitry Torokhov wrote:

Commit 3296f71cd2fde7a2ad52e66a27eae419f6328066 ("Input: ALPS - consolidate
setting protocol parameters") inadvertently moved call to
alps_dolphin_get_device_area() from v5 to v7 protocol, causing both
protocols report incorrect maximum values for X and Y axes which resulted
in crash in Synaptics X driver.

Reported-by: Santiago Gala <redacted>
Reported-by: Pali Rohár <redacted>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Fix looks good to me:

Acked-by: Hans de Goede <redacted>

Regards,

Hans

quoted hunk

---
  drivers/input/mouse/alps.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 1bd15eb..33198b9 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c

@@ -2281,10 +2281,12 @@ static int alps_set_protocol(struct psmouse *psmouse,
  		priv->set_abs_params = alps_set_abs_params_mt;
  		priv->nibble_commands = alps_v3_nibble_commands;
  		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-		priv->x_max = 1360;
-		priv->y_max = 660;
  		priv->x_bits = 23;
  		priv->y_bits = 12;
+
+		if (alps_dolphin_get_device_area(psmouse, priv))
+			return -EIO;
+
  		break;

  	case ALPS_PROTO_V6:

@@ -2303,9 +2305,8 @@ static int alps_set_protocol(struct psmouse *psmouse,
  		priv->set_abs_params = alps_set_abs_params_mt;
  		priv->nibble_commands = alps_v3_nibble_commands;
  		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-
-		if (alps_dolphin_get_device_area(psmouse, priv))
-			return -EIO;
+		priv->x_max = 0xfff;
+		priv->y_max = 0x7ff;

  		if (priv->fw_ver[1] != 0xba)
  			priv->flags |= ALPS_BUTTONPAD;

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols

From: Pali Rohár <hidden>
Date: 2015-03-22 12:33:16

On Sunday 22 March 2015 11:48:17 Hans de Goede wrote:

Hi,

On 22-03-15 04:36, Dmitry Torokhov wrote:

quoted

Commit 3296f71cd2fde7a2ad52e66a27eae419f6328066 ("Input:
ALPS - consolidate setting protocol parameters")
inadvertently moved call to alps_dolphin_get_device_area()
from v5 to v7 protocol, causing both protocols report
incorrect maximum values for X and Y axes which resulted in
crash in Synaptics X driver.

Reported-by: Santiago Gala <redacted>
Reported-by: Pali Rohár <redacted>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Fix looks good to me:

Acked-by: Hans de Goede <redacted>

Regards,

Hans

Looks good also for me...

Acked-by: Pali Rohár <redacted>

quoted

---

  drivers/input/mouse/alps.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/input/mouse/alps.c

b/drivers/input/mouse/alps.c index 1bd15eb..33198b9 100644

--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c

@@ -2281,10 +2281,12 @@ static int alps_set_protocol(struct

psmouse *psmouse,

  		priv->set_abs_params = alps_set_abs_params_mt;
  		priv->nibble_commands = alps_v3_nibble_commands;
  		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;

-		priv->x_max = 1360;
-		priv->y_max = 660;

  		priv->x_bits = 23;
  		priv->y_bits = 12;

+
+		if (alps_dolphin_get_device_area(psmouse, priv))
+			return -EIO;
+

  		break;
  	
  	case ALPS_PROTO_V6:

@@ -2303,9 +2305,8 @@ static int alps_set_protocol(struct

psmouse *psmouse,

  		priv->set_abs_params = alps_set_abs_params_mt;
  		priv->nibble_commands = alps_v3_nibble_commands;
  		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;

-
-		if (alps_dolphin_get_device_area(psmouse, priv))
-			return -EIO;
+		priv->x_max = 0xfff;
+		priv->y_max = 0x7ff;

  		if (priv->fw_ver[1] != 0xba)
  		
  			priv->flags |= ALPS_BUTTONPAD;


-- 
Pali Rohár
pali.rohar@gmail.com

Re: [PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols

From: Luca Coelho <hidden>
Date: 2015-03-31 04:25:01

On Sat, 2015-03-21 at 20:36 -0700, Dmitry Torokhov wrote:

Commit 3296f71cd2fde7a2ad52e66a27eae419f6328066 ("Input: ALPS - consolidate
setting protocol parameters") inadvertently moved call to
alps_dolphin_get_device_area() from v5 to v7 protocol, causing both
protocols report incorrect maximum values for X and Y axes which resulted
in crash in Synaptics X driver.

Reported-by: Santiago Gala <redacted>
Reported-by: Pali Rohár <redacted>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

Tested-by: Luciano Coelho <redacted>

Tested on a Dell E5250.

Are you planning to send this to 4.0-rc*? That would be nice, since this
is a regression from 3.19.

--
Cheers,
Luca.

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help