diff mbox series

[v2] HID: multitouch: Add report_fixup for Goodix GT7868Q touchpad

Message ID 801C5D6FCE55F473+20240731154619.514470-1-wangyuli@uniontech.com (mailing list archive)
State Mainlined
Commit c8000deb68365b461b324d68c7ea89d730f0bb85
Delegated to: Jiri Kosina
Headers show
Series [v2] HID: multitouch: Add report_fixup for Goodix GT7868Q touchpad | expand

Commit Message

WangYuli July 31, 2024, 3:46 p.m. UTC 
Goodix GT7868Q has incorrect data in the report and needs
a fixup.

The device is a haptic touchpad used on
Lenovo ThinkBook 13x Gen 4 series of laptops and have
incorrect descriptor that hid-parse fails to parse hence
device is not working.

Link: https://github.com/ty2/goodix-gt7868q-linux-driver.git
Signed-off-by: Terry Wong <terry.wong2@yahoo.com>
Signed-off-by: Craig Cabrey <craigcabrey@gmail.com>
Signed-off-by: Dmitry Savin <envelsavinds@gmail.com>
Link: https://lore.kernel.org/linux-input/20240716222757.22931-1-envelsavinds@gmail.com/T/#mc7922671337acc84c69d367074ce341db5a819dc
Suggested-by: Lugang He <helugang@uniontech.com>
Signed-off-by: WangYuli <wangyuli@uniontech.com>
---
 drivers/hid/hid-ids.h        |  2 ++
 drivers/hid/hid-multitouch.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

Comments

Jiri Kosina Aug. 19, 2024, 6:14 p.m. UTC | #1 
On Wed, 31 Jul 2024, WangYuli wrote:

> Goodix GT7868Q has incorrect data in the report and needs
> a fixup.
> 
> The device is a haptic touchpad used on
> Lenovo ThinkBook 13x Gen 4 series of laptops and have
> incorrect descriptor that hid-parse fails to parse hence
> device is not working.
> 
> Link: https://github.com/ty2/goodix-gt7868q-linux-driver.git
> Signed-off-by: Terry Wong <terry.wong2@yahoo.com>
> Signed-off-by: Craig Cabrey <craigcabrey@gmail.com>
> Signed-off-by: Dmitry Savin <envelsavinds@gmail.com>
> Link: https://lore.kernel.org/linux-input/20240716222757.22931-1-envelsavinds@gmail.com/T/#mc7922671337acc84c69d367074ce341db5a819dc
> Suggested-by: Lugang He <helugang@uniontech.com>
> Signed-off-by: WangYuli <wangyuli@uniontech.com>

Hi,

the fix for this device has already been queued [1] and currently is 
included in pedning pull request to Linus.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/commit/?h=for-6.11/upstream-fixes&id=c8000deb68365b461b324d68c7ea89d730f0bb85
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 72d56ee7ce1b..eebfca375bcd 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -520,6 +520,8 @@ 
 #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
 
 #define I2C_VENDOR_ID_GOODIX		0x27c6
+#define I2C_DEVICE_ID_GOODIX_01E8	0x01e8
+#define I2C_DEVICE_ID_GOODIX_01E9	0x01e9
 #define I2C_DEVICE_ID_GOODIX_01F0	0x01f0
 
 #define USB_VENDOR_ID_GOODTOUCH		0x1aad
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 56fc78841f24..99812c0f830b 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1441,6 +1441,30 @@  static int mt_event(struct hid_device *hid, struct hid_field *field,
 	return 0;
 }
 
+static __u8 *mt_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+			     unsigned int *size)
+{
+	if (hdev->vendor == I2C_VENDOR_ID_GOODIX &&
+	    (hdev->product == I2C_DEVICE_ID_GOODIX_01E8 ||
+	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9)) {
+		if (rdesc[607] == 0x15) {
+			rdesc[607] = 0x25;
+			dev_info(
+				&hdev->dev,
+				"GT7868Q report descriptor fixup is applied.\n");
+		} else {
+			dev_info(
+				&hdev->dev,
+				"The byte is not expected for fixing the report descriptor. \
+It's possible that the touchpad firmware is not suitable for applying the fix. \
+got: %x\n",
+				rdesc[607]);
+		}
+	}
+
+	return rdesc;
+}
+
 static void mt_report(struct hid_device *hid, struct hid_report *report)
 {
 	struct mt_device *td = hid_get_drvdata(hid);
@@ -2035,6 +2059,14 @@  static const struct hid_device_id mt_devices[] = {
 		MT_BT_DEVICE(USB_VENDOR_ID_FRUCTEL,
 			USB_DEVICE_ID_GAMETEL_MT_MODE) },
 
+	/* Goodix GT7868Q devices */
+	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
+	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
+		     I2C_DEVICE_ID_GOODIX_01E8) },
+	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
+	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
+		     I2C_DEVICE_ID_GOODIX_01E8) },
+
 	/* GoodTouch panels */
 	{ .driver_data = MT_CLS_NSMU,
 		MT_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,
@@ -2270,6 +2302,7 @@  static struct hid_driver mt_driver = {
 	.feature_mapping = mt_feature_mapping,
 	.usage_table = mt_grabbed_usages,
 	.event = mt_event,
+	.report_fixup = mt_report_fixup,
 	.report = mt_report,
 	.suspend = pm_ptr(mt_suspend),
 	.reset_resume = pm_ptr(mt_reset_resume),