HID: input: enforce Invert usage to be processed before InRange

When a device exposes both Invert and InRange, Invert must be processed
before InRange. If we keep the order of the device and we process them
out of order, InRange will first set BTN_TOOL_PEN, and then Invert will
set BTN_TOOL_RUBBER. Userspace knows how to deal with that situation,
but fixing it in the kernel is now easier.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 8770d9a2b2afb06ffef43c7f9b5f4a620c0fc36f..61d91117f4ae6966d5c60e4d9d83c363ac3074b5 100644 (file)
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -48,6 +48,25 @@ static const struct {
        __s32 y;
 }  hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}};
 
+/*
+ * hid-input will convert this list into priorities:
+ * the first element will have the highest priority
+ * (the length of the following array) and the last
+ * element the lowest (1).
+ *
+ * hid-input will then shift the priority by 8 bits to leave some space
+ * in case drivers want to interleave other fields.
+ *
+ * If drivers want to add fields before those, hid-input will
+ * leave out the first 8 bits of the priority value.
+ *
+ * This still leaves us 65535 individual priority values.
+ */
+static const __u32 hidinput_usages_priorities[] = {
+       HID_DG_INVERT,          /* Invert must always come before In Range */
+       HID_DG_INRANGE,
+};
+
 #define map_abs(c)     hid_map_usage(hidinput, usage, &bit, &max, EV_ABS, (c))
 #define map_rel(c)     hid_map_usage(hidinput, usage, &bit, &max, EV_REL, (c))
 #define map_key(c)     hid_map_usage(hidinput, usage, &bit, &max, EV_KEY, (c))
@@ -586,11 +605,12 @@ static bool hidinput_field_in_collection(struct hid_device *device, struct hid_f
 }
 
 static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_field *field,
-                                    struct hid_usage *usage)
+                                    struct hid_usage *usage, unsigned int usage_index)
 {
        struct input_dev *input = hidinput->input;
        struct hid_device *device = input_get_drvdata(input);
        int max = 0, code;
+       unsigned int i = 0;
        unsigned long *bit = NULL;
 
        field->hidinput = hidinput;
@@ -608,6 +628,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                goto ignore;
        }
 
+       /* assign a priority based on the static list declared here */
+       for (i = 0; i < ARRAY_SIZE(hidinput_usages_priorities); i++) {
+               if (usage->hid == hidinput_usages_priorities[i]) {
+                       field->usages_priorities[usage_index] =
+                               (ARRAY_SIZE(hidinput_usages_priorities) - i) << 8;
+                       break;
+               }
+       }
+
        if (device->driver->input_mapping) {
                int ret = device->driver->input_mapping(device, hidinput, field,
                                usage, &bit, &max);
@@ -1962,7 +1991,8 @@ static inline void hidinput_configure_usages(struct hid_input *hidinput,
        for (i = 0; i < report->maxfield; i++)
                for (j = 0; j < report->field[i]->maxusage; j++)
                        hidinput_configure_usage(hidinput, report->field[i],
-                                                report->field[i]->usage + j);
+                                                report->field[i]->usage + j,
+                                                j);
 }
 
 /*

diff --git a/include/linux/hid.h b/include/linux/hid.h
index f25020c0d6b8234e06aa386f2598d2668d34d2f4..eaad0655b05cf45a7e041aa23d22188745ff3b0c 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -477,7 +477,9 @@ struct hid_field {
        unsigned  report_type;          /* (input,output,feature) */
        __s32    *value;                /* last known value(s) */
        __s32    *new_value;            /* newly read value(s) */
-       __s32    *usages_priorities;    /* priority of each usage when reading the report */
+       __s32    *usages_priorities;    /* priority of each usage when reading the report
+                                        * bits 8-16 are reserved for hid-input usage
+                                        */
        __s32     logical_minimum;
        __s32     logical_maximum;
        __s32     physical_minimum;