Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2017-04-06 16:16:09 +0200
committerMichal Marek <mmarek@suse.cz>2017-04-06 16:16:09 +0200
commit7bc489d6bd94dffe12d3d364b0626018d8b6a62b (patch)
tree7c22866b0148c15eb1cbecdd7731eda122420dbf
parentdfad6cc7fd5e7295e684475fdd426b0a8065ce7f (diff)
parentd6fc1112360be9066d8be6d2e14c2db595960fb6 (diff)
Merge branch 'users/oneukum/SLE12-SP2/for-next' into SLE12-SP2rpm-4.4.59-92.17
Pull a usbhid fix from Oliver Neukum (bsc#1022340).
-rw-r--r--patches.drivers/0001-HID-usbhid-Quirk-a-AMI-virtual-mouse-and-keyboard-wi.patch71
-rw-r--r--series.conf1
2 files changed, 72 insertions, 0 deletions
diff --git a/patches.drivers/0001-HID-usbhid-Quirk-a-AMI-virtual-mouse-and-keyboard-wi.patch b/patches.drivers/0001-HID-usbhid-Quirk-a-AMI-virtual-mouse-and-keyboard-wi.patch
new file mode 100644
index 0000000000..ef65d6d619
--- /dev/null
+++ b/patches.drivers/0001-HID-usbhid-Quirk-a-AMI-virtual-mouse-and-keyboard-wi.patch
@@ -0,0 +1,71 @@
+From cca40242746aa7127fbf12406196425bd278d7f7 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Thu, 26 Jan 2017 17:34:40 +0000
+Subject: [PATCH] HID: usbhid: Quirk a AMI virtual mouse and keyboard with
+ ALWAYS_POLL
+Git-commit: ed9ab4287f96e66340e0390e2c583f2f9110cba0
+Patch-mainline: v4.10
+References: bsc#1022340
+
+Quirking the following AMI USB device with ALWAYS_POLL fixes an AMI
+virtual keyboard and mouse from not responding and timing out when
+it is attached to a ppc64el Power 8 system and when we have some
+rapid open/closes on the mouse device.
+
+ usb 1-3: new high-speed USB device number 2 using xhci_hcd
+ usb 1-3: New USB device found, idVendor=046b, idProduct=ff01
+ usb 1-3: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+ usb 1-3: Product: Virtual Hub
+ usb 1-3: Manufacturer: American Megatrends Inc.
+ usb 1-3: SerialNumber: serial
+ usb 1-3.3: new high-speed USB device number 3 using xhci_hcd
+ usb 1-3.3: New USB device found, idVendor=046b, idProduct=ff31
+ usb 1-3.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+ usb 1-3.3: Product: Virtual HardDisk Device
+ usb 1-3.3: Manufacturer: American Megatrends Inc.
+ usb 1-3.4: new low-speed USB device number 4 using xhci_hcd
+ usb 1-3.4: New USB device found, idVendor=046b, idProduct=ff10
+ usb 1-3.4: New USB device strings: Mfr=1, Product=2, SerialNumber=0
+ usb 1-3.4: Product: Virtual Keyboard and Mouse
+ usb 1-3.4: Manufacturer: American Megatrends Inc.
+
+With the quirk I have not been able to trigger the issue with
+half an hour of saturation soak testing.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/hid/hid-ids.h | 3 +++
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index e370306..717602a 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -67,6 +67,9 @@
+ #define USB_VENDOR_ID_ALPS 0x0433
+ #define USB_DEVICE_ID_IBM_GAMEPAD 0x1101
+
++#define USB_VENDOR_ID_AMI 0x046b
++#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10
++
+ #define USB_VENDOR_ID_ANTON 0x1130
+ #define USB_DEVICE_ID_ANTON_TOUCH_PAD 0x3101
+
+diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
+index 6ca6ab0..6713c5a 100644
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -55,6 +55,7 @@ static const struct hid_blacklist {
+ { USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },
+
+ { USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },
++ { USB_VENDOR_ID_AMI, USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE, HID_QUIRK_ALWAYS_POLL },
+ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
+--
+2.10.2
+
diff --git a/series.conf b/series.conf
index 246fb4a33a..8d39ff1284 100644
--- a/series.conf
+++ b/series.conf
@@ -5503,6 +5503,7 @@
patches.drivers/Input-i8042-Trust-firmware-a-bit-more-when-probing-o
patches.kabi/i8042-acpi-kabi-fix
+ patches.drivers/0001-HID-usbhid-Quirk-a-AMI-virtual-mouse-and-keyboard-wi.patch
##########################################################
# Sound