[v3,1/2] HID: input: do not query XP-PEN Deco LW battery

Message ID 20221029161240.15548-2-jose.exposito89@gmail.com
State New
Headers
Series Add support for XP-PEN Deco LW |

Commit Message

José Expósito Oct. 29, 2022, 4:12 p.m. UTC
  The XP-PEN Deco LW drawing tablet can be connected by USB cable or using
a USB Bluetooth dongle. When it is connected using the dongle, there
might be a small delay until the tablet is paired with the dongle.

Fetching the device battery during this delay results in random battery
percentage values.

Add a quirk to avoid actively querying the battery percentage and wait
for the device to report it on its own.

Reported-by: Mia Kanashi <chad@redpilled.dev>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
---
 drivers/hid/hid-input.c | 6 ++++++
 1 file changed, 6 insertions(+)
  

Comments

Mia Kanashi Oct. 29, 2022, 5:34 p.m. UTC | #1
On 29 October 2022 19:12:39 EEST, "José Expósito" <jose.exposito89@gmail.com> wrote:
>The XP-PEN Deco LW drawing tablet can be connected by USB cable or using
>a USB Bluetooth dongle. When it is connected using the dongle, there
>might be a small delay until the tablet is paired with the dongle.
>
>Fetching the device battery during this delay results in random battery
>percentage values.
>
>Add a quirk to avoid actively querying the battery percentage and wait
>for the device to report it on its own.
>
>Reported-by: Mia Kanashi <chad@redpilled.dev>
>Signed-off-by: José Expósito <jose.exposito89@gmail.com>
>---
> drivers/hid/hid-input.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
>index 859aeb07542e..d728a94c642e 100644
>--- a/drivers/hid/hid-input.c
>+++ b/drivers/hid/hid-input.c
>@@ -340,6 +340,7 @@ static enum power_supply_property hidinput_battery_props[] = {
> #define HID_BATTERY_QUIRK_PERCENT	(1 << 0) /* always reports percent */
> #define HID_BATTERY_QUIRK_FEATURE	(1 << 1) /* ask for feature report */
> #define HID_BATTERY_QUIRK_IGNORE	(1 << 2) /* completely ignore the battery */
>+#define HID_BATTERY_QUIRK_AVOID_QUERY	(1 << 3) /* do not query the battery */
> 
> static const struct hid_device_id hid_battery_quirks[] = {
> 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
>@@ -373,6 +374,8 @@ static const struct hid_device_id hid_battery_quirks[] = {
> 	  HID_BATTERY_QUIRK_IGNORE },
> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN),
> 	  HID_BATTERY_QUIRK_IGNORE },
>+	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L),
>+	  HID_BATTERY_QUIRK_AVOID_QUERY },
> 	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),
> 	  HID_BATTERY_QUIRK_IGNORE },
> 	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),
>@@ -554,6 +557,9 @@ static int hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
> 	dev->battery_avoid_query = report_type == HID_INPUT_REPORT &&
> 				   field->physical == HID_DG_STYLUS;
> 
>+	if (quirks & HID_BATTERY_QUIRK_AVOID_QUERY)
>+		dev->battery_avoid_query = true;
>+
> 	dev->battery = power_supply_register(&dev->dev, psy_desc, &psy_cfg);
> 	if (IS_ERR(dev->battery)) {
> 		error = PTR_ERR(dev->battery);

I've tested this patch and now power supply status is correctly set to Unknown and capacity is set to 0 initially.

Just a note that that issue occured not only with the dongle, but a cable also.
It seems that tablet just doesn't respond to the query.

Thank you for the work!
  
José Expósito Oct. 29, 2022, 6:13 p.m. UTC | #2
Hi!

On Sat, Oct 29, 2022 at 08:34:46PM +0300, Mia Kanashi wrote:
> On 29 October 2022 19:12:39 EEST, "José Expósito" <jose.exposito89@gmail.com> wrote:
> >The XP-PEN Deco LW drawing tablet can be connected by USB cable or using
> >a USB Bluetooth dongle. When it is connected using the dongle, there
> >might be a small delay until the tablet is paired with the dongle.
> >
> >Fetching the device battery during this delay results in random battery
> >percentage values.
> >
> >Add a quirk to avoid actively querying the battery percentage and wait
> >for the device to report it on its own.
> >
> >Reported-by: Mia Kanashi <chad@redpilled.dev>
> >Signed-off-by: José Expósito <jose.exposito89@gmail.com>
> >
> > [...]
> 
> I've tested this patch and now power supply status is correctly set to Unknown and capacity is set to 0 initially.
> 
> Just a note that that issue occured not only with the dongle, but a cable also.
> It seems that tablet just doesn't respond to the query.
> 
> Thank you for the work!

Thanks a lot for testing it, I'm glad it's working :D

Jose
  
Jiri Kosina Nov. 4, 2022, 1:13 p.m. UTC | #3
On Sat, 29 Oct 2022, Mia Kanashi wrote:

> >The XP-PEN Deco LW drawing tablet can be connected by USB cable or using
> >a USB Bluetooth dongle. When it is connected using the dongle, there
> >might be a small delay until the tablet is paired with the dongle.
> >
> >Fetching the device battery during this delay results in random battery
> >percentage values.
> >
> >Add a quirk to avoid actively querying the battery percentage and wait
> >for the device to report it on its own.
> >
> >Reported-by: Mia Kanashi <chad@redpilled.dev>
> >Signed-off-by: José Expósito <jose.exposito89@gmail.com>

[ ... snip ... ]

> I've tested this patch and now power supply status is correctly set to 
> Unknown and capacity is set to 0 initially.
> 
> Just a note that that issue occured not only with the dongle, but a 
> cable also. It seems that tablet just doesn't respond to the query.
> 
> Thank you for the work!

Based on this, can I assume that I can turn

	Reported-by: Mia Kanashi <chad@redpilled.dev>

into

	Reported-and-tested-by: Mia Kanashi <chad@redpilled.dev>

for the final version?

Thanks,
  
Mia Kanashi Nov. 4, 2022, 2:47 p.m. UTC | #4
On 4 November 2022 15:13:34 EET, Jiri Kosina <jikos@kernel.org> wrote:
>Based on this, can I assume that I can turn
>
>	Reported-by: Mia Kanashi <chad@redpilled.dev>
>
>into
>
>	Reported-and-tested-by: Mia Kanashi <chad@redpilled.dev>
>
>for the final version?
>
>Thanks,

Yes, but maintainer docs don't recommend using combined tags. :)

  Please do not use combined tags, e.g. Reported-and-tested-by, 
  as they just complicate automated extraction of tags.

link: https://www.kernel.org/doc/html/latest/process/maintainer-tip.html?highlight=Reported-and-tested-by#ordering-of-commit-tags
  
José Expósito Nov. 4, 2022, 4:26 p.m. UTC | #5
On Fri, Nov 04, 2022 at 02:13:34PM +0100, Jiri Kosina wrote:
> On Sat, 29 Oct 2022, Mia Kanashi wrote:
> 
> > >The XP-PEN Deco LW drawing tablet can be connected by USB cable or using
> > >a USB Bluetooth dongle. When it is connected using the dongle, there
> > >might be a small delay until the tablet is paired with the dongle.
> > >
> > >Fetching the device battery during this delay results in random battery
> > >percentage values.
> > >
> > >Add a quirk to avoid actively querying the battery percentage and wait
> > >for the device to report it on its own.
> > >
> > >Reported-by: Mia Kanashi <chad@redpilled.dev>
> > >Signed-off-by: José Expósito <jose.exposito89@gmail.com>
> 
> [ ... snip ... ]
> 
> > I've tested this patch and now power supply status is correctly set to 
> > Unknown and capacity is set to 0 initially.
> > 
> > Just a note that that issue occured not only with the dongle, but a 
> > cable also. It seems that tablet just doesn't respond to the query.
> > 
> > Thank you for the work!
> 
> Based on this, can I assume that I can turn
> 
> 	Reported-by: Mia Kanashi <chad@redpilled.dev>
> 
> into
> 
> 	Reported-and-tested-by: Mia Kanashi <chad@redpilled.dev>
> 
> for the final version?
> 
> Thanks,
> 
> -- 
> Jiri Kosina
> SUSE Labs
> 

Thanks for adding the tags and reviewing and merging the patches Jiří!

Jose
  

Patch

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 859aeb07542e..d728a94c642e 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -340,6 +340,7 @@  static enum power_supply_property hidinput_battery_props[] = {
 #define HID_BATTERY_QUIRK_PERCENT	(1 << 0) /* always reports percent */
 #define HID_BATTERY_QUIRK_FEATURE	(1 << 1) /* ask for feature report */
 #define HID_BATTERY_QUIRK_IGNORE	(1 << 2) /* completely ignore the battery */
+#define HID_BATTERY_QUIRK_AVOID_QUERY	(1 << 3) /* do not query the battery */
 
 static const struct hid_device_id hid_battery_quirks[] = {
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
@@ -373,6 +374,8 @@  static const struct hid_device_id hid_battery_quirks[] = {
 	  HID_BATTERY_QUIRK_IGNORE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN),
 	  HID_BATTERY_QUIRK_IGNORE },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L),
+	  HID_BATTERY_QUIRK_AVOID_QUERY },
 	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),
 	  HID_BATTERY_QUIRK_IGNORE },
 	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),
@@ -554,6 +557,9 @@  static int hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
 	dev->battery_avoid_query = report_type == HID_INPUT_REPORT &&
 				   field->physical == HID_DG_STYLUS;
 
+	if (quirks & HID_BATTERY_QUIRK_AVOID_QUERY)
+		dev->battery_avoid_query = true;
+
 	dev->battery = power_supply_register(&dev->dev, psy_desc, &psy_cfg);
 	if (IS_ERR(dev->battery)) {
 		error = PTR_ERR(dev->battery);