From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180309-2-17003856728311527261 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enca, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180309; b=NYAT6wk9BFUUWuKcEJLw4DM914qJjeVy2iHVHs5AiLgQKDt r20gYRyU9B9gFjfdEoTyjvefunPic/QkkCRsx72vE8tCF+LzBhpipVrfgV6QmC3Q ti4mymruBUFf1M+ioqgKxbaJuvQxMPPAOX+caENi6OcGMwRupaPle79kAEnFlgUP VMLJSGaJa9Vdj8U5HDYc19eQonqMVY5BCOvVUPBcbO7kql9BhqUtdT298KVrUB6s cBthMVRevqqtQ+UChZ+AwCpTU3/LX4BT/9UIaeseviNgv0ujr3ZcWJN8/xzdi01R 4/X4gSZIqX/JDs8WUadgcP2IV0To1/TWPjpD5aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180309; bh=SquhdU T6CnBH5Lb21uXD/h/nfHnP5KoIADDYc6mvtlY=; b=lrcq2xDjsAHnPiZXZaDxze cNmTggk6y3TVP2kx0OfIlSibzahgWTW91ujLM+0WSWP7x+YueBwwXe7P3ND6XrDz gIwgfg7QiEdK1sf5BvsRWdEHyediHJzlgMNL0K96XOqAb2Xkq9+5JNNP+R30Eyh2 hweuiBV4mEHe5wvb8wpPOkQNUQKL4N/UNn54ROkmxtld1T2vq16PwM3ZjZlOAbzd HJRbGEcizQimfAbhL3ISMx8VKpxd0nCLvxLAGxibwZIlYqUGpMNNaLV9QL8Owtt2 kN/rchc4J0cgWLOA+lwD0vrvDpAQhKolNC8Km+SqtPJSfFQbzev3Jj05UgwFL3uw == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=XQAYgK0L x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=XQAYgK0L x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753662AbeA1W2V (ORCPT ); Sun, 28 Jan 2018 17:28:21 -0500 Received: from mail-dm3nam03on0125.outbound.protection.outlook.com ([104.47.41.125]:54546 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753639AbeA1W2T (ORCPT ); Sun, 28 Jan 2018 17:28:19 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Vincent Pelletier , Felipe Balbi , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 092/100] usb: dwc3: gadget: Wait longer for controller to end command processing Thread-Topic: [PATCH AUTOSEL for 4.14 092/100] usb: dwc3: gadget: Wait longer for controller to end command processing Thread-Index: AQHTmIcdldFa6EBsuU6DxvZKVDTNdQ== Date: Sun, 28 Jan 2018 22:26:59 +0000 Message-ID: <20180128222547.7398-92-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1097;7:D2mLSMcrwbJX0hQrHOL2NbAjShrGnCBzBaUb7vmthy5CHVBF4vY7r1iDAhFDdGyOTo8XNxmU47SjSmWbxl3fjT7eBUphrH4o7ysz3fkXCUspvrnleJyIVp4O6cLFpuOYBmogpN+2/uVT/ZBsRMacDi6fwrVw6zCtng7F6gwhgUuhRsoJcAtTeo5Os74V2YO/q8aGHuvjHyBVfOrptoiGAUBo5dajqxTW49O6qk7kVPc3zQqULRLmqvuC5XsL/cZe x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: fc88ac8e-cd1f-4a0a-9f85-08d5669e6d68 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1097; x-ms-traffictypediagnostic: MW2PR2101MB1097: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1097;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1097; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(72206003)(14454004)(3280700002)(106356001)(4326008)(478600001)(10290500003)(76176011)(102836004)(3660700001)(59450400001)(25786009)(6506007)(105586002)(316002)(6486002)(97736004)(22452003)(186003)(575784001)(99286004)(110136005)(54906003)(107886003)(39060400002)(26005)(86362001)(8676002)(81156014)(2906002)(1076002)(81166006)(68736007)(3846002)(6116002)(305945005)(7736002)(36756003)(86612001)(10090500001)(6512007)(2950100002)(66066001)(5660300001)(53936002)(6666003)(8936002)(6436002)(2501003)(2900100001)(5250100002)(22906009)(148743002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1097;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: qx6qZjmiHZXokp7zNOuLzWKz4M6LIvZjfOdwot+YTTvjtuBvzWDz4k7dEosy52fViI7DuUPOw1LePGNJ1cFRrg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc88ac8e-cd1f-4a0a-9f85-08d5669e6d68 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:59.9475 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1097 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Vincent Pelletier [ Upstream commit 8722e095f5a44d0e409e45c5ddc2ee9cf589c777 ] DWC3_DEPCMD_ENDTRANSFER has been witnessed to require around 600 iterations before controller would become idle again after unplugging the USB cable with AIO reads submitted. Bump timeout from 500 iterations to 1000 so dwc3_stop_active_transfer does not receive -ETIMEDOUT and does not WARN: [ 81.326273] ------------[ cut here ]------------ [ 81.335341] WARNING: CPU: 0 PID: 1874 at drivers/usb/dwc3/gadget.c:2627 = dwc3_stop_active_transfer.constprop.23+0x69/0xc0 [dwc3] [ 81.347094] Modules linked in: usb_f_fs libcomposite configfs bnep btsdi= o bluetooth ecdh_generic brcmfmac brcmutil dwc3 intel_powerclamp coretemp u= lpi kvm_intel udc_core kvm irqbypass crc32_pclmul crc32c_intel pcbc dwc3_pc= i aesni_intel aes_i586 crypto_simd cryptd ehci_pci ehci_hcd basincove_gpadc= industrialio gpio_keys usbcore usb_common [ 81.378142] CPU: 0 PID: 1874 Comm: irq/34-dwc3 Not tainted 4.14.0-edison= + #119 [ 81.385545] Hardware name: Intel Corporation Merrifield/BODEGA BAY, BIOS= 542 2015.01.21:18.19.48 [ 81.394548] task: f5b1be00 task.stack: f420a000 [ 81.399219] EIP: dwc3_stop_active_transfer.constprop.23+0x69/0xc0 [dwc3] [ 81.406086] EFLAGS: 00010086 CPU: 0 [ 81.409672] EAX: 0000001f EBX: f5729800 ECX: c132a2a2 EDX: 00000000 [ 81.416096] ESI: f4054014 EDI: f41cf400 EBP: f420be10 ESP: f420bdf4 [ 81.422521] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 81.428061] CR0: 80050033 CR2: b7a3f000 CR3: 01d94000 CR4: 001006d0 [ 81.434483] Call Trace: [ 81.437063] __dwc3_gadget_ep_disable+0xa3/0x2b0 [dwc3] [ 81.442438] ? _raw_spin_lock_irqsave+0x32/0x40 [ 81.447135] dwc3_gadget_ep_disable+0xbf/0xe0 [dwc3] [ 81.452269] usb_ep_disable+0x1c/0xd0 [udc_core] [ 81.457048] ffs_func_eps_disable.isra.15+0x3b/0x90 [usb_f_fs] [ 81.463070] ffs_func_set_alt+0x7d/0x310 [usb_f_fs] [ 81.468132] ffs_func_disable+0x14/0x20 [usb_f_fs] [ 81.473075] reset_config+0x5b/0x90 [libcomposite] [ 81.478023] composite_disconnect+0x2b/0x50 [libcomposite] [ 81.483685] dwc3_disconnect_gadget+0x39/0x50 [dwc3] [ 81.488808] dwc3_gadget_disconnect_interrupt+0x21b/0x250 [dwc3] [ 81.495014] dwc3_thread_interrupt+0x2a8/0xf70 [dwc3] [ 81.500219] ? __schedule+0x78c/0x7e0 [ 81.504027] irq_thread_fn+0x18/0x30 [ 81.507715] ? irq_thread+0xb7/0x180 [ 81.511400] irq_thread+0x111/0x180 [ 81.515000] ? irq_finalize_oneshot+0xe0/0xe0 [ 81.519490] ? wake_threads_waitq+0x30/0x30 [ 81.523806] kthread+0x107/0x110 [ 81.527131] ? disable_percpu_irq+0x50/0x50 [ 81.531439] ? kthread_stop+0x150/0x150 [ 81.535397] ret_from_fork+0x19/0x24 [ 81.539136] Code: 89 d8 c7 45 ec 00 00 00 00 c7 45 f0 00 00 00 00 c7 45 = f4 00 00 00 00 e8 56 ef ff ff 85 c0 74 12 50 68 b9 1c 14 f8 e8 64 0f f7 c8 = <0f> ff 58 5a 8d 76 00 8b 83 98 00 00 00 c6 83 a0 00 00 00 00 83 [ 81.559295] ---[ end trace f3133eec81a473b8 ]--- Number of iterations measured on 4 consecutive unplugs: [ 1088.799777] dwc3_send_gadget_ep_cmd(cmd=3D331016, params=3D{0, 0, 0}) it= erated 605 times [ 1222.024986] dwc3_send_gadget_ep_cmd(cmd=3D331016, params=3D{0, 0, 0}) it= erated 580 times [ 1317.590452] dwc3_send_gadget_ep_cmd(cmd=3D331016, params=3D{0, 0, 0}) it= erated 598 times [ 1453.218314] dwc3_send_gadget_ep_cmd(cmd=3D331016, params=3D{0, 0, 0}) it= erated 594 times Signed-off-by: Vincent Pelletier Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index f064f1549333..97e52c0d1a72 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -267,7 +267,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed cmd, { const struct usb_endpoint_descriptor *desc =3D dep->endpoint.desc; struct dwc3 *dwc =3D dep->dwc; - u32 timeout =3D 500; + u32 timeout =3D 1000; u32 reg; =20 int cmd_status =3D 0; --=20 2.11.0