Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Bernd Edlinger <bernd.edlinger@hotmail.de>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
        Dmitry Torokhov <dmitry.torokhov@gmail.com>,
        Benjamin Tissoires <benjamin.tissoires@redhat.com>,
        Kai-Heng Feng <kai.heng.feng@canonical.com>,
        Enrico Weigelt <info@metux.net>,
        Allison Randal <allison@lohutok.net>,
        Aaron Ma <aaron.ma@canonical.com>
Subject: [PATCH] Input: elantech - fix x_max/y_max values
Thread-Topic: [PATCH] Input: elantech - fix x_max/y_max values
Thread-Index: AQHV7WVVYTVl2cgg3k+48LjBx/56vQ==
Date:   Thu, 27 Feb 2020 11:59:16 +0000
Message-ID: <PR2PR03MB517975370D754EEF47E062BFE4EB0@PR2PR03MB5179.eurprd03.prod.outlook.com>
Accept-Language: en-US, en-GB, de-DE
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-tmn:  [9HcJat3D8YsDGOMh7MWukCqKGgwGRPUL]
x-microsoft-original-message-id: <8d6d8d05-fa9d-b1c8-a6e9-9af4ce7605a9@hotmail.de>
x-ms-publictraffictype: Email
x-incomingheadercount: 47
x-eopattributedmessage: 0
x-ms-office365-filtering-correlation-id: 74011f02-cc98-4ab2-7b0d-08d7bb7c77df
x-ms-traffictypediagnostic: AM6EUR05HT097:
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: w5VTVXK7gQGnElD1GXk3XmsOsGdHiFewaqwTMLixzBVQqwScOhixPkDxI9R46tRZGbc/Uu0x1YrSaKNUHiwLtHZSN7Y+8RiY9MyDYku45v1pvBPQwAZ14GsPzJ+4UCPZqT2FQYqH7SaI05b4s8jh99el2wxxeqn9d1XmxSrLH7VEX2XkNTNLvI2j+RibEudf
x-ms-exchange-antispam-messagedata: x+iMtO6I/lwbA6yaU2DfbFqyRiNJBz6+cE4SUhgrZhvE5WEu1Ein2+yA953fxiRdPCfSfopo+/KILH45RaWJVk2H5NdEGS2mTkCrPnHgav1gMJxUju2XyqNcoy7fTRtIVe48lINwxnhXQ2jv+GLN7w==
x-ms-exchange-transport-forked: True
Content-Type: text/plain; charset="Windows-1252"
Content-ID: <CB78FBB99F4E7341884BD469B64B0D45@eurprd03.prod.outlook.com>
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-Network-Message-Id: 74011f02-cc98-4ab2-7b0d-08d7bb7c77df
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2020 11:59:16.1286
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Internet
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6EUR05HT097
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since 37548659bb2 moved the querying of the x_max/y_max
values from elantech_set_input_params to elantech_query_info,
the returned x_max/y_max values are different than before,
at least for some firmware versions.

The reason is likely that this is now done before
elantech_set_absolute_mode does run.  So it may happen that
the returned values are exactly half of what they used to be,
which makes input_report_abs in PS/2 mode report ABS_X values which
exceed the x_max value, which is very annoying since the mouse stops
to move then, and ABS_Y value become negative, which is benign.

This was observed with a MSI GX70 laptop:

elantech: assuming hardware version 3 (with firmware version 0x250f01)
elantech: Synaptics capabilities query result 0x18, 0x17, 0x0b.
elantech: Elan sample query result 05, 0e, 00
input: ETPS/2 Elantech Touchpad as /devices/platform/i8042/serio...

Correct this by doubling the returned x_max and y_max
value for this specific firmware version.

Fixes: 37548659bb2 ("Input: elantech - query the min/max
information beforehand too")

Signed-off-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
---
 drivers/input/mouse/elantech.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 2d8434b..3399db8 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1720,6 +1720,10 @@ static int elantech_query_info(struct psmouse *psmouse,
 
 		info->x_max = (0x0f & param[0]) << 8 | param[1];
 		info->y_max = (0xf0 & param[0]) << 4 | param[2];
+		if (info->fw_version == 0x250f01) {
+			info->x_max <<= 1;
+			info->y_max <<= 1;
+		}
 		break;
 
 	case 4:
-- 
1.9.1