From: Hans de Goede <hidden> Date: 2021-03-06 13:38:28
There is no need to use a quirk and then return -ENODEV from the
asus_probe() function to avoid that hid-asus binds to the hiddev
for the USB-interface for the hid-multitouch touchpad.
The hid-multitouch hiddev has a group of HID_GROUP_MULTITOUCH_WIN_8,
so the same result can be achieved by making the hid_device_id entry
for the dock in the asus_devices[] table only match on HID_GROUP_GENERIC
instead of having it match HID_GROUP_ANY.
Signed-off-by: Hans de Goede <redacted>
---
drivers/hid/hid-asus.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
From: Hans de Goede <hidden> Date: 2021-03-06 13:38:28
Disable event reporting on suspend when our parent is not
a wakeup-source. This should help save some extra power in
this case.
Signed-off-by: Hans de Goede <redacted>
---
drivers/hid/Kconfig | 2 +-
drivers/hid/hid-multitouch.c | 23 ++++++++++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
@@ -1759,12 +1759,33 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)}#ifdef CONFIG_PM++/* Check if the parent which has the power/wakeup* sysfs attributes may wake the hdev */+staticboolmt_parent_may_wake(structhid_device*hdev)+{+structdevice*parent=hdev->dev.parent;++/*+*USB-HIDisattachedtotheusb_interface(ourparent),the+*power/wakeup*attrarepartoftheusb-devicewhichisitsparent.+*/+if(hid_is_using_ll_driver(hdev,&usb_hid_driver)&&parent)+parent=parent->parent;++if(parent)+returndevice_may_wakeup(parent);++/* Huh? Play it safe and keep reporting events. */+returntrue;+}+staticintmt_suspend(structhid_device*hdev,pm_message_tstate){structmt_device*td=hid_get_drvdata(hdev);/* High latency is desirable for power savings during S3/S0ix */-if(td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)+if((td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)||+!mt_parent_may_wake(hdev))mt_set_modes(hdev,HID_LATENCY_HIGH,false,false);elsemt_set_modes(hdev,HID_LATENCY_HIGH,true,true);
From: Hans de Goede <hidden> Date: 2021-03-06 13:38:28
The Asus T101HA has a problem with spurious wakeups when the lid is
closed, this is caused by the screen sitting so close to the touchpad
that the touchpad ends up reporting touch events, causing these wakeups.
Add a quirk which disables event reporting on suspend when set, and
enable this quirk for the Asus T101HA touchpad fixing the spurious
wakeups, while still allowing the device to be woken by pressing a
key on the keyboard (which is part of the same USB device).
Signed-off-by: Hans de Goede <redacted>
---
drivers/hid/hid-multitouch.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
@@ -1749,8 +1761,14 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)#ifdef CONFIG_PMstaticintmt_suspend(structhid_device*hdev,pm_message_tstate){+structmt_device*td=hid_get_drvdata(hdev);+/* High latency is desirable for power savings during S3/S0ix */-mt_set_modes(hdev,HID_LATENCY_HIGH,true,true);+if(td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)+mt_set_modes(hdev,HID_LATENCY_HIGH,false,false);+else+mt_set_modes(hdev,HID_LATENCY_HIGH,true,true);+return0;}
@@ -1809,6 +1827,12 @@ static const struct hid_device_id mt_devices[] = {MT_USB_DEVICE(USB_VENDOR_ID_ANTON,USB_DEVICE_ID_ANTON_TOUCH_PAD)},+/* Asus T101HA */+{.driver_data=MT_CLS_WIN_8_DISABLE_WAKEUP,+HID_DEVICE(BUS_USB,HID_GROUP_MULTITOUCH_WIN_8,+USB_VENDOR_ID_ASUSTEK,+USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD)},+/* Asus T304UA */{.driver_data=MT_CLS_ASUS,HID_DEVICE(BUS_USB,HID_GROUP_MULTITOUCH_WIN_8,
There is no need to use a quirk and then return -ENODEV from the
asus_probe() function to avoid that hid-asus binds to the hiddev
for the USB-interface for the hid-multitouch touchpad.
The hid-multitouch hiddev has a group of HID_GROUP_MULTITOUCH_WIN_8,
so the same result can be achieved by making the hid_device_id entry
for the dock in the asus_devices[] table only match on HID_GROUP_GENERIC
instead of having it match HID_GROUP_ANY.
Benjamin, could you please Ack this series, as it touches hid-multitouch,
please?
Thanks,
--
Jiri Kosina
SUSE Labs
There is no need to use a quirk and then return -ENODEV from the
asus_probe() function to avoid that hid-asus binds to the hiddev
for the USB-interface for the hid-multitouch touchpad.
The hid-multitouch hiddev has a group of HID_GROUP_MULTITOUCH_WIN_8,
so the same result can be achieved by making the hid_device_id entry
for the dock in the asus_devices[] table only match on HID_GROUP_GENERIC
instead of having it match HID_GROUP_ANY.
Benjamin, could you please Ack this series, as it touches hid-multitouch,
please?
Benjamin, friendly ping on this one.
Thanks,
--
Jiri Kosina
SUSE Labs
From: Benjamin Tissoires <hidden> Date: 2021-05-05 13:36:20
On Wed, May 5, 2021 at 2:24 PM Jiri Kosina [off-list ref] wrote:
On Wed, 31 Mar 2021, Jiri Kosina wrote:
quoted
quoted
There is no need to use a quirk and then return -ENODEV from the
asus_probe() function to avoid that hid-asus binds to the hiddev
for the USB-interface for the hid-multitouch touchpad.
The hid-multitouch hiddev has a group of HID_GROUP_MULTITOUCH_WIN_8,
so the same result can be achieved by making the hid_device_id entry
for the dock in the asus_devices[] table only match on HID_GROUP_GENERIC
instead of having it match HID_GROUP_ANY.
Benjamin, could you please Ack this series, as it touches hid-multitouch,
please?
Benjamin, friendly ping on this one.
Sorry for being such a bad co-maintainer... :(
This one completely fell through the cracks.
I have no objections for 1/3 and 2/3. I'll comment on 3/3.
Cheers,
Benjamin
From: Benjamin Tissoires <hidden> Date: 2021-05-05 13:40:46
Hi Hans,
On Sat, Mar 6, 2021 at 2:37 PM Hans de Goede [off-list ref] wrote:
quoted hunk
Disable event reporting on suspend when our parent is not
a wakeup-source. This should help save some extra power in
this case.
Signed-off-by: Hans de Goede <redacted>
---
drivers/hid/Kconfig | 2 +-
drivers/hid/hid-multitouch.c | 23 ++++++++++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
I tried really hard during the past 8 years to not have a usbhid
dependency on hid-multitouch.
The code below should not break the test suite, but still I am not
that happy about the Kconfig change.
I don't see an immediate and better way of doing what you are
achieving here, but maybe you have some magic I did not think about
that would help to no pull USB_HID with HID_MULTITOUCH.
FTR, I think the use case of hid-multitouch *without* USB is rather
non-existent, but there might be some weird systems with I2C only
(edge computing?).
Cheers,
Benjamin
@@ -1759,12 +1759,33 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)}#ifdef CONFIG_PM++/* Check if the parent which has the power/wakeup* sysfs attributes may wake the hdev */+staticboolmt_parent_may_wake(structhid_device*hdev)+{+structdevice*parent=hdev->dev.parent;++/*+*USB-HIDisattachedtotheusb_interface(ourparent),the+*power/wakeup*attrarepartoftheusb-devicewhichisitsparent.+*/+if(hid_is_using_ll_driver(hdev,&usb_hid_driver)&&parent)+parent=parent->parent;++if(parent)+returndevice_may_wakeup(parent);++/* Huh? Play it safe and keep reporting events. */+returntrue;+}+staticintmt_suspend(structhid_device*hdev,pm_message_tstate){structmt_device*td=hid_get_drvdata(hdev);/* High latency is desirable for power savings during S3/S0ix */-if(td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)+if((td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)||+!mt_parent_may_wake(hdev))mt_set_modes(hdev,HID_LATENCY_HIGH,false,false);elsemt_set_modes(hdev,HID_LATENCY_HIGH,true,true);--
From: Hans de Goede <hidden> Date: 2021-05-05 14:00:05
Hi,
On 5/5/21 3:40 PM, Benjamin Tissoires wrote:
Hi Hans,
On Sat, Mar 6, 2021 at 2:37 PM Hans de Goede [off-list ref] wrote:
quoted
Disable event reporting on suspend when our parent is not
a wakeup-source. This should help save some extra power in
this case.
Signed-off-by: Hans de Goede <redacted>
---
drivers/hid/Kconfig | 2 +-
drivers/hid/hid-multitouch.c | 23 ++++++++++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
I tried really hard during the past 8 years to not have a usbhid
dependency on hid-multitouch.
The code below should not break the test suite, but still I am not
that happy about the Kconfig change.
I don't see an immediate and better way of doing what you are
achieving here, but maybe you have some magic I did not think about
that would help to no pull USB_HID with HID_MULTITOUCH.
FTR, I think the use case of hid-multitouch *without* USB is rather
non-existent, but there might be some weird systems with I2C only
(edge computing?).
Interesting how you often manage to pick out the bits of patches
which I'm not 100% happy with myself either. I was thinking the
same thing myself.
We have this: "hid_is_using_ll_driver(hdev, &usb_hid_driver)" check
in various drivers under drivers/hid and so far the dependency fix
of adding a "depends on USB_HID" was not pretty but ok, because it
would be weird to enable those HID drivers on a system without
USB_HID being enabled. But I agree with you that hid-multitouch
is different. So I did try to come up with something better and
failed.
But now that I look at this with fresh eyes I think I see a
nice solution for this.
I propose to add a hid_is_usb_device() helper which is defined
in hid-core.c (1) and this helper would look like this:
bool hid_is_usb_device(struct hid_device *hid)
{
#if IS_ENABLED(CONFIG_USB_HID)
return hid_is_using_ll_driver(hid, &usb_hid_driver);
#else
return false;
#endif
}
And then I can use this helper function instead of directly doing
the hid_is_using_ll_driver() check in hid-multitouch.c fixing
this dependency ugliness.
1) hid-core.c is controlled by CONFIG_HID which gets selected at
the Kconfig level by CONFIG_USB_HID so there is no chance of
builtin vs module issues.
As an added bonus I can then also do a follow-up patch-set to
remove more depends on USB_HID stuff by switching to the helper
in other places too.
###
Unrelated but something else which I was wondering about while
working on this patch.
I think that it might also be useful to change the
mt_parent_may_wake() helper introduced here into a generic
hid_parent_may_wakeup() helper in case we need a similar thing
in other places. I decided it may be best to do that once we
have a second driver needing such a check, but since we're
discussing this anyways, what is your opinion on this ?
Regards,
Hans
@@ -1759,12 +1759,33 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)}#ifdef CONFIG_PM++/* Check if the parent which has the power/wakeup* sysfs attributes may wake the hdev */+staticboolmt_parent_may_wake(structhid_device*hdev)+{+structdevice*parent=hdev->dev.parent;++/*+*USB-HIDisattachedtotheusb_interface(ourparent),the+*power/wakeup*attrarepartoftheusb-devicewhichisitsparent.+*/+if(hid_is_using_ll_driver(hdev,&usb_hid_driver)&&parent)+parent=parent->parent;++if(parent)+returndevice_may_wakeup(parent);++/* Huh? Play it safe and keep reporting events. */+returntrue;+}+staticintmt_suspend(structhid_device*hdev,pm_message_tstate){structmt_device*td=hid_get_drvdata(hdev);/* High latency is desirable for power savings during S3/S0ix */-if(td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)+if((td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)||+!mt_parent_may_wake(hdev))mt_set_modes(hdev,HID_LATENCY_HIGH,false,false);elsemt_set_modes(hdev,HID_LATENCY_HIGH,true,true);--
From: Benjamin Tissoires <hidden> Date: 2021-05-05 14:09:59
On Wed, May 5, 2021 at 4:00 PM Hans de Goede [off-list ref] wrote:
Hi,
On 5/5/21 3:40 PM, Benjamin Tissoires wrote:
quoted
Hi Hans,
On Sat, Mar 6, 2021 at 2:37 PM Hans de Goede [off-list ref] wrote:
quoted
Disable event reporting on suspend when our parent is not
a wakeup-source. This should help save some extra power in
this case.
Signed-off-by: Hans de Goede <redacted>
---
drivers/hid/Kconfig | 2 +-
drivers/hid/hid-multitouch.c | 23 ++++++++++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
I tried really hard during the past 8 years to not have a usbhid
dependency on hid-multitouch.
The code below should not break the test suite, but still I am not
that happy about the Kconfig change.
I don't see an immediate and better way of doing what you are
achieving here, but maybe you have some magic I did not think about
that would help to no pull USB_HID with HID_MULTITOUCH.
FTR, I think the use case of hid-multitouch *without* USB is rather
non-existent, but there might be some weird systems with I2C only
(edge computing?).
Interesting how you often manage to pick out the bits of patches
which I'm not 100% happy with myself either. I was thinking the
same thing myself.
:)
We have this: "hid_is_using_ll_driver(hdev, &usb_hid_driver)" check
in various drivers under drivers/hid and so far the dependency fix
of adding a "depends on USB_HID" was not pretty but ok, because it
would be weird to enable those HID drivers on a system without
USB_HID being enabled. But I agree with you that hid-multitouch
is different. So I did try to come up with something better and
failed.
But now that I look at this with fresh eyes I think I see a
nice solution for this.
I propose to add a hid_is_usb_device() helper which is defined
in hid-core.c (1) and this helper would look like this:
bool hid_is_usb_device(struct hid_device *hid)
{
#if IS_ENABLED(CONFIG_USB_HID)
return hid_is_using_ll_driver(hid, &usb_hid_driver);
#else
return false;
#endif
}
And then I can use this helper function instead of directly doing
the hid_is_using_ll_driver() check in hid-multitouch.c fixing
this dependency ugliness.
1) hid-core.c is controlled by CONFIG_HID which gets selected at
the Kconfig level by CONFIG_USB_HID so there is no chance of
builtin vs module issues.
OK, sounds good enough to me. The one thing I dislike about IS_ENABLED
is that it is not very friendly with out of the tree modules. But
here, I guess if you have a system without CONFIG_USB_HID, you will
probably never need to enable it without recompiling your tree.
So ack by me.
As an added bonus I can then also do a follow-up patch-set to
remove more depends on USB_HID stuff by switching to the helper
in other places too.
That would be wonderful :)
###
Unrelated but something else which I was wondering about while
working on this patch.
I think that it might also be useful to change the
mt_parent_may_wake() helper introduced here into a generic
hid_parent_may_wakeup() helper in case we need a similar thing
in other places. I decided it may be best to do that once we
have a second driver needing such a check, but since we're
discussing this anyways, what is your opinion on this ?
I can definitely see the benefit of it, but OTOH, I would stick to
your first approach. If we are just needing it for one driver, we
probably want to keep it local to this one driver.
Cheers,
Benjamin
@@ -1759,12 +1759,33 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)}#ifdef CONFIG_PM++/* Check if the parent which has the power/wakeup* sysfs attributes may wake the hdev */+staticboolmt_parent_may_wake(structhid_device*hdev)+{+structdevice*parent=hdev->dev.parent;++/*+*USB-HIDisattachedtotheusb_interface(ourparent),the+*power/wakeup*attrarepartoftheusb-devicewhichisitsparent.+*/+if(hid_is_using_ll_driver(hdev,&usb_hid_driver)&&parent)+parent=parent->parent;++if(parent)+returndevice_may_wakeup(parent);++/* Huh? Play it safe and keep reporting events. */+returntrue;+}+staticintmt_suspend(structhid_device*hdev,pm_message_tstate){structmt_device*td=hid_get_drvdata(hdev);/* High latency is desirable for power savings during S3/S0ix */-if(td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)+if((td->mtclass.quirks&MT_QUIRK_DISABLE_WAKEUP)||+!mt_parent_may_wake(hdev))mt_set_modes(hdev,HID_LATENCY_HIGH,false,false);elsemt_set_modes(hdev,HID_LATENCY_HIGH,true,true);--
There is no need to use a quirk and then return -ENODEV from the
asus_probe() function to avoid that hid-asus binds to the hiddev
for the USB-interface for the hid-multitouch touchpad.
The hid-multitouch hiddev has a group of HID_GROUP_MULTITOUCH_WIN_8,
so the same result can be achieved by making the hid_device_id entry
for the dock in the asus_devices[] table only match on HID_GROUP_GENERIC
instead of having it match HID_GROUP_ANY.
Signed-off-by: Hans de Goede <redacted>
Applied to for-5.13/upstream-fixes.
--
Jiri Kosina
SUSE Labs
The Asus T101HA has a problem with spurious wakeups when the lid is
closed, this is caused by the screen sitting so close to the touchpad
that the touchpad ends up reporting touch events, causing these wakeups.
Add a quirk which disables event reporting on suspend when set, and
enable this quirk for the Asus T101HA touchpad fixing the spurious
wakeups, while still allowing the device to be woken by pressing a
key on the keyboard (which is part of the same USB device).
This one also applied to for-5.13/upstream-fixes. Thanks,
--
Jiri Kosina
SUSE Labs