Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ad9d27c authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Greg Kroah-Hartman
Browse files

usb: quirks: add control message delay for 1b1c:1b20 



commit cb88a0588717ba6c756cb5972d75766b273a6817 upstream.

Corsair Strafe RGB keyboard does not respond to usb control messages
sometimes and hence generates timeouts.

Commit de3af5bf259d ("usb: quirks: add delay init quirk for Corsair
Strafe RGB keyboard") tried to fix those timeouts by adding
USB_QUIRK_DELAY_INIT.

Unfortunately, even with this quirk timeouts of usb_control_msg()
can still be seen, but with a lower frequency (approx. 1 out of 15):

[   29.103520] usb 1-8: string descriptor 0 read error: -110
[   34.363097] usb 1-8: can't set config #1, error -110

Adding further delays to different locations where usb control
messages are issued just moves the timeouts to other locations,
e.g.:

[   35.400533] usbhid 1-8:1.0: can't add hid device: -110
[   35.401014] usbhid: probe of 1-8:1.0 failed with error -110

The only way to reliably avoid those issues is having a pause after
each usb control message. In approx. 200 boot cycles no more timeouts
were seen.

Addionaly, keep USB_QUIRK_DELAY_INIT as it turned out to be necessary
to have the delay in hub_port_connect() after hub_port_init().

The overall boot time seems not to be influenced by these additional
delays, even on fast machines and lightweight distributions.

Fixes: de3af5bf259d ("usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDanilo Krummrich <danilokrummrich@dk-develop.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a40db9b

drivers/usb/core/message.c

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request, 


	ret = usb_internal_control_msg(dev, pipe, dr, data, size, timeout);



	/* Linger a bit, prior to the next control message. */

	if (dev->quirks & USB_QUIRK_DELAY_CTRL_MSG)

		msleep(200);



	kfree(dr);



	return ret;

drivers/usb/core/quirks.c

+2 −1
Original line number Diff line number Diff line
@@ -219,7 +219,8 @@ static const struct usb_device_id usb_quirk_list[] = { 
			USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },



	/* Corsair Strafe RGB */

	{ USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT },

	{ USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT |

	  USB_QUIRK_DELAY_CTRL_MSG },



	/* Corsair K70 LUX */

	{ USB_DEVICE(0x1b1c, 0x1b36), .driver_info = USB_QUIRK_DELAY_INIT },

include/linux/usb/quirks.h

+3 −0
Original line number Diff line number Diff line
@@ -56,4 +56,7 @@ 
 */

#define USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL	BIT(11)



/* Device needs a pause after every control message. */

#define USB_QUIRK_DELAY_CTRL_MSG		BIT(13)



#endif /* __LINUX_USB_QUIRKS_H */