From: changbin.du@intel.com
To: balbi@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, "Du,
Changbin" <changbin.du@intel.com>,
Du@vger.kernel.org
Subject: [PATCH] usb: dwc3: usb/dwc3: fake dissconnect event when turn off pullup
Date: Wed, 27 Apr 2016 16:29:05 +0800 [thread overview]
Message-ID: <1461745745-3954-1-git-send-email-changbin.du@intel.com> (raw)
From: "Du, Changbin" <changbin.du@intel.com>
The dwc3 controller can't generate a disconnect event after it is
stopped. Thus gadget dissconnect callback is not invoked when do
soft dissconnect. Call dissconnect here to workaround this issue.
Note, most time we still see disconnect be called that because
it is invoked by dwc3_gadget_reset_interrupt(). But if we
disconnect cable once pullup disabled quickly, issue can be
observed.
Signed-off-by: Du, Changbin <changbin.du@intel.com>
---
drivers/usb/dwc3/gadget.c | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 8e4a1b1..cd73187 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1566,6 +1566,15 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
return 0;
}
+static void dwc3_disconnect_gadget(struct dwc3 *dwc)
+{
+ if (dwc->gadget_driver && dwc->gadget_driver->disconnect) {
+ spin_unlock(&dwc->lock);
+ dwc->gadget_driver->disconnect(&dwc->gadget);
+ spin_lock(&dwc->lock);
+ }
+}
+
static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
{
struct dwc3 *dwc = gadget_to_dwc(g);
@@ -1575,6 +1584,21 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
is_on = !!is_on;
spin_lock_irqsave(&dwc->lock, flags);
+ /**
+ * WORKAROUND: The dwc3 controller can't generate a disconnect
+ * event after it is stopped. Thus gadget dissconnect callback
+ * is not invoked when do soft dissconnect. Call dissconnect
+ * here to workaround this issue.
+ * Note, most time we still see disconnect be called that because
+ * it is invoked by dwc3_gadget_reset_interrupt(). But if we
+ * disconnect cable once pullup disabled quickly, issue can be
+ * observed.
+ */
+ if (!is_on && (dwc->gadget.speed != USB_SPEED_UNKNOWN)) {
+ dev_dbg(dwc->dev, "fake dissconnect event on pullup off\n");
+ dwc3_disconnect_gadget(dwc);
+ dwc->gadget.speed = USB_SPEED_UNKNOWN;
+ }
ret = dwc3_gadget_run_stop(dwc, is_on, false);
spin_unlock_irqrestore(&dwc->lock, flags);
@@ -2144,15 +2168,6 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
}
}
-static void dwc3_disconnect_gadget(struct dwc3 *dwc)
-{
- if (dwc->gadget_driver && dwc->gadget_driver->disconnect) {
- spin_unlock(&dwc->lock);
- dwc->gadget_driver->disconnect(&dwc->gadget);
- spin_lock(&dwc->lock);
- }
-}
-
static void dwc3_suspend_gadget(struct dwc3 *dwc)
{
if (dwc->gadget_driver && dwc->gadget_driver->suspend) {
--
2.7.4
next reply other threads:[~2016-04-27 8:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-27 8:29 changbin.du [this message]
2016-04-27 9:31 ` Felipe Balbi
2016-04-27 11:27 ` Du, Changbin
2016-04-28 6:46 ` Felipe Balbi
2016-04-28 19:39 ` John Youn
2016-04-29 6:10 ` Felipe Balbi
2016-05-02 1:46 ` John Youn
2016-05-04 10:40 ` Felipe Balbi
2016-05-05 3:16 ` John Youn
2016-05-06 8:00 ` Felipe Balbi
2016-05-05 8:06 ` Peter Chen
2016-05-06 7:01 ` Felipe Balbi
2016-05-06 7:38 ` Peter Chen
2016-05-06 7:52 ` Felipe Balbi
2016-04-27 12:04 ` Sergei Shtylyov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461745745-3954-1-git-send-email-changbin.du@intel.com \
--to=changbin.du@intel.com \
--cc=Du@vger.kernel.org \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome