It always sets DWC3_EP_END_TRANSFER_PENDING in dwc3_stop_active_transfer
even if dwc3_send_gadget_ep_cmd fails. It can cause some problems like
skipping clear stall commmand or giveback from dequeue. We fix to set it
only when ep cmd success. Additionally, We clear DWC3_EP_TRANSFER_STARTED
for next trb to start transfer not update transfer.
Change-Id: I2e6b58acc99f385e467e8b639a3792a5e5f4d2bb
Signed-off-by: Daehwan Jung <[email protected]>
---
drivers/usb/dwc3/gadget.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 183b90923f51..3ad3bc5813ca 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2044,6 +2044,12 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
dwc3_gadget_move_cancelled_request(r,
DWC3_REQUEST_STATUS_DEQUEUED);
+ /* If ep cmd fails, then force to giveback cancelled requests here */
+ if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING)) {
+ dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
+ dwc3_gadget_ep_cleanup_cancelled_requests(dep);
+ }
+
dep->flags &= ~DWC3_EP_WAIT_TRANSFER_COMPLETE;
goto out;
@@ -3645,7 +3651,7 @@ static void dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force,
if (!interrupt)
dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
- else
+ else if (!ret)
dep->flags |= DWC3_EP_END_TRANSFER_PENDING;
}
--
2.31.1
Hi Daehwan,
On 2/14/2022 1:37 AM, Daehwan Jung wrote:
> It always sets DWC3_EP_END_TRANSFER_PENDING in dwc3_stop_active_transfer
> even if dwc3_send_gadget_ep_cmd fails. It can cause some problems like
> skipping clear stall commmand or giveback from dequeue. We fix to set it
> only when ep cmd success. Additionally, We clear DWC3_EP_TRANSFER_STARTED
> for next trb to start transfer not update transfer.
>
> Change-Id: I2e6b58acc99f385e467e8b639a3792a5e5f4d2bb
> Signed-off-by: Daehwan Jung <[email protected]>
> ---
> drivers/usb/dwc3/gadget.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index 183b90923f51..3ad3bc5813ca 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -2044,6 +2044,12 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
> dwc3_gadget_move_cancelled_request(r,
> DWC3_REQUEST_STATUS_DEQUEUED);
>
> + /* If ep cmd fails, then force to giveback cancelled requests here */
> + if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING)) {
> + dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
> + dwc3_gadget_ep_cleanup_cancelled_requests(dep);
> + }
> +
What I realized when looking at the endxfer command fail due to TIMEOUT,
was that it would lead to subsequent controller halt failures as well
(during pullup disable case). It might not be safe to forcefully unmap
the request buffers if the controller may still be "working" on it.
I found some interesting quirks with regards to endxfer timeouts as
well, which I'm trying to get some more feedback on [1]. What is the
end issue being seen that requires this change? (we may have run into
the same issue as well.
[1] -
https://lore.kernel.org/linux-usb/[email protected]/
Thanks
Wesley Cheng
> dep->flags &= ~DWC3_EP_WAIT_TRANSFER_COMPLETE;
>
> goto out;
> @@ -3645,7 +3651,7 @@ static void dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force,
>
> if (!interrupt)
> dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
> - else
> + else if (!ret)
> dep->flags |= DWC3_EP_END_TRANSFER_PENDING;
> }
>