From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753776AbdLGM6j (ORCPT ); Thu, 7 Dec 2017 07:58:39 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:60216 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753853AbdLGM6f (ORCPT ); Thu, 7 Dec 2017 07:58:35 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Xu , Guodong Xu , Amit Pundir , YongQin Liu , John Youn , Minas Harutyunyan , Douglas Anderson , Chen Yu , Felipe Balbi , linux-usb@vger.kernel.org, Minas Harutyunyan , John Stultz , Sasha Levin Subject: [PATCH 4.9 022/109] usb: dwc2: Fix UDC state tracking Date: Thu, 7 Dec 2017 13:56:06 +0100 Message-Id: <20171207125637.225343907@linuxfoundation.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171207125634.631485452@linuxfoundation.org> References: <20171207125634.631485452@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: John Stultz [ Upstream commit ce2b21a4e5ce042c0a42c9db8fa9e0f849427d5e ] It has been noticed that the dwc2 udc state reporting doesn't seem to work (at least on HiKey boards). Where after the initial setup, the sysfs /sys/class/udc/f72c0000.usb/state file would report "configured" no matter the state of the OTG port. This patch adds a call so that we report to the UDC layer when the gadget device is disconnected. This patch does depend on the previous patch ("usb: dwc2: Improve gadget state disconnection handling") in this patch set in order to properly work. Cc: Wei Xu Cc: Guodong Xu Cc: Amit Pundir Cc: YongQin Liu Cc: John Youn Cc: Minas Harutyunyan Cc: Douglas Anderson Cc: Chen Yu Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Acked-by: Minas Harutyunyan Tested-by: Minas Harutyunyan Reported-by: Amit Pundir Signed-off-by: John Stultz Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc2/gadget.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -2467,6 +2467,8 @@ void dwc2_hsotg_disconnect(struct dwc2_h call_gadget(hsotg, disconnect); hsotg->lx_state = DWC2_L3; + + usb_gadget_set_state(&hsotg->gadget, USB_STATE_NOTATTACHED); } /** 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,022/109] usb: dwc2: Fix UDC state tracking From: Greg Kroah-Hartman Message-Id: <20171207125637.225343907@linuxfoundation.org> Date: Thu, 7 Dec 2017 13:56:06 +0100 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Xu , Guodong Xu , Amit Pundir , YongQin Liu , John Youn , Minas Harutyunyan , Douglas Anderson , Chen Yu , Felipe Balbi , linux-usb@vger.kernel.org, Minas Harutyunyan , John Stultz , Sasha Levin List-ID: NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IEpvaG4gU3R1bHR6 IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgoKClsgVXBzdHJlYW0gY29tbWl0IGNlMmIyMWE0ZTVj ZTA0MmMwYTQyYzlkYjhmYTllMGY4NDk0MjdkNWUgXQoKSXQgaGFzIGJlZW4gbm90aWNlZCB0aGF0 IHRoZSBkd2MyIHVkYyBzdGF0ZSByZXBvcnRpbmcgZG9lc24ndApzZWVtIHRvIHdvcmsgKGF0IGxl YXN0IG9uIEhpS2V5IGJvYXJkcykuIFdoZXJlIGFmdGVyIHRoZSBpbml0aWFsCnNldHVwLCB0aGUg c3lzZnMgL3N5cy9jbGFzcy91ZGMvZjcyYzAwMDAudXNiL3N0YXRlIGZpbGUgd291bGQKcmVwb3J0 ICJjb25maWd1cmVkIiBubyBtYXR0ZXIgdGhlIHN0YXRlIG9mIHRoZSBPVEcgcG9ydC4KClRoaXMg cGF0Y2ggYWRkcyBhIGNhbGwgc28gdGhhdCB3ZSByZXBvcnQgdG8gdGhlIFVEQyBsYXllciB3aGVu CnRoZSBnYWRnZXQgZGV2aWNlIGlzIGRpc2Nvbm5lY3RlZC4KClRoaXMgcGF0Y2ggZG9lcyBkZXBl bmQgb24gdGhlIHByZXZpb3VzIHBhdGNoICgidXNiOiBkd2MyOgpJbXByb3ZlIGdhZGdldCBzdGF0 ZSBkaXNjb25uZWN0aW9uIGhhbmRsaW5nIikgaW4gdGhpcyBwYXRjaCBzZXQKaW4gb3JkZXIgdG8g cHJvcGVybHkgd29yay4KCkNjOiBXZWkgWHUgPHh1d2VpNUBoaXNpbGljb24uY29tPgpDYzogR3Vv ZG9uZyBYdSA8Z3VvZG9uZy54dUBsaW5hcm8ub3JnPgpDYzogQW1pdCBQdW5kaXIgPGFtaXQucHVu ZGlyQGxpbmFyby5vcmc+CkNjOiBZb25nUWluIExpdSA8eW9uZ3Fpbi5saXVAbGluYXJvLm9yZz4K Q2M6IEpvaG4gWW91biA8am9obnlvdW5Ac3lub3BzeXMuY29tPgpDYzogTWluYXMgSGFydXR5dW55 YW4gPE1pbmFzLkhhcnV0eXVueWFuQHN5bm9wc3lzLmNvbT4KQ2M6IERvdWdsYXMgQW5kZXJzb24g PGRpYW5kZXJzQGNocm9taXVtLm9yZz4KQ2M6IENoZW4gWXUgPGNoZW55dTU2QGh1YXdlaS5jb20+ CkNjOiBGZWxpcGUgQmFsYmkgPGZlbGlwZS5iYWxiaUBsaW51eC5pbnRlbC5jb20+CkNjOiBHcmVn IEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgpDYzogbGludXgtdXNi QHZnZXIua2VybmVsLm9yZwpBY2tlZC1ieTogTWluYXMgSGFydXR5dW55YW4gPGhtaW5hc0BzeW5v cHN5cy5jb20+ClRlc3RlZC1ieTogTWluYXMgSGFydXR5dW55YW4gPGhtaW5hc0BzeW5vcHN5cy5j b20+ClJlcG9ydGVkLWJ5OiBBbWl0IFB1bmRpciA8YW1pdC5wdW5kaXJAbGluYXJvLm9yZz4KU2ln bmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+ClNpZ25lZC1v ZmYtYnk6IEZlbGlwZSBCYWxiaSA8ZmVsaXBlLmJhbGJpQGxpbnV4LmludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogU2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZpbkB2ZXJpem9uLmNvbT4KU2lnbmVk LW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4K LS0tCiBkcml2ZXJzL3VzYi9kd2MyL2dhZGdldC5jIHwgICAgMiArKwogMSBmaWxlIGNoYW5nZWQs IDIgaW5zZXJ0aW9ucygrKQoKCgotLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2Vu ZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtdXNiIiBpbgp0aGUgYm9keSBvZiBhIG1lc3Nh Z2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBo dHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwKCi0tLSBhL2RyaXZlcnMv dXNiL2R3YzIvZ2FkZ2V0LmMKKysrIGIvZHJpdmVycy91c2IvZHdjMi9nYWRnZXQuYwpAQCAtMjQ2 Nyw2ICsyNDY3LDggQEAgdm9pZCBkd2MyX2hzb3RnX2Rpc2Nvbm5lY3Qoc3RydWN0IGR3YzJfaAog CiAJY2FsbF9nYWRnZXQoaHNvdGcsIGRpc2Nvbm5lY3QpOwogCWhzb3RnLT5seF9zdGF0ZSA9IERX QzJfTDM7CisKKwl1c2JfZ2FkZ2V0X3NldF9zdGF0ZSgmaHNvdGctPmdhZGdldCwgVVNCX1NUQVRF X05PVEFUVEFDSEVEKTsKIH0KIAogLyoqCg==