From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELtKW4AltLx09lfAQRiWX8zYDaQ6CBv2zNXkkWop0peGTx10g9O5gPilPvknlJo/mRLx7V8J ARC-Seal: i=1; a=rsa-sha256; t=1521214780; cv=none; d=google.com; s=arc-20160816; b=M7F6iMR/XMFPbgKvBd11mDNhq9QAWiAB61UY34b8IWn7tVWDTUAk05pU52DHCScnaX 5lFIndMIBvDdsH/cinTSdkGJj5LNeJBBcrwIm3OkjCRm/F3sjWWQGwx6jBTlcHOKrY8c smMt08GlB7TdciX/wayNtJiPHZc0zhJhgYDKVvrErjjJujSilFyOeQKwHslDQruL3rtr a3MkbXGMJlTCck+mP/dBgo7o/1BUcnRA09AepKkRJ+4j3bOcj+oK54ogSeuaXrRHwKeX mGqr4gE8D9ITJwpiCizhnKxcnzlL+uRyyoBRRUiA9ueAr7MrUeznHf+AacfjgQTHUEB1 iEKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=rnt808TWuOPFbW6apjT49gDSy/x71S+i6wZ2800skns=; b=oi6xMY+NuVbFncJttrQxwuPs3c/NpGQHGAd9wzcDnBtP1RB2lj38isbsyu0cGqWGgc xBGKowk0uOBm1cACHDKsqz78CGzr/LiZJdYAPUFFAGjyE0xLRuvYd2C1BPFqpR8zrcdG /VJ6FZB7MZj/jfzWBWrlpW220yMZsIMkW+4oEpj/JSCP+s2c7z8Aw9st65x4yYwXZpFt h6okRf3Nnpmu3LAGWSqtXsoGmtg+0RoocRnorNNG2b/haatL2CJ4HgZFjYwv9XXmr8q2 Qa0WOf7si913wbtZFgnkjU0LF7Wf+q8zggX586C6H7VkENorSS3gMkbka1tnTSarZnjc qVAg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Danilo Krummrich Subject: [PATCH 4.15 017/128] usb: quirks: add control message delay for 1b1c:1b20 Date: Fri, 16 Mar 2018 16:22:38 +0100 Message-Id: <20180316152337.278426897@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316152336.199007505@linuxfoundation.org> References: <20180316152336.199007505@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1595108316565102090?= X-GMAIL-MSGID: =?utf-8?q?1595109309755118269?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Danilo Krummrich 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: Danilo Krummrich Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/message.c | 4 ++++ drivers/usb/core/quirks.c | 3 ++- include/linux/usb/quirks.h | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -150,6 +150,10 @@ int usb_control_msg(struct usb_device *d 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; --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -230,7 +230,8 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT }, /* 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 }, --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -63,4 +63,7 @@ */ #define USB_QUIRK_DISCONNECT_SUSPEND BIT(12) +/* Device needs a pause after every control message. */ +#define USB_QUIRK_DELAY_CTRL_MSG BIT(13) + #endif /* __LINUX_USB_QUIRKS_H */