From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.9,139/241] usb: dwc2: Make sure we disconnect the gadget state From: Greg Kroah-Hartman Message-Id: <20180319180756.939772565@linuxfoundation.org> Date: Mon, 19 Mar 2018 19:06:44 +0100 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Xu , Guodong Xu , Amit Pundir , Rob Herring , John Youn , Douglas Anderson , Chen Yu , Felipe Balbi , linux-usb@vger.kernel.org, John Stultz , Sasha Levin List-ID: NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IEpvaG4gU3R1bHR6 IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgoKClsgVXBzdHJlYW0gY29tbWl0IGRhZDNmNzkzZjIw ZmJiNWMwYzM0MmYwZjVhMGJkZjY5YTRkNzYwODkgXQoKSSBoYWQgc2VlbiBzb21lIG9kZCBiZWhh dmlvciB3aXRoIEhpS2V5J3MgdXNiLWdhZGdldCBpbnRlcmZhY2UKdGhhdCBJIGZpbmFsbHkgc2Vl bWVkIHRvIGhhdmUgY2hhc2VkIGRvd24uIEJhc2ljYWxseSBldmVyeSBvdGhlcgp0aW1lIEkgcGx1 Z2dlZCBpbiB0aGUgT1RHIHBvcnQsIHRoZSBnYWRnZXQgaW50ZXJmYWNlIHdvdWxkCnByb3Blcmx5 IGluaXRpYWxpemUuIFRoZSBvdGhlciB0aW1lcywgSSdkIGdldCBhIGJpZyBXQVJOX09OCmluIGR3 YzJfaHNvdGdfaW5pdF9maWZvKCkgYWJvdXQgdGhlIGZpZm9fbWFwIG5vdCBiZWluZyBjbGVhci4K CkVuZHMgdXAgaWYgd2UgZG9uJ3QgZGlzY29ubmVjdCB0aGUgZ2FkZ2V0IHN0YXRlLCB0aGUgZmlm by1tYXAKZG9lc24ndCBnZXQgY2xlYXJlZCBwcm9wZXJseSwgd2hpY2ggY2F1c2VzIFdBUk5fT04g bWVzc2FnZXMgYW5kCmFsc28gcmVzdWx0cyBpbiB0aGUgZGV2aWNlIG5vdCBwcm9wZXJseSBiZWlu ZyBzZXR1cCBhcyBhIGdhZGdldApldmVyeSBvdGhlciB0aW1lIHRoZSBPVEcgcG9ydCBpcyBjb25u ZWN0ZWQuCgpTbyB0aGlzIHBhdGNoIGFkZHMgYSBjYWxsIHRvIGR3YzJfaHNvdGdfZGlzY29ubmVj dCgpIGluIHRoZQpyZXNldCBwYXRoIHNvIHRoZSBzdGF0ZSBpcyBwcm9wZXJseSBjbGVhcmVkLgoK V2l0aCBpdCwgdGhlIGdhZGdldCBpbnRlcmZhY2UgaW5pdGlhbGl6ZXMgcHJvcGVybHkgb24gZXZl cnkKcGx1ZyBpbi4KCkNjOiBXZWkgWHUgPHh1d2VpNUBoaXNpbGljb24uY29tPgpDYzogR3VvZG9u ZyBYdSA8Z3VvZG9uZy54dUBsaW5hcm8ub3JnPgpDYzogQW1pdCBQdW5kaXIgPGFtaXQucHVuZGly QGxpbmFyby5vcmc+CkNjOiBSb2IgSGVycmluZyA8cm9iaCtkdEBrZXJuZWwub3JnPgpDYzogSm9o biBZb3VuIDxqb2hueW91bkBzeW5vcHN5cy5jb20+CkNjOiBEb3VnbGFzIEFuZGVyc29uIDxkaWFu ZGVyc0BjaHJvbWl1bS5vcmc+CkNjOiBDaGVuIFl1IDxjaGVueXU1NkBodWF3ZWkuY29tPgpDYzog RmVsaXBlIEJhbGJpIDxmZWxpcGUuYmFsYmlAbGludXguaW50ZWwuY29tPgpDYzogR3JlZyBLcm9h aC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KQ2M6IGxpbnV4LXVzYkB2Z2Vy Lmtlcm5lbC5vcmcKQWNrZWQtYnk6IEpvaG4gWW91biA8am9obnlvdW5Ac3lub3BzeXMuY29tPgpT aWduZWQtb2ZmLWJ5OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KU2lnbmVk LW9mZi1ieTogRmVsaXBlIEJhbGJpIDxmZWxpcGUuYmFsYmlAbGludXguaW50ZWwuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8YWxleGFuZGVyLmxldmluQG1pY3Jvc29mdC5jb20+ClNp Z25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5v cmc+Ci0tLQogZHJpdmVycy91c2IvZHdjMi9oY2QuYyB8ICAgIDEgKwogMSBmaWxlIGNoYW5nZWQs IDEgaW5zZXJ0aW9uKCspCgoKCi0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5k IHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC11c2IiIGluCnRoZSBib2R5IG9mIGEgbWVzc2Fn ZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0 dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAoKLS0tIGEvZHJpdmVycy91 c2IvZHdjMi9oY2QuYworKysgYi9kcml2ZXJzL3VzYi9kd2MyL2hjZC5jCkBAIC0zMjIwLDYgKzMy MjAsNyBAQCBzdGF0aWMgdm9pZCBkd2MyX2Nvbm5faWRfc3RhdHVzX2NoYW5nZShzCiAJCWR3YzJf Y29yZV9pbml0KGhzb3RnLCBmYWxzZSk7CiAJCWR3YzJfZW5hYmxlX2dsb2JhbF9pbnRlcnJ1cHRz KGhzb3RnKTsKIAkJc3Bpbl9sb2NrX2lycXNhdmUoJmhzb3RnLT5sb2NrLCBmbGFncyk7CisJCWR3 YzJfaHNvdGdfZGlzY29ubmVjdChoc290Zyk7CiAJCWR3YzJfaHNvdGdfY29yZV9pbml0X2Rpc2Nv bm5lY3RlZChoc290ZywgZmFsc2UpOwogCQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZoc290Zy0+ bG9jaywgZmxhZ3MpOwogCQlkd2MyX2hzb3RnX2NvcmVfY29ubmVjdChoc290Zyk7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3490358-1521483876-2-11171603263918104617 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.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' 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=1521483876; b=NR3noCSMHZHwCqiOC134bT5n3+BQRXc7vBXOpXc17Y0/VZX JcSR5qEmLWaQ4Qex7tTa3rotGSnBlzh55s3PrQey0w+qtLfVyurhlKL7T1tkFeaW FF/fAviQNcsWBh2/7EL/dXV8+I9/FcAu/T79n5q4uSDeCrz1V3ikVrN/aYmMxufn w38ETNM/Whlmlqg1ntmNCNmqhoPUBXF1EGAdaDyLuaG1f9zD2SUWQjQcbZ3kD22R T0bibrn2vmwElHrLtaKo2l15eqUG10MGGM7PTN5Y7AVBUlkZB4pt3yGvmyXAsJqA TxLZ7MCKOw0nP54JxfIxKI+Ve8tw55rwdYooh6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1521483876; bh=QR8qPRV2ZmGuzBGYTOTvZyZ/Kx 0IV9ML0os/Ndey8Iw=; b=oJe9BHZhy7p+6RFJ+VcaJnhFH+lUQ9UOM3V86qL0aC z1FRBOugnzMFH0Hmng0i0ln5zLWO7WZzzs+5LmAQRe9MEsI6lHRn95bsSvvSalhA xgihUFb4lihb5hU060rGkoh5mRckSdsZjOKSo9KfnpnZAnj570k+3TOIUdDZjz5V fNGrZ//WIuekq3+/tDP4mf4shxxz17ods7alKMElXM9e0o9EFxLnXaXUhNkC3Kyp AfZn+AutHaWimtydC5y40luulE08y+a//Jf0VyGCWdy3TtzKvABy9fMMRuG78Jph mBCsaE9lb1Y7J89fRsahYS6guuFvuEbGEczygqqgMk7w== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduuddvucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkofgjfhgfgggtshhpjeesthdtfedtreerjeenucfhrhhomhepifhrvghgucfmrhhorghhqdfjrghrthhmrghnuceoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhgqeenucfkphepvddtledrudefvddrudektddrieejpdeltddrledvrdeiuddrvddtvdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeefledugeenucevlhhushhtvghrufhiiigvpeduvddv; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduuddvucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkofgjfhgfgggtshhpjeesthdtfedtreerjeenucfhrhhomhepifhrvghgucfmrhhorghhqdfjrghrthhmrghnuceoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhgqeenucfkphepvddtledrudefvddrudektddrieejpdeltddrledvrdeiuddrvddtvdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeefledugeenucevlhhushhtvghrufhiiigvpeduvddv; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969671AbeCSSYd (ORCPT ); Mon, 19 Mar 2018 14:24:33 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:49946 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S969639AbeCSSY2 (ORCPT ); Mon, 19 Mar 2018 14:24:28 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Xu , Guodong Xu , Amit Pundir , Rob Herring , John Youn , Douglas Anderson , Chen Yu , Felipe Balbi , linux-usb@vger.kernel.org, John Stultz , Sasha Levin Subject: [PATCH 4.9 139/241] usb: dwc2: Make sure we disconnect the gadget state Date: Mon, 19 Mar 2018 19:06:44 +0100 Message-Id: <20180319180756.939772565@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: John Stultz [ Upstream commit dad3f793f20fbb5c0c342f0f5a0bdf69a4d76089 ] I had seen some odd behavior with HiKey's usb-gadget interface that I finally seemed to have chased down. Basically every other time I plugged in the OTG port, the gadget interface would properly initialize. The other times, I'd get a big WARN_ON in dwc2_hsotg_init_fifo() about the fifo_map not being clear. Ends up if we don't disconnect the gadget state, the fifo-map doesn't get cleared properly, which causes WARN_ON messages and also results in the device not properly being setup as a gadget every other time the OTG port is connected. So this patch adds a call to dwc2_hsotg_disconnect() in the reset path so the state is properly cleared. With it, the gadget interface initializes properly on every plug in. Cc: Wei Xu Cc: Guodong Xu Cc: Amit Pundir Cc: Rob Herring Cc: John Youn Cc: Douglas Anderson Cc: Chen Yu Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Acked-by: John Youn Signed-off-by: John Stultz Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc2/hcd.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -3220,6 +3220,7 @@ static void dwc2_conn_id_status_change(s dwc2_core_init(hsotg, false); dwc2_enable_global_interrupts(hsotg); spin_lock_irqsave(&hsotg->lock, flags); + dwc2_hsotg_disconnect(hsotg); dwc2_hsotg_core_init_disconnected(hsotg, false); spin_unlock_irqrestore(&hsotg->lock, flags); dwc2_hsotg_core_connect(hsotg);