Received: by 10.213.65.68 with SMTP id h4csp508433imn; Fri, 16 Mar 2018 09:54:04 -0700 (PDT) X-Google-Smtp-Source: AG47ELs7PRaGJEig6UM3kP44T3InVrLkHBrjuoxtdmVxQDpqYz8nMlStTqGiaJoKjDoRXwx/xrPw X-Received: by 10.98.89.200 with SMTP id k69mr1750464pfj.100.1521219244405; Fri, 16 Mar 2018 09:54:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521219244; cv=none; d=google.com; s=arc-20160816; b=OUqb04zSqtwXeSrgzhnmFUbSFQTFvlZQb4n1NvcaDowJas1zV0CuSxcy6e3KpSgLcQ 1m8UqlsjLJFPu2QaVF9mkFohBcYTslrc9WhUKFHhpjgdOA86yofD+57qIG6I0jTUdMeO e6zpBcamYVqlvzg0M9CYIUfpjxosGazbh81MeWF+UlO8IeiHTsSNA1PDC3RnbWm2M4fb 9fKk7ZVXmw9IFhW2JPsEJABQAaAasnToh7GbqZrgwdPBNUrMLQVNlFntxVKhkPq/hGyA MINlY0d9aWR18BznD1Ocuapb0J/gnf94M2+nEBC0GFaoHgrLnA5Qv9fso5Xe6tZMnbF+ vSfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=olBELvh8ioKfbZC3ytkMw7qCP4wTn5OToXi2snbO010=; b=IA4PkjXc0ITR+jnVXGr1Mmw96B1K4k4UBB3vtaCg28e0Y1PnMB30GuWqSZVtuGxCCp 9BKlAffBWPsbPGMzwnODKpEv5CUTaYBQMr7N3ok5oXFuT7aFh34/RBf5lEa7RMiMfvtB 8RLBl62q5zIJrnxe1hAZMEKdnl1jHwmszU44KWQvKY509fewbqS12c6L7h+pm8Bnwbsa Xj4WvxxRF3dcB4d9CG41/GpZ92troVmsvOCiPqWONOUMEmfhysDEx6PCKoM5v5+1OuWp W37n+0Zv0rbs1Qd1J5xJYQjdvsU40SLX/rhXxlBNzIA0/nb6tzrSs4n27PEfXCWmoPDb I9gA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l7-v6si6931136plk.380.2018.03.16.09.53.50; Fri, 16 Mar 2018 09:54:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933968AbeCPPeb (ORCPT + 99 others); Fri, 16 Mar 2018 11:34:31 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:39440 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933938AbeCPPe3 (ORCPT ); Fri, 16 Mar 2018 11:34:29 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 419BFF7D; Fri, 16 Mar 2018 15:34:28 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Danilo Krummrich Subject: [PATCH 4.14 018/109] usb: quirks: add control message delay for 1b1c:1b20 Date: Fri, 16 Mar 2018 16:22:47 +0100 Message-Id: <20180316152330.951548543@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316152329.844663293@linuxfoundation.org> References: <20180316152329.844663293@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-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 @@ -229,7 +229,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 @@ -57,4 +57,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 */