diff --git a/0001-Input-wacom-make-sure-touch_max-is-set-for-touch-dev.patch b/0001-Input-wacom-make-sure-touch_max-is-set-for-touch-dev.patch new file mode 100644 index 000000000..f86cc1ff3 --- /dev/null +++ b/0001-Input-wacom-make-sure-touch_max-is-set-for-touch-dev.patch @@ -0,0 +1,56 @@ +Bugzilla: 1046238 +Upstream-status: Queued for 3.14 + +From 1d0d6df02750b4a6f466768cbfbf860e24f4c8d4 Mon Sep 17 00:00:00 2001 +From: Ping Cheng +Date: Mon, 25 Nov 2013 18:43:45 -0800 +Subject: [PATCH] Input: wacom - make sure touch_max is set for touch devices + +Old single touch Tablet PCs do not have touch_max set at +wacom_features. Since touch device at lease supports one +finger, assign touch_max to 1 when touch usage is defined +in its HID Descriptor and touch_max is not pre-defined. + +Tested-by: Jason Gerecke +Signed-off-by: Ping Cheng +Reviewed-by: Chris Bagwell +Signed-off-by: Dmitry Torokhov +--- + drivers/input/tablet/wacom_sys.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c +index 8a90da1..3d71b60 100644 +--- a/drivers/input/tablet/wacom_sys.c ++++ b/drivers/input/tablet/wacom_sys.c +@@ -304,7 +304,7 @@ static int wacom_parse_hid(struct usb_interface *intf, + struct usb_device *dev = interface_to_usbdev(intf); + char limit = 0; + /* result has to be defined as int for some devices */ +- int result = 0; ++ int result = 0, touch_max = 0; + int i = 0, usage = WCM_UNDEFINED, finger = 0, pen = 0; + unsigned char *report; + +@@ -351,7 +351,8 @@ static int wacom_parse_hid(struct usb_interface *intf, + if (usage == WCM_DESKTOP) { + if (finger) { + features->device_type = BTN_TOOL_FINGER; +- ++ /* touch device at least supports one touch point */ ++ touch_max = 1; + switch (features->type) { + case TABLETPC2FG: + features->pktlen = WACOM_PKGLEN_TPC2FG; +@@ -504,6 +505,8 @@ static int wacom_parse_hid(struct usb_interface *intf, + } + + out: ++ if (!features->touch_max && touch_max) ++ features->touch_max = touch_max; + result = 0; + kfree(report); + return result; +-- +1.8.4.2 + diff --git a/0002-Input-wacom-add-support-for-three-new-Intuos-devices.patch b/0002-Input-wacom-add-support-for-three-new-Intuos-devices.patch new file mode 100644 index 000000000..0c2161f11 --- /dev/null +++ b/0002-Input-wacom-add-support-for-three-new-Intuos-devices.patch @@ -0,0 +1,216 @@ +Bugzilla: 1046238 +Upstream-status: Queued for 3.14 + +From b5fd2a3e92ca5c8c1f3c20d31ac5daed3ec4d604 Mon Sep 17 00:00:00 2001 +From: Ping Cheng +Date: Mon, 25 Nov 2013 18:44:55 -0800 +Subject: [PATCH] Input: wacom - add support for three new Intuos devices + +Two tablets in this series support both pen and touch. One (Intuos S) +only supports pen. This patch also updates the driver to process wireless +devices that do not support touch interface. + +Tested-by: Jason Gerecke +Reviewed-by: Chris Bagwell +Signed-off-by: Ping Cheng +Signed-off-by: Dmitry Torokhov +--- + drivers/input/tablet/wacom_sys.c | 6 ++-- + drivers/input/tablet/wacom_wac.c | 61 ++++++++++++++++++++++++++++++---------- + drivers/input/tablet/wacom_wac.h | 2 ++ + 3 files changed, 51 insertions(+), 18 deletions(-) + +diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c +index 3d71b60..3a7d99c 100644 +--- a/drivers/input/tablet/wacom_sys.c ++++ b/drivers/input/tablet/wacom_sys.c +@@ -1198,7 +1198,8 @@ static void wacom_wireless_work(struct work_struct *work) + goto fail; + + /* Touch interface */ +- if (wacom_wac1->features.touch_max) { ++ if (wacom_wac1->features.touch_max || ++ wacom_wac1->features.type == INTUOSHT) { + wacom_wac2->features = + *((struct wacom_features *)id->driver_info); + wacom_wac2->features.pktlen = WACOM_PKGLEN_BBTOUCH3; +@@ -1321,7 +1322,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i + * HID descriptor. If this is the touch interface (wMaxPacketSize + * of WACOM_PKGLEN_BBTOUCH3), override the table values. + */ +- if (features->type >= INTUOS5S && features->type <= INTUOSPL) { ++ if (features->type >= INTUOS5S && features->type <= INTUOSHT) { + if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) { + features->device_type = BTN_TOOL_FINGER; + features->pktlen = WACOM_PKGLEN_BBTOUCH3; +@@ -1391,7 +1392,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i + goto fail5; + } + } +- + return 0; + + fail5: wacom_destroy_leds(wacom); +diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c +index 3f75f1d..eb60a28 100644 +--- a/drivers/input/tablet/wacom_wac.c ++++ b/drivers/input/tablet/wacom_wac.c +@@ -1176,10 +1176,16 @@ static void wacom_bpt3_touch_msg(struct wacom_wac *wacom, unsigned char *data) + static void wacom_bpt3_button_msg(struct wacom_wac *wacom, unsigned char *data) + { + struct input_dev *input = wacom->input; ++ struct wacom_features *features = &wacom->features; + +- input_report_key(input, BTN_LEFT, (data[1] & 0x08) != 0); ++ if (features->type == INTUOSHT) { ++ input_report_key(input, BTN_LEFT, (data[1] & 0x02) != 0); ++ input_report_key(input, BTN_BACK, (data[1] & 0x08) != 0); ++ } else { ++ input_report_key(input, BTN_BACK, (data[1] & 0x02) != 0); ++ input_report_key(input, BTN_LEFT, (data[1] & 0x08) != 0); ++ } + input_report_key(input, BTN_FORWARD, (data[1] & 0x04) != 0); +- input_report_key(input, BTN_BACK, (data[1] & 0x02) != 0); + input_report_key(input, BTN_RIGHT, (data[1] & 0x01) != 0); + } + +@@ -1217,7 +1223,7 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) + unsigned char *data = wacom->data; + int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; + +- if (data[0] != 0x02) ++ if (data[0] != WACOM_REPORT_PENABLED) + return 0; + + prox = (data[1] & 0x20) == 0x20; +@@ -1297,7 +1303,7 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len) + unsigned char *data = wacom->data; + int connected; + +- if (len != WACOM_PKGLEN_WIRELESS || data[0] != 0x80) ++ if (len != WACOM_PKGLEN_WIRELESS || data[0] != WACOM_REPORT_WL) + return 0; + + connected = data[1] & 0x01; +@@ -1391,6 +1397,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len) + break; + + case BAMBOO_PT: ++ case INTUOSHT: + sync = wacom_bpt_irq(wacom_wac, len); + break; + +@@ -1459,7 +1466,7 @@ void wacom_setup_device_quirks(struct wacom_features *features) + + /* these device have multiple inputs */ + if (features->type >= WIRELESS || +- (features->type >= INTUOS5S && features->type <= INTUOSPL) || ++ (features->type >= INTUOS5S && features->type <= INTUOSHT) || + (features->oVid && features->oPid)) + features->quirks |= WACOM_QUIRK_MULTI_INPUT; + +@@ -1771,33 +1778,43 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); + break; + ++ case INTUOSHT: + case BAMBOO_PT: + __clear_bit(ABS_MISC, input_dev->absbit); + +- __set_bit(INPUT_PROP_POINTER, input_dev->propbit); +- + if (features->device_type == BTN_TOOL_FINGER) { +- unsigned int flags = INPUT_MT_POINTER; + + __set_bit(BTN_LEFT, input_dev->keybit); + __set_bit(BTN_FORWARD, input_dev->keybit); + __set_bit(BTN_BACK, input_dev->keybit); + __set_bit(BTN_RIGHT, input_dev->keybit); + +- if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) { +- input_set_abs_params(input_dev, ++ if (features->touch_max) { ++ /* touch interface */ ++ unsigned int flags = INPUT_MT_POINTER; ++ ++ __set_bit(INPUT_PROP_POINTER, input_dev->propbit); ++ if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) { ++ input_set_abs_params(input_dev, + ABS_MT_TOUCH_MAJOR, + 0, features->x_max, 0, 0); +- input_set_abs_params(input_dev, ++ input_set_abs_params(input_dev, + ABS_MT_TOUCH_MINOR, + 0, features->y_max, 0, 0); ++ } else { ++ __set_bit(BTN_TOOL_FINGER, input_dev->keybit); ++ __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); ++ flags = 0; ++ } ++ input_mt_init_slots(input_dev, features->touch_max, flags); + } else { +- __set_bit(BTN_TOOL_FINGER, input_dev->keybit); +- __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); +- flags = 0; ++ /* buttons/keys only interface */ ++ __clear_bit(ABS_X, input_dev->absbit); ++ __clear_bit(ABS_Y, input_dev->absbit); ++ __clear_bit(BTN_TOUCH, input_dev->keybit); + } +- input_mt_init_slots(input_dev, features->touch_max, flags); + } else if (features->device_type == BTN_TOOL_PEN) { ++ __set_bit(INPUT_PROP_POINTER, input_dev->propbit); + __set_bit(BTN_TOOL_RUBBER, input_dev->keybit); + __set_bit(BTN_TOOL_PEN, input_dev->keybit); + __set_bit(BTN_STYLUS, input_dev->keybit); +@@ -2194,6 +2211,17 @@ static const struct wacom_features wacom_features_0x300 = + static const struct wacom_features wacom_features_0x301 = + { "Wacom Bamboo One M", WACOM_PKGLEN_BBPEN, 21648, 13530, 1023, + 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; ++static const struct wacom_features wacom_features_0x302 = ++ { "Wacom Intuos PT S", WACOM_PKGLEN_BBPEN, 15200, 9500, 1023, ++ 31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, ++ .touch_max = 16 }; ++static const struct wacom_features wacom_features_0x303 = ++ { "Wacom Intuos PT M", WACOM_PKGLEN_BBPEN, 21600, 13500, 1023, ++ 31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, ++ .touch_max = 16 }; ++static const struct wacom_features wacom_features_0x30E = ++ { "Wacom Intuos S", WACOM_PKGLEN_BBPEN, 15200, 9500, 1023, ++ 31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; + static const struct wacom_features wacom_features_0x6004 = + { "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255, + 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +@@ -2329,6 +2357,9 @@ const struct usb_device_id wacom_ids[] = { + { USB_DEVICE_WACOM(0x10D) }, + { USB_DEVICE_WACOM(0x300) }, + { USB_DEVICE_WACOM(0x301) }, ++ { USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) }, ++ { USB_DEVICE_DETAILED(0x303, USB_CLASS_HID, 0, 0) }, ++ { USB_DEVICE_DETAILED(0x30E, USB_CLASS_HID, 0, 0) }, + { USB_DEVICE_WACOM(0x304) }, + { USB_DEVICE_DETAILED(0x314, USB_CLASS_HID, 0, 0) }, + { USB_DEVICE_DETAILED(0x315, USB_CLASS_HID, 0, 0) }, +diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h +index fd23a37..854cceb 100644 +--- a/drivers/input/tablet/wacom_wac.h ++++ b/drivers/input/tablet/wacom_wac.h +@@ -54,6 +54,7 @@ + #define WACOM_REPORT_TPCST 16 + #define WACOM_REPORT_TPC1FGE 18 + #define WACOM_REPORT_24HDT 1 ++#define WACOM_REPORT_WL 128 + + /* device quirks */ + #define WACOM_QUIRK_MULTI_INPUT 0x0001 +@@ -81,6 +82,7 @@ enum { + INTUOSPS, + INTUOSPM, + INTUOSPL, ++ INTUOSHT, + WACOM_21UX2, + WACOM_22HD, + DTK, +-- +1.8.4.2 + diff --git a/0003-Input-wacom-add-reporting-of-SW_MUTE_DEVICE-events.patch b/0003-Input-wacom-add-reporting-of-SW_MUTE_DEVICE-events.patch new file mode 100644 index 000000000..ad433639d --- /dev/null +++ b/0003-Input-wacom-add-reporting-of-SW_MUTE_DEVICE-events.patch @@ -0,0 +1,155 @@ +Bugzilla: 1046238 +Upstream-status: Queued for 3.14 + +From 961794a00eab03f4344b7d5e825e8e789e55da87 Mon Sep 17 00:00:00 2001 +From: Ping Cheng +Date: Thu, 5 Dec 2013 12:54:53 -0800 +Subject: [PATCH] Input: wacom - add reporting of SW_MUTE_DEVICE events + +New Intuos series models added a hardware switch to turn touch +data on/off. The state of the switch is reported periodically +from the tablet. To report the state the driver will emit SW_MUTE_DEVICE +events. + +Reviewed_by: Chris Bagwell +Acked-by: Peter Hutterer +Tested-by: Jason Gerecke +Signed-off-by: Ping Cheng +Signed-off-by: Dmitry Torokhov +--- + drivers/input/tablet/wacom_sys.c | 12 ++++++++++++ + drivers/input/tablet/wacom_wac.c | 30 +++++++++++++++++++++++++++--- + drivers/input/tablet/wacom_wac.h | 5 +++++ + 3 files changed, 44 insertions(+), 3 deletions(-) + +diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c +index 8318826..b16ebef 100644 +--- a/drivers/input/tablet/wacom_sys.c ++++ b/drivers/input/tablet/wacom_sys.c +@@ -1197,6 +1197,8 @@ static void wacom_wireless_work(struct work_struct *work) + wacom_wac1->features.device_type = BTN_TOOL_PEN; + snprintf(wacom_wac1->name, WACOM_NAME_MAX, "%s (WL) Pen", + wacom_wac1->features.name); ++ wacom_wac1->shared->touch_max = wacom_wac1->features.touch_max; ++ wacom_wac1->shared->type = wacom_wac1->features.type; + error = wacom_register_input(wacom1); + if (error) + goto fail; +@@ -1218,6 +1220,10 @@ static void wacom_wireless_work(struct work_struct *work) + error = wacom_register_input(wacom2); + if (error) + goto fail; ++ ++ if (wacom_wac1->features.type == INTUOSHT && ++ wacom_wac1->features.touch_max) ++ wacom_wac->shared->touch_input = wacom_wac2->input; + } + + error = wacom_initialize_battery(wacom); +@@ -1396,6 +1402,12 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i + goto fail5; + } + } ++ ++ if (wacom_wac->features.type == INTUOSHT && wacom_wac->features.touch_max) { ++ if (wacom_wac->features.device_type == BTN_TOOL_FINGER) ++ wacom_wac->shared->touch_input = wacom_wac->input; ++ } ++ + return 0; + + fail5: wacom_destroy_leds(wacom); +diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c +index 7655088..048e5b3 100644 +--- a/drivers/input/tablet/wacom_wac.c ++++ b/drivers/input/tablet/wacom_wac.c +@@ -1219,13 +1219,23 @@ static int wacom_bpt3_touch(struct wacom_wac *wacom) + + static int wacom_bpt_pen(struct wacom_wac *wacom) + { ++ struct wacom_features *features = &wacom->features; + struct input_dev *input = wacom->input; + unsigned char *data = wacom->data; + int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; + +- if (data[0] != WACOM_REPORT_PENABLED) ++ if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_USB) + return 0; + ++ if (data[0] == WACOM_REPORT_USB) { ++ if (features->type == INTUOSHT && features->touch_max) { ++ input_report_switch(wacom->shared->touch_input, ++ SW_MUTE_DEVICE, data[8] & 0x40); ++ input_sync(wacom->shared->touch_input); ++ } ++ return 0; ++ } ++ + prox = (data[1] & 0x20) == 0x20; + + /* +@@ -1258,8 +1268,8 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) + * touching and applying pressure; do not report negative + * distance. + */ +- if (data[8] <= wacom->features.distance_max) +- d = wacom->features.distance_max - data[8]; ++ if (data[8] <= features->distance_max) ++ d = features->distance_max - data[8]; + + pen = data[1] & 0x01; + btn1 = data[1] & 0x02; +@@ -1310,6 +1320,13 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len) + if (connected) { + int pid, battery; + ++ if ((wacom->shared->type == INTUOSHT) && ++ wacom->shared->touch_max) { ++ input_report_switch(wacom->shared->touch_input, ++ SW_MUTE_DEVICE, data[5] & 0x40); ++ input_sync(wacom->shared->touch_input); ++ } ++ + pid = get_unaligned_be16(&data[6]); + battery = data[5] & 0x3f; + if (wacom->pid != pid) { +@@ -1779,6 +1796,13 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, + break; + + case INTUOSHT: ++ if (features->touch_max && ++ features->device_type == BTN_TOOL_FINGER) { ++ input_dev->evbit[0] |= BIT_MASK(EV_SW); ++ __set_bit(SW_MUTE_DEVICE, input_dev->swbit); ++ } ++ /* fall through */ ++ + case BAMBOO_PT: + __clear_bit(ABS_MISC, input_dev->absbit); + +diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h +index 854cceb..3600cf7 100644 +--- a/drivers/input/tablet/wacom_wac.h ++++ b/drivers/input/tablet/wacom_wac.h +@@ -55,6 +55,7 @@ + #define WACOM_REPORT_TPC1FGE 18 + #define WACOM_REPORT_24HDT 1 + #define WACOM_REPORT_WL 128 ++#define WACOM_REPORT_USB 192 + + /* device quirks */ + #define WACOM_QUIRK_MULTI_INPUT 0x0001 +@@ -131,6 +132,10 @@ struct wacom_features { + struct wacom_shared { + bool stylus_in_proximity; + bool touch_down; ++ /* for wireless device to access USB interfaces */ ++ unsigned touch_max; ++ int type; ++ struct input_dev *touch_input; + }; + + struct wacom_wac { +-- +1.8.4.2 + diff --git a/kernel.spec b/kernel.spec index 4638156c9..7d0af7c52 100644 --- a/kernel.spec +++ b/kernel.spec @@ -721,6 +721,11 @@ Patch25179: KVM-MMU-handle-invalid-root_hpa-at-__direct_map.patch #rhbz 1047892 Patch25180: KVM-VMX-fix-use-after-free-of-vmx-loaded_vmcs.patch +#rhbz 1003167 1046238 +Patch25181: 0001-Input-wacom-make-sure-touch_max-is-set-for-touch-dev.patch +Patch25182: 0002-Input-wacom-add-support-for-three-new-Intuos-devices.patch +Patch25183: 0003-Input-wacom-add-reporting-of-SW_MUTE_DEVICE-events.patch + # END OF PATCH DEFINITIONS %endif @@ -1405,6 +1410,11 @@ ApplyPatch KVM-MMU-handle-invalid-root_hpa-at-__direct_map.patch #rhbz 1047892 ApplyPatch KVM-VMX-fix-use-after-free-of-vmx-loaded_vmcs.patch +#rhbz 1003167 1046238 +ApplyPatch 0001-Input-wacom-make-sure-touch_max-is-set-for-touch-dev.patch +ApplyPatch 0002-Input-wacom-add-support-for-three-new-Intuos-devices.patch +ApplyPatch 0003-Input-wacom-add-reporting-of-SW_MUTE_DEVICE-events.patch + # END OF PATCH APPLICATIONS %endif @@ -2220,6 +2230,7 @@ fi # || || %changelog * Mon Jan 06 2014 Josh Boyer +- Add support for Wacom Intuos 5 S devices (rhbz 1046238) - Fix use after free crash in KVM (rhbz 1047892) - Fix oops in KVM with invalid root_hpa (rhbz 924916)