Revert "HID: logitech-hidpp: add a module parameter to keep firmware gestures"
Subsystems (3)
Bastien Nocera
reviewerPATCH v2 1/3 Revert "HID: logitech-hidpp: add a module parameter to keep firmware gestures"
Now that we're in 2022, and the majority of desktop environments can and should support touchpad gestures through libinput, remove the legacy module parameter that made it possible to use gestures implemented in firmware.
This will eventually allow simplifying the driver's initialisation code.
This reverts commit 9188dbaed68a4b23dc96eba165265c08caa7dc2a.
--- drivers/hid/hid-logitech-hidpp.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/hid/hid-logitech-hidpp.c +0 -10
@@ -32,11 +32,6 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Benjamin Tissoires <[email protected]>" );MODULE_AUTHOR ("Nestor Lopez Casado <[email protected]>" ); -static bool disable_raw_mode; -module_param (disable_raw_mode, bool,0644 ); -MODULE_PARM_DESC (disable_raw_mode, -"Disable Raw mode reporting for touchpads and keep firmware gestures." ); -static bool disable_tap_to_click;module_param (disable_tap_to_click, bool,0644 ); MODULE_PARM_DESC(disable_tap_to_click,
@@ -4355,11 +4350,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) hidpp_application_equals(hdev, HID_GD_KEYBOARD)) hidpp->quirks |= HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS; -if (disable_raw_mode) { - hidpp->quirks &= ~HIDPP_QUIRK_CLASS_WTP ; - hidpp->quirks &= ~HIDPP_QUIRK_NO_HIDINPUT ; - } -if (hidpp->quirks &HIDPP_QUIRK_CLASS_WTP ) { ret =wtp_allocate (hdev, id);if (ret)
Signature · 1 line
2.38.1
Bastien Nocera
reviewerPATCH v2 2/3 HID: logitech-hidpp: Don't restart communication if not necessary
Don't stop and restart communication with the device unless we need to modify the connect flags used because of a device quirk.
--- drivers/hid/hid-logitech-hidpp.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
drivers/hid/hid-logitech-hidpp.c +19 -12
@@ -4310,6 +4310,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)bool connected;unsigned int connect_mask =HID_CONNECT_DEFAULT ;struct hidpp_ff_private_data data; +bool will_restart = false;/* report_fixup needs drvdata to be set before we call hid_parse */ hidpp =devm_kzalloc (&hdev->dev,sizeof (*hidpp),GFP_KERNEL );
@@ -4360,6 +4361,9 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)return ret; } +if (hidpp->quirks &HIDPP_QUIRK_DELAYED_INIT ) + will_restart = true; +INIT_WORK (&hidpp->work, delayed_work_cb);mutex_init (&hidpp->send_mutex);init_waitqueue_head (&hidpp->wait);
@@ -4374,7 +4378,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)* Plain USB connections need to actually call start and open * on the transport driver to allow incoming data. */ - ret =hid_hw_start (hdev,0 ); + ret =hid_hw_start (hdev, will_restart ?0 : connect_mask);if (ret) {hid_err (hdev,"hw start failed\n" ); goto hid_hw_start_fail;
@@ -4411,6 +4415,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) hidpp->wireless_feature_index =0 ; else if (ret) goto hid_hw_init_fail; + ret = 0; }if (connected && (hidpp->quirks &HIDPP_QUIRK_CLASS_WTP )) {
@@ -4425,19 +4430,21 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)hidpp_connect_event (hidpp); -/* Reset the HID node state */ -hid_device_io_stop (hdev); -hid_hw_close (hdev); -hid_hw_stop (hdev); +if (will_restart) { +/* Reset the HID node state */ +hid_device_io_stop (hdev); +hid_hw_close (hdev); +hid_hw_stop (hdev); -if (hidpp->quirks &HIDPP_QUIRK_NO_HIDINPUT ) - connect_mask &= ~HID_CONNECT_HIDINPUT ; +if (hidpp->quirks &HIDPP_QUIRK_NO_HIDINPUT ) + connect_mask &= ~HID_CONNECT_HIDINPUT ; -/* Now export the actual inputs and hidraw nodes to the world */ - ret =hid_hw_start (hdev, connect_mask); -if (ret) { -hid_err (hdev,"%s:hid_hw_start returned error\n" , __func__); - goto hid_hw_start_fail; +/* Now export the actual inputs and hidraw nodes to the world */ + ret =hid_hw_start (hdev, connect_mask); +if (ret) { +hid_err (hdev,"%s:hid_hw_start returned error\n" , __func__); + goto hid_hw_start_fail; + } }if (hidpp->quirks &HIDPP_QUIRK_CLASS_G920 ) {
Signature · 1 line
2.38.1
Bastien Nocera
reviewerPATCH v2 3/3 HID: logitech-hidpp: Remove HIDPP_QUIRK_NO_HIDINPUT quirk
In reply to Bastien NoceraHIDPP_QUIRK_NO_HIDINPUT isn't used by any devices but still happens to work as HIDPP_QUIRK_DELAYED_INIT is defined to the same value. Remove HIDPP_QUIRK_NO_HIDINPUT and use HIDPP_QUIRK_DELAYED_INIT everywhere instead.
Tested on a T650 which requires that quirk, and a number of unifying and Bluetooth devices that don't.
--- drivers/hid/hid-logitech-hidpp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/hid/hid-logitech-hidpp.c +3 -5
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(disable_tap_to_click,/* bits 2..20 are reserved for classes */ /* #define HIDPP_QUIRK_CONNECT_EVENTS BIT(21) disabled */ #define HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS BIT(22) -#define HIDPP_QUIRK_NO_HIDINPUT BIT(23) +#define HIDPP_QUIRK_DELAYED_INIT BIT(23)#define HIDPP_QUIRK_FORCE_OUTPUT_REPORTS BIT(24)#define HIDPP_QUIRK_UNIFYING BIT(25)#define HIDPP_QUIRK_HIDPP_WHEELS BIT(26)
@@ -83,8 +83,6 @@ MODULE_PARM_DESC(disable_tap_to_click, HIDPP_CAPABILITY_HIDPP20_HI_RES_SCROLL | \ HIDPP_CAPABILITY_HIDPP20_HI_RES_WHEEL) -#define HIDPP_QUIRK_DELAYED_INIT HIDPP_QUIRK_NO_HIDINPUT -#define HIDPP_CAPABILITY_HIDPP10_BATTERY BIT(0)#define HIDPP_CAPABILITY_HIDPP20_BATTERY BIT(1)#define HIDPP_CAPABILITY_BATTERY_MILEAGE BIT(2)
@@ -4205,7 +4203,7 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)if (hidpp->capabilities &HIDPP_CAPABILITY_HI_RES_SCROLL )hi_res_scroll_enable (hidpp); -if (!(hidpp->quirks &HIDPP_QUIRK_NO_HIDINPUT ) || hidpp->delayed_input) +if (!(hidpp->quirks &HIDPP_QUIRK_DELAYED_INIT ) || hidpp->delayed_input)/* if the input nodes are already created, we can stop now */ return ;
@@ -4436,7 +4434,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)hid_hw_close (hdev);hid_hw_stop (hdev); -if (hidpp->quirks &HIDPP_QUIRK_NO_HIDINPUT ) +if (hidpp->quirks &HIDPP_QUIRK_DELAYED_INIT ) connect_mask &= ~HID_CONNECT_HIDINPUT ;/* Now export the actual inputs and hidraw nodes to the world */
Signature · 1 line
2.38.1
Quoted 11 lines · Bastien Nocera
Now that we're in 2022, and the majority of desktop environments can and should support touchpad gestures through libinput, remove the legacy module parameter that made it possible to use gestures implemented in firmware.
This will eventually allow simplifying the driver's initialisation code.
This reverts commit
9188dbaed68a4b23dc96eba165265c08caa7dc2a.Signed-off-by Bastien Nocera <[email protected]>
Applied just this one to for-6.3/logitech
Cheers,
Benjamin
Quoted 35 lines
--- drivers/hid/hid-logitech-hidpp.c | 10 ---------- 1 file changed, 10 deletions(-)drivers/hid/hid-logitech-hidpp.c +0
-11@@ -32,11 +32,6 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Benjamin Tissoires <[email protected]>" );MODULE_AUTHOR ("Nestor Lopez Casado <[email protected]>" ); -static bool disable_raw_mode; -module_param (disable_raw_mode, bool,0644 ); -MODULE_PARM_DESC (disable_raw_mode, -"Disable Raw mode reporting for touchpads and keep firmware gestures." ); -static bool disable_tap_to_click;module_param (disable_tap_to_click, bool,0644 ); MODULE_PARM_DESC(disable_tap_to_click,@@ -4355,11 +4350,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) hidpp_application_equals(hdev, HID_GD_KEYBOARD)) hidpp->quirks |=HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS ; -if (disable_raw_mode) { - hidpp->quirks &= ~HIDPP_QUIRK_CLASS_WTP ; - hidpp->quirks &= ~HIDPP_QUIRK_NO_HIDINPUT ; - } -if (hidpp->quirks &HIDPP_QUIRK_CLASS_WTP ) { ret =wtp_allocate (hdev, id);if (ret) --2.38.1