diff mbox

[v3,2/2] USB: quirks: Apply ALWAYS_POLL to all ELAN devices

Message ID 1448372948-8861-3-git-send-email-adrienverge@gmail.com (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Adrien Vergé Nov. 24, 2015, 1:49 p.m. UTC 
All ELAN hid devices seem to require the ALWAYS_POLL quirk. Let's use
this quirk for all devices from this vendor, rather than maintaining a
list of all its known product IDs.

To achieve that, this patch introduces a new hid_vendor_blacklist[] that
is checked when the product ID is not found in hid_product_blacklist[].

Tested-by: Adrien Vergé <adrienverge@gmail.com>
Signed-off-by: Adrien Vergé <adrienverge@gmail.com>
---
 drivers/hid/hid-ids.h           |  5 -----
 drivers/hid/usbhid/hid-quirks.c | 43 +++++++++++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 19 deletions(-)

Comments

Benjamin Tissoires Nov. 24, 2015, 2:11 p.m. UTC | #1 
Hi Adrien,

On Tue, Nov 24, 2015 at 2:49 PM, Adrien Vergé <adrienverge@gmail.com> wrote:
> All ELAN hid devices seem to require the ALWAYS_POLL quirk. Let's use
> this quirk for all devices from this vendor, rather than maintaining a
> list of all its known product IDs.
>
> To achieve that, this patch introduces a new hid_vendor_blacklist[] that
> is checked when the product ID is not found in hid_product_blacklist[].
>
> Tested-by: Adrien Vergé <adrienverge@gmail.com>
> Signed-off-by: Adrien Vergé <adrienverge@gmail.com>
> ---
>  drivers/hid/hid-ids.h           |  5 -----
>  drivers/hid/usbhid/hid-quirks.c | 43 +++++++++++++++++++++++++++--------------
>  2 files changed, 29 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index ac1feea..3c7e0c3 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -316,11 +316,6 @@
>  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001      0xa001
>
>  #define USB_VENDOR_ID_ELAN             0x04f3
> -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089
> -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B    0x009b
> -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103    0x0103
> -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c    0x010c
> -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F    0x016f
>
>  #define USB_VENDOR_ID_ELECOM           0x056e
>  #define USB_DEVICE_ID_ELECOM_BM084     0x0061
> diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
> index 94bb137..9550497 100644
> --- a/drivers/hid/usbhid/hid-quirks.c
> +++ b/drivers/hid/usbhid/hid-quirks.c
> @@ -21,15 +21,29 @@
>
>  #include "../hid-ids.h"
>
> +struct hid_blacklist {
> +       __u16 idVendor;
> +       __u16 idProduct;
> +       __u32 quirks;
> +};
> +
> +/*
> + * Alphabetically sorted blacklist for vendor-global quirks. If a device matches
> + * both this blacklist and the product one (below), the more specific one
> + * (product ID) prevails.
> + */
> +
> +static const struct hid_blacklist hid_vendor_blacklist[] = {
> +       { USB_VENDOR_ID_ELAN, 0, HID_QUIRK_ALWAYS_POLL },
> +
> +       { 0, 0, 0 }
> +};

Instead of adding a second table, I'd rather have a match on
HID_ANY_ID for the product ID.

> +
>  /*
>   * Alphabetically sorted blacklist by quirk type.
>   */
>
> -static const struct hid_blacklist {
> -       __u16 idVendor;
> -       __u16 idProduct;
> -       __u32 quirks;
> -} hid_blacklist[] = {
> +static const struct hid_blacklist hid_product_blacklist[] = {
>         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_GAMEPAD, HID_QUIRK_BADPAD },
>         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
>         { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
> @@ -72,11 +86,6 @@ static const struct hid_blacklist {
>         { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
>         { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
>         { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
> -       { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },
> -       { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },
> -       { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL },
> -       { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c, HID_QUIRK_ALWAYS_POLL },
> -       { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },

This becomes:
{ USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },

>         { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
>         { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
>         { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
> @@ -337,10 +346,16 @@ static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor,
>         const struct hid_blacklist *bl_entry = NULL;
>         int n = 0;
>
> -       for (; hid_blacklist[n].idVendor; n++)
> -               if (hid_blacklist[n].idVendor == idVendor &&
> -                               hid_blacklist[n].idProduct == idProduct)

And here you need to check also on the match with HID_ANY_ID for both
idVendor and idProduct.

Cheers,
Benjamin

> -                       bl_entry = &hid_blacklist[n];
> +       for (; hid_product_blacklist[n].idVendor; n++)
> +               if (hid_product_blacklist[n].idVendor == idVendor &&
> +                               hid_product_blacklist[n].idProduct == idProduct)
> +                       bl_entry = &hid_product_blacklist[n];
> +
> +       if (bl_entry == NULL) {
> +               for (n = 0; hid_vendor_blacklist[n].idVendor; n++)
> +                       if (hid_vendor_blacklist[n].idVendor == idVendor)
> +                               bl_entry = &hid_vendor_blacklist[n];
> +       }
>
>         if (bl_entry != NULL)
>                 dbg_hid("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
> --
> 2.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Adrien Vergé Nov. 24, 2015, 2:34 p.m. UTC | #2 
2015-11-24 15:11 GMT+01:00 Benjamin Tissoires <benjamin.tissoires@gmail.com>:

> Instead of adding a second table, I'd rather have a match on
> HID_ANY_ID for the product ID.

Thanks Benjamin, the way you propose is much cleaner. (I actually
looked for such a *wildcard* product id, but apparently didn't looked
deep enough!)
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index ac1feea..3c7e0c3 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -316,11 +316,6 @@ 
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001
 
 #define USB_VENDOR_ID_ELAN		0x04f3
-#define USB_DEVICE_ID_ELAN_TOUCHSCREEN	0x0089
-#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B	0x009b
-#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103	0x0103
-#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c	0x010c
-#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F	0x016f
 
 #define USB_VENDOR_ID_ELECOM		0x056e
 #define USB_DEVICE_ID_ELECOM_BM084	0x0061
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 94bb137..9550497 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -21,15 +21,29 @@ 
 
 #include "../hid-ids.h"
 
+struct hid_blacklist {
+	__u16 idVendor;
+	__u16 idProduct;
+	__u32 quirks;
+};
+
+/*
+ * Alphabetically sorted blacklist for vendor-global quirks. If a device matches
+ * both this blacklist and the product one (below), the more specific one
+ * (product ID) prevails.
+ */
+
+static const struct hid_blacklist hid_vendor_blacklist[] = {
+	{ USB_VENDOR_ID_ELAN, 0, HID_QUIRK_ALWAYS_POLL },
+
+	{ 0, 0, 0 }
+};
+
 /*
  * Alphabetically sorted blacklist by quirk type.
  */
 
-static const struct hid_blacklist {
-	__u16 idVendor;
-	__u16 idProduct;
-	__u32 quirks;
-} hid_blacklist[] = {
+static const struct hid_blacklist hid_product_blacklist[] = {
 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_GAMEPAD, HID_QUIRK_BADPAD },
 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
 	{ USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
@@ -72,11 +86,6 @@  static const struct hid_blacklist {
 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
-	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },
-	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },
-	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL },
-	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c, HID_QUIRK_ALWAYS_POLL },
-	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },
 	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
 	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
@@ -337,10 +346,16 @@  static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor,
 	const struct hid_blacklist *bl_entry = NULL;
 	int n = 0;
 
-	for (; hid_blacklist[n].idVendor; n++)
-		if (hid_blacklist[n].idVendor == idVendor &&
-				hid_blacklist[n].idProduct == idProduct)
-			bl_entry = &hid_blacklist[n];
+	for (; hid_product_blacklist[n].idVendor; n++)
+		if (hid_product_blacklist[n].idVendor == idVendor &&
+				hid_product_blacklist[n].idProduct == idProduct)
+			bl_entry = &hid_product_blacklist[n];
+
+	if (bl_entry == NULL) {
+		for (n = 0; hid_vendor_blacklist[n].idVendor; n++)
+			if (hid_vendor_blacklist[n].idVendor == idVendor)
+				bl_entry = &hid_vendor_blacklist[n];
+	}
 
 	if (bl_entry != NULL)
 		dbg_hid("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",