From: Ran Wang <ran.wang_1@nxp.com>
To: Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tejas Joglekar <Tejas.Joglekar@synopsys.com>,
Jun Li <jun.li@nxp.com>, Peter Chen <peter.chen@nxp.com>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Ran Wang <ran.wang_1@nxp.com>,
stable@vger.kernel.org
Subject: [PATCH] usb: dwc3: gadget: Fix controller get stuck when kicking extra transfer in wrong case
Date: Tue, 7 Jan 2020 15:14:41 +0800 [thread overview]
Message-ID: <20200107071441.480-1-ran.wang_1@nxp.com> (raw)
According to original commit c96e6725db9d6a ("usb: dwc3: gadget: Correct the
logic for queuing sgs"), we would only kick off another transfer in case of
req->num_pending_sgs > 0.
However, current logic will do this as long as req->remaining > 0, this will
include the case of non-sgs (both dwc3_gadget_ep_request_completed(req) and
req->num_pending_sgs are 0) that we did not want to.
Without this fix, we observed dwc3 got stuck on Layerscape plaftorms (such as
LS1088ARDB) when enabling gadget (mass storage function) as below:
[ 27.923959] Mass Storage Function, version: 2009/09/11
[ 27.929115] LUN: removable file: (no medium)
[ 27.933432] LUN: file: /run/media/sda1/419/test
[ 27.937963] Number of LUNs=1
[ 27.941042] g_mass_storage gadget: Mass Storage Gadget, version: 2009/09/11
[ 27.948019] g_mass_storage gadget: userspace failed to provide iSerialNumber
[ 27.955069] g_mass_storage gadget: g_mass_storage ready
[ 28.411188] g_mass_storage gadget: super-speed config #1: Linux File-Backed Storage
[ 48.319766] g_mass_storage gadget: super-speed config #1: Linux File-Backed Storage
[ 68.320794] g_mass_storage gadget: super-speed config #1: Linux File-Backed Storage
[ 88.319898] g_mass_storage gadget: super-speed config #1: Linux File-Backed Storage
[ 108.320808] g_mass_storage gadget: super-speed config #1: Linux File-Backed Storage
[ 128.323419] g_mass_storage gadget: super-speed config #1: Linux File-Backed Storage
[ 148.320857] g_mass_storage gadget: super-speed config #1: Linux File-Backed Storage
[ 148.362023] g_mass_storage gadget: super-speed config #0: unconfigured
Fixes: 8c7d4b7b3d43 ("usb: dwc3: gadget: Fix logical condition")
Cc: stable@vger.kernel.org
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
---
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 0c960a9..5b0f02f 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2491,7 +2491,7 @@ static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep,
req->request.actual = req->request.length - req->remaining;
- if (!dwc3_gadget_ep_request_completed(req) ||
+ if (!dwc3_gadget_ep_request_completed(req) &&
req->num_pending_sgs) {
__dwc3_gadget_kick_transfer(dep);
goto out;
--
2.7.4
next reply other threads:[~2020-01-07 7:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 7:14 Ran Wang [this message]
2020-01-07 10:15 ` [PATCH] usb: dwc3: gadget: Fix controller get stuck when kicking extra transfer in wrong case Tejas Joglekar
2020-01-08 2:38 ` Ran Wang
2020-01-09 9:05 ` Felipe Balbi
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=20200107071441.480-1-ran.wang_1@nxp.com \
--to=ran.wang_1@nxp.com \
--cc=Tejas.Joglekar@synopsys.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jun.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@nxp.com \
--cc=stable@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