|
|
@@ -1,4 +1,45 @@
|
|
|
-From 76accddaf1b7b28acb671305efb2a71eee0ea4af Mon Sep 17 00:00:00 2001
|
|
|
+From 9e611153712541c8dde237599028c05ddfc8443d Mon Sep 17 00:00:00 2001
|
|
|
+From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
+Date: Sat, 18 Feb 2023 01:02:49 +0100
|
|
|
+Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3
|
|
|
+ Type-Cover
|
|
|
+
|
|
|
+The touchpad on the Type-Cover of the Surface Go 3 is sometimes not
|
|
|
+being initialized properly. Apply USB_QUIRK_DELAY_INIT to fix this
|
|
|
+issue.
|
|
|
+
|
|
|
+More specifically, the device in question is a fairly standard modern
|
|
|
+touchpad with pointer and touchpad input modes. During setup, the device
|
|
|
+needs to be switched from pointer- to touchpad-mode (which is done in
|
|
|
+hid-multitouch) to fully utilize it as intended. Unfortunately, however,
|
|
|
+this seems to occasionally fail silently, leaving the device in
|
|
|
+pointer-mode. Applying USB_QUIRK_DELAY_INIT seems to fix this.
|
|
|
+
|
|
|
+Link: https://github.com/linux-surface/linux-surface/issues/1059
|
|
|
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
+Patchset: surface-typecover
|
|
|
+---
|
|
|
+ drivers/usb/core/quirks.c | 3 +++
|
|
|
+ 1 file changed, 3 insertions(+)
|
|
|
+
|
|
|
+diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
|
|
+index 53d68d20fb62..cf85b30b1d60 100644
|
|
|
+--- a/drivers/usb/core/quirks.c
|
|
|
++++ b/drivers/usb/core/quirks.c
|
|
|
+@@ -223,6 +223,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|
|
+ /* Microsoft Surface Dock Ethernet (RTL8153 GigE) */
|
|
|
+ { USB_DEVICE(0x045e, 0x07c6), .driver_info = USB_QUIRK_NO_LPM },
|
|
|
+
|
|
|
++ /* Microsoft Surface Go 3 Type-Cover */
|
|
|
++ { USB_DEVICE(0x045e, 0x09b5), .driver_info = USB_QUIRK_DELAY_INIT },
|
|
|
++
|
|
|
+ /* Cherry Stream G230 2.0 (G85-231) and 3.0 (G85-232) */
|
|
|
+ { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
+
|
|
|
+--
|
|
|
+2.50.0
|
|
|
+
|
|
|
+From 875ba51655d8bf28f70a2e9e6831d7e454382d48 Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
|
|
Date: Thu, 5 Nov 2020 13:09:45 +0100
|
|
|
Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
|
|
|
@@ -34,7 +75,7 @@ Patchset: surface-typecover
|
|
|
1 file changed, 98 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
|
|
-index e50887a6d22c..4ce18f21a141 100644
|
|
|
+index 7ac8e16e6158..41017a552681 100644
|
|
|
--- a/drivers/hid/hid-multitouch.c
|
|
|
+++ b/drivers/hid/hid-multitouch.c
|
|
|
@@ -35,7 +35,10 @@
|
|
|
@@ -210,7 +251,7 @@ index e50887a6d22c..4ce18f21a141 100644
|
|
|
|
|
|
ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
|
|
|
if (ret)
|
|
|
-@@ -1881,7 +1971,8 @@ static void mt_remove(struct hid_device *hdev)
|
|
|
+@@ -1881,6 +1971,7 @@ static void mt_remove(struct hid_device *hdev)
|
|
|
{
|
|
|
struct mt_device *td = hid_get_drvdata(hdev);
|
|
|
|
|
|
@@ -218,7 +259,6 @@ index e50887a6d22c..4ce18f21a141 100644
|
|
|
timer_delete_sync(&td->release_timer);
|
|
|
|
|
|
sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
|
|
|
- hid_hw_stop(hdev);
|
|
|
@@ -2304,6 +2395,11 @@ static const struct hid_device_id mt_devices[] = {
|
|
|
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
|
|
USB_DEVICE_ID_XIROKU_CSR2) },
|
|
|
@@ -232,4 +272,304 @@ index e50887a6d22c..4ce18f21a141 100644
|
|
|
{ .driver_data = MT_CLS_GOOGLE,
|
|
|
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
|
|
--
|
|
|
-2.49.0
|
|
|
+2.50.0
|
|
|
+
|
|
|
+From 4f5ba1c992de1e614aa8dea5412f4835da545a7e Mon Sep 17 00:00:00 2001
|
|
|
+From: PJungkamp <p.jungkamp@gmail.com>
|
|
|
+Date: Fri, 25 Feb 2022 12:04:25 +0100
|
|
|
+Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet
|
|
|
+ switch
|
|
|
+
|
|
|
+The Surface Pro Type Cover has several non standard HID usages in it's
|
|
|
+hid report descriptor.
|
|
|
+I noticed that, upon folding the typecover back, a vendor specific range
|
|
|
+of 4 32 bit integer hid usages is transmitted.
|
|
|
+Only the first byte of the message seems to convey reliable information
|
|
|
+about the keyboard state.
|
|
|
+
|
|
|
+0x22 => Normal (keys enabled)
|
|
|
+0x33 => Folded back (keys disabled)
|
|
|
+0x53 => Rotated left/right side up (keys disabled)
|
|
|
+0x13 => Cover closed (keys disabled)
|
|
|
+0x43 => Folded back and Tablet upside down (keys disabled)
|
|
|
+This list may not be exhaustive.
|
|
|
+
|
|
|
+The tablet mode switch will be disabled for a value of 0x22 and enabled
|
|
|
+on any other value.
|
|
|
+
|
|
|
+Patchset: surface-typecover
|
|
|
+---
|
|
|
+ drivers/hid/hid-multitouch.c | 148 +++++++++++++++++++++++++++++------
|
|
|
+ 1 file changed, 122 insertions(+), 26 deletions(-)
|
|
|
+
|
|
|
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
|
|
+index 41017a552681..e1ce20b3bb8f 100644
|
|
|
+--- a/drivers/hid/hid-multitouch.c
|
|
|
++++ b/drivers/hid/hid-multitouch.c
|
|
|
+@@ -78,6 +78,7 @@ MODULE_LICENSE("GPL");
|
|
|
+ #define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
|
|
+ #define MT_QUIRK_ORIENTATION_INVERT BIT(22)
|
|
|
+ #define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(23)
|
|
|
++#define MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH BIT(24)
|
|
|
+
|
|
|
+ #define MT_INPUTMODE_TOUCHSCREEN 0x02
|
|
|
+ #define MT_INPUTMODE_TOUCHPAD 0x03
|
|
|
+@@ -85,6 +86,8 @@ MODULE_LICENSE("GPL");
|
|
|
+ #define MT_BUTTONTYPE_CLICKPAD 0
|
|
|
+
|
|
|
+ #define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
|
|
++#define MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE 0xff050072
|
|
|
++#define MS_TYPE_COVER_APPLICATION 0xff050050
|
|
|
+
|
|
|
+ enum latency_mode {
|
|
|
+ HID_LATENCY_NORMAL = 0,
|
|
|
+@@ -422,6 +425,7 @@ static const struct mt_class mt_classes[] = {
|
|
|
+ },
|
|
|
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
|
|
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
|
|
++ MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH |
|
|
|
+ MT_QUIRK_ALWAYS_VALID |
|
|
|
+ MT_QUIRK_IGNORE_DUPLICATES |
|
|
|
+ MT_QUIRK_HOVERING |
|
|
|
+@@ -1403,6 +1407,9 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
|
+ field->application != HID_CP_CONSUMER_CONTROL &&
|
|
|
+ field->application != HID_GD_WIRELESS_RADIO_CTLS &&
|
|
|
+ field->application != HID_GD_SYSTEM_MULTIAXIS &&
|
|
|
++ !(field->application == MS_TYPE_COVER_APPLICATION &&
|
|
|
++ application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
|
|
++ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) &&
|
|
|
+ !(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
|
|
|
+ application->quirks & MT_QUIRK_ASUS_CUSTOM_UP))
|
|
|
+ return -1;
|
|
|
+@@ -1430,6 +1437,21 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
++ /*
|
|
|
++ * The Microsoft Surface Pro Typecover has a non-standard HID
|
|
|
++ * tablet mode switch on a vendor specific usage page with vendor
|
|
|
++ * specific usage.
|
|
|
++ */
|
|
|
++ if (field->application == MS_TYPE_COVER_APPLICATION &&
|
|
|
++ application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
|
|
++ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) {
|
|
|
++ usage->type = EV_SW;
|
|
|
++ usage->code = SW_TABLET_MODE;
|
|
|
++ *max = SW_MAX;
|
|
|
++ *bit = hi->input->swbit;
|
|
|
++ return 1;
|
|
|
++ }
|
|
|
++
|
|
|
+ if (rdata->is_mt_collection)
|
|
|
+ return mt_touch_input_mapping(hdev, hi, field, usage, bit, max,
|
|
|
+ application);
|
|
|
+@@ -1451,6 +1473,7 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
|
|
|
+ {
|
|
|
+ struct mt_device *td = hid_get_drvdata(hdev);
|
|
|
+ struct mt_report_data *rdata;
|
|
|
++ struct input_dev *input;
|
|
|
+
|
|
|
+ rdata = mt_find_report_data(td, field->report);
|
|
|
+ if (rdata && rdata->is_mt_collection) {
|
|
|
+@@ -1458,6 +1481,19 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+
|
|
|
++ /*
|
|
|
++ * We own an input device which acts as a tablet mode switch for
|
|
|
++ * the Surface Pro Typecover.
|
|
|
++ */
|
|
|
++ if (field->application == MS_TYPE_COVER_APPLICATION &&
|
|
|
++ rdata->application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
|
|
++ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) {
|
|
|
++ input = hi->input;
|
|
|
++ input_set_capability(input, EV_SW, SW_TABLET_MODE);
|
|
|
++ input_report_switch(input, SW_TABLET_MODE, 0);
|
|
|
++ return -1;
|
|
|
++ }
|
|
|
++
|
|
|
+ /* let hid-core decide for the others */
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+@@ -1467,11 +1503,21 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
|
|
|
+ {
|
|
|
+ struct mt_device *td = hid_get_drvdata(hid);
|
|
|
+ struct mt_report_data *rdata;
|
|
|
++ struct input_dev *input;
|
|
|
+
|
|
|
+ rdata = mt_find_report_data(td, field->report);
|
|
|
+ if (rdata && rdata->is_mt_collection)
|
|
|
+ return mt_touch_event(hid, field, usage, value);
|
|
|
+
|
|
|
++ if (field->application == MS_TYPE_COVER_APPLICATION &&
|
|
|
++ rdata->application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
|
|
++ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) {
|
|
|
++ input = field->hidinput->input;
|
|
|
++ input_report_switch(input, SW_TABLET_MODE, (value & 0xFF) != 0x22);
|
|
|
++ input_sync(input);
|
|
|
++ return 1;
|
|
|
++ }
|
|
|
++
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+@@ -1646,6 +1692,42 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app)
|
|
|
+ app->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;
|
|
|
+ }
|
|
|
+
|
|
|
++static int get_type_cover_field(struct hid_report_enum *rep_enum,
|
|
|
++ struct hid_field **field, int usage)
|
|
|
++{
|
|
|
++ struct hid_report *rep;
|
|
|
++ struct hid_field *cur_field;
|
|
|
++ int i, j;
|
|
|
++
|
|
|
++ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
|
|
++ for (i = 0; i < rep->maxfield; i++) {
|
|
|
++ cur_field = rep->field[i];
|
|
|
++ if (cur_field->application != MS_TYPE_COVER_APPLICATION)
|
|
|
++ continue;
|
|
|
++ for (j = 0; j < cur_field->maxusage; j++) {
|
|
|
++ if (cur_field->usage[j].hid == usage) {
|
|
|
++ *field = cur_field;
|
|
|
++ return true;
|
|
|
++ }
|
|
|
++ }
|
|
|
++ }
|
|
|
++ }
|
|
|
++ return false;
|
|
|
++}
|
|
|
++
|
|
|
++static void request_type_cover_tablet_mode_switch(struct hid_device *hdev)
|
|
|
++{
|
|
|
++ struct hid_field *field;
|
|
|
++
|
|
|
++ if (get_type_cover_field(&hdev->report_enum[HID_INPUT_REPORT],
|
|
|
++ &field,
|
|
|
++ MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE)) {
|
|
|
++ hid_hw_request(hdev, field->report, HID_REQ_GET_REPORT);
|
|
|
++ } else {
|
|
|
++ hid_err(hdev, "couldn't find tablet mode field\n");
|
|
|
++ }
|
|
|
++}
|
|
|
++
|
|
|
+ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
|
|
+ {
|
|
|
+ struct mt_device *td = hid_get_drvdata(hdev);
|
|
|
+@@ -1694,6 +1776,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
|
|
+ /* force BTN_STYLUS to allow tablet matching in udev */
|
|
|
+ __set_bit(BTN_STYLUS, hi->input->keybit);
|
|
|
+ break;
|
|
|
++ case MS_TYPE_COVER_APPLICATION:
|
|
|
++ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH) {
|
|
|
++ suffix = "Tablet Mode Switch";
|
|
|
++ request_type_cover_tablet_mode_switch(hdev);
|
|
|
++ break;
|
|
|
++ }
|
|
|
++ fallthrough;
|
|
|
+ default:
|
|
|
+ suffix = "UNKNOWN";
|
|
|
+ break;
|
|
|
+@@ -1779,30 +1868,6 @@ static void mt_expired_timeout(struct timer_list *t)
|
|
|
+ clear_bit_unlock(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
|
|
+ }
|
|
|
+
|
|
|
+-static void get_type_cover_backlight_field(struct hid_device *hdev,
|
|
|
+- struct hid_field **field)
|
|
|
+-{
|
|
|
+- struct hid_report_enum *rep_enum;
|
|
|
+- struct hid_report *rep;
|
|
|
+- struct hid_field *cur_field;
|
|
|
+- int i, j;
|
|
|
+-
|
|
|
+- rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
|
|
+- list_for_each_entry(rep, &rep_enum->report_list, list) {
|
|
|
+- for (i = 0; i < rep->maxfield; i++) {
|
|
|
+- cur_field = rep->field[i];
|
|
|
+-
|
|
|
+- for (j = 0; j < cur_field->maxusage; j++) {
|
|
|
+- if (cur_field->usage[j].hid
|
|
|
+- == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
|
|
+- *field = cur_field;
|
|
|
+- return;
|
|
|
+- }
|
|
|
+- }
|
|
|
+- }
|
|
|
+- }
|
|
|
+-}
|
|
|
+-
|
|
|
+ static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
|
|
+ {
|
|
|
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
|
|
+@@ -1811,8 +1876,9 @@ static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
|
|
+ /* Wake up the device in case it's already suspended */
|
|
|
+ pm_runtime_get_sync(&udev->dev);
|
|
|
+
|
|
|
+- get_type_cover_backlight_field(hdev, &field);
|
|
|
+- if (!field) {
|
|
|
++ if (!get_type_cover_field(&hdev->report_enum[HID_FEATURE_REPORT],
|
|
|
++ &field,
|
|
|
++ MS_TYPE_COVER_FEATURE_REPORT_USAGE)) {
|
|
|
+ hid_err(hdev, "couldn't find backlight field\n");
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
+@@ -1949,13 +2015,24 @@ static int mt_suspend(struct hid_device *hdev, pm_message_t state)
|
|
|
+
|
|
|
+ static int mt_reset_resume(struct hid_device *hdev)
|
|
|
+ {
|
|
|
++ struct mt_device *td = hid_get_drvdata(hdev);
|
|
|
++
|
|
|
+ mt_release_contacts(hdev);
|
|
|
+ mt_set_modes(hdev, HID_LATENCY_NORMAL, TOUCHPAD_REPORT_ALL);
|
|
|
++
|
|
|
++ /* Request an update on the typecover folding state on resume
|
|
|
++ * after reset.
|
|
|
++ */
|
|
|
++ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH)
|
|
|
++ request_type_cover_tablet_mode_switch(hdev);
|
|
|
++
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ static int mt_resume(struct hid_device *hdev)
|
|
|
+ {
|
|
|
++ struct mt_device *td = hid_get_drvdata(hdev);
|
|
|
++
|
|
|
+ /* Some Elan legacy devices require SET_IDLE to be set on resume.
|
|
|
+ * It should be safe to send it to other devices too.
|
|
|
+ * Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */
|
|
|
+@@ -1964,12 +2041,31 @@ static int mt_resume(struct hid_device *hdev)
|
|
|
+
|
|
|
+ mt_set_modes(hdev, HID_LATENCY_NORMAL, TOUCHPAD_REPORT_ALL);
|
|
|
+
|
|
|
++ /* Request an update on the typecover folding state on resume. */
|
|
|
++ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH)
|
|
|
++ request_type_cover_tablet_mode_switch(hdev);
|
|
|
++
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ static void mt_remove(struct hid_device *hdev)
|
|
|
+ {
|
|
|
+ struct mt_device *td = hid_get_drvdata(hdev);
|
|
|
++ struct hid_field *field;
|
|
|
++ struct input_dev *input;
|
|
|
++
|
|
|
++ /* Reset tablet mode switch on disconnect. */
|
|
|
++ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH) {
|
|
|
++ if (get_type_cover_field(&hdev->report_enum[HID_INPUT_REPORT],
|
|
|
++ &field,
|
|
|
++ MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE)) {
|
|
|
++ input = field->hidinput->input;
|
|
|
++ input_report_switch(input, SW_TABLET_MODE, 0);
|
|
|
++ input_sync(input);
|
|
|
++ } else {
|
|
|
++ hid_err(hdev, "couldn't find tablet mode field\n");
|
|
|
++ }
|
|
|
++ }
|
|
|
+
|
|
|
+ unregister_pm_notifier(&td->pm_notifier);
|
|
|
+ timer_delete_sync(&td->release_timer);
|
|
|
+--
|
|
|
+2.50.0
|
|
|
+
|
Maximilian Luz