[v2] usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields

Commit Message

John Stultz Jan. 27, 2020, 7:30 p.m. UTC

From: Anurag Kumar Vulisha <[e-mail]>

The current code in dwc3_gadget_ep_reclaim_completed_trb() will
check for IOC/LST bit in the event->status and returns if
IOC/LST bit is set. This logic doesn't work if multiple TRBs
are queued per request and the IOC/LST bit is set on the last
TRB of that request.

Consider an example where a queued request has multiple queued
TRBs and IOC/LST bit is set only for the last TRB. In this case,
the core generates XferComplete/XferInProgress events only for
the last TRB (since IOC/LST are set only for the last TRB). As
per the logic in dwc3_gadget_ep_reclaim_completed_trb()
event->status is checked for IOC/LST bit and returns on the
first TRB. This leaves the remaining TRBs left unhandled.

Similarly, if the gadget function enqueues an unaligned request
with sglist already in it, it should fail the same way, since we
will append another TRB to something that already uses more than
one TRB.

To aviod this, this patch changes the code to check for IOC/LST
bits in TRB->ctrl instead.

At a practical level, this patch resolves USB transfer stalls seen
with adb on dwc3 based HiKey960 after functionfs gadget added
scatter-gather support around v4.20.

Cc: Felipe Balbi <[e-mail]>
Cc: Yang Fei <[e-mail]>
Cc: Thinh Nguyen <[e-mail]>
Cc: Tejas Joglekar <[e-mail]>
Cc: Andrzej Pietrasiewicz <[e-mail]>
Cc: Jack Pham <[e-mail]>
Cc: Todd Kjos <[e-mail]>
Cc: Greg KH <[e-mail]>
Cc: Linux USB List <[e-mail]>
Cc: stable <[e-mail]>
Tested-by: Tejas Joglekar <[e-mail]>
Reviewed-by: Thinh Nguyen <[e-mail]>
Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
[jstultz: forward ported to mainline, reworded commit log, reworked
 to only check trb->ctrl as suggested by Felipe]
Signed-off-by: John Stultz <[e-mail]>
---
v2:
* Rework to only check trb->ctrl as suggested by Felipe
* Reword the commit message to include more of Felipe's assessment
---
 drivers/usb/dwc3/gadget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Felipe Balbi Jan. 28, 2020, 1:22 p.m. UTC | #1

Hi,

John Stultz <[e-mail]> writes:

> From: Anurag Kumar Vulisha <[e-mail]>
>
> The current code in dwc3_gadget_ep_reclaim_completed_trb() will
> check for IOC/LST bit in the event->status and returns if
> IOC/LST bit is set. This logic doesn't work if multiple TRBs
> are queued per request and the IOC/LST bit is set on the last
> TRB of that request.
>
> Consider an example where a queued request has multiple queued
> TRBs and IOC/LST bit is set only for the last TRB. In this case,
> the core generates XferComplete/XferInProgress events only for
> the last TRB (since IOC/LST are set only for the last TRB). As
> per the logic in dwc3_gadget_ep_reclaim_completed_trb()
> event->status is checked for IOC/LST bit and returns on the
> first TRB. This leaves the remaining TRBs left unhandled.
>
> Similarly, if the gadget function enqueues an unaligned request
> with sglist already in it, it should fail the same way, since we
> will append another TRB to something that already uses more than
> one TRB.
>
> To aviod this, this patch changes the code to check for IOC/LST
> bits in TRB->ctrl instead.
>
> At a practical level, this patch resolves USB transfer stalls seen
> with adb on dwc3 based HiKey960 after functionfs gadget added
> scatter-gather support around v4.20.
>
> Cc: Felipe Balbi <[e-mail]>
> Cc: Yang Fei <[e-mail]>
> Cc: Thinh Nguyen <[e-mail]>
> Cc: Tejas Joglekar <[e-mail]>
> Cc: Andrzej Pietrasiewicz <[e-mail]>
> Cc: Jack Pham <[e-mail]>
> Cc: Todd Kjos <[e-mail]>
> Cc: Greg KH <[e-mail]>
> Cc: Linux USB List <[e-mail]>
> Cc: stable <[e-mail]>
> Tested-by: Tejas Joglekar <[e-mail]>
> Reviewed-by: Thinh Nguyen <[e-mail]>
> Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
> [jstultz: forward ported to mainline, reworded commit log, reworked
>  to only check trb->ctrl as suggested by Felipe]
> Signed-off-by: John Stultz <[e-mail]>
> ---
> v2:
> * Rework to only check trb->ctrl as suggested by Felipe
> * Reword the commit message to include more of Felipe's assessment
> ---
>  drivers/usb/dwc3/gadget.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index 154f3f3e8cff..9a085eee1ae3 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -2420,7 +2420,8 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,
>  	if (event->status & DEPEVT_STATUS_SHORT && !chain)
>  		return 1;
>  
> -	if (event->status & DEPEVT_STATUS_IOC)
> +	if ((trb->ctrl & DWC3_TRB_CTRL_IOC) ||
> +	    (trb->ctrl & DWC3_TRB_CTRL_LST))

why the LST bit here? It wasn't there before. In fact, we never set LST
in dwc3 anymore :-)

John Stultz Jan. 28, 2020, 5:55 p.m. UTC | #2

On Tue, Jan 28, 2020 at 5:23 AM Felipe Balbi <[e-mail]> wrote:
>
>
> Hi,
>
> John Stultz <[e-mail]> writes:
>
> > From: Anurag Kumar Vulisha <[e-mail]>
> >
> > The current code in dwc3_gadget_ep_reclaim_completed_trb() will
> > check for IOC/LST bit in the event->status and returns if
> > IOC/LST bit is set. This logic doesn't work if multiple TRBs
> > are queued per request and the IOC/LST bit is set on the last
> > TRB of that request.
> >
> > Consider an example where a queued request has multiple queued
> > TRBs and IOC/LST bit is set only for the last TRB. In this case,
> > the core generates XferComplete/XferInProgress events only for
> > the last TRB (since IOC/LST are set only for the last TRB). As
> > per the logic in dwc3_gadget_ep_reclaim_completed_trb()
> > event->status is checked for IOC/LST bit and returns on the
> > first TRB. This leaves the remaining TRBs left unhandled.
> >
> > Similarly, if the gadget function enqueues an unaligned request
> > with sglist already in it, it should fail the same way, since we
> > will append another TRB to something that already uses more than
> > one TRB.
> >
> > To aviod this, this patch changes the code to check for IOC/LST
> > bits in TRB->ctrl instead.
> >
> > At a practical level, this patch resolves USB transfer stalls seen
> > with adb on dwc3 based HiKey960 after functionfs gadget added
> > scatter-gather support around v4.20.
> >
> > Cc: Felipe Balbi <[e-mail]>
> > Cc: Yang Fei <[e-mail]>
> > Cc: Thinh Nguyen <[e-mail]>
> > Cc: Tejas Joglekar <[e-mail]>
> > Cc: Andrzej Pietrasiewicz <[e-mail]>
> > Cc: Jack Pham <[e-mail]>
> > Cc: Todd Kjos <[e-mail]>
> > Cc: Greg KH <[e-mail]>
> > Cc: Linux USB List <[e-mail]>
> > Cc: stable <[e-mail]>
> > Tested-by: Tejas Joglekar <[e-mail]>
> > Reviewed-by: Thinh Nguyen <[e-mail]>
> > Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
> > [jstultz: forward ported to mainline, reworded commit log, reworked
> >  to only check trb->ctrl as suggested by Felipe]
> > Signed-off-by: John Stultz <[e-mail]>
> > ---
> > v2:
> > * Rework to only check trb->ctrl as suggested by Felipe
> > * Reword the commit message to include more of Felipe's assessment
> > ---
> >  drivers/usb/dwc3/gadget.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> > index 154f3f3e8cff..9a085eee1ae3 100644
> > --- a/drivers/usb/dwc3/gadget.c
> > +++ b/drivers/usb/dwc3/gadget.c
> > @@ -2420,7 +2420,8 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,
> >       if (event->status & DEPEVT_STATUS_SHORT && !chain)
> >               return 1;
> >
> > -     if (event->status & DEPEVT_STATUS_IOC)
> > +     if ((trb->ctrl & DWC3_TRB_CTRL_IOC) ||
> > +         (trb->ctrl & DWC3_TRB_CTRL_LST))
>
> why the LST bit here? It wasn't there before. In fact, we never set LST
> in dwc3 anymore :-)

So, it was in the patch before, just on separate lines:
  https://lore.kernel.org/lkml/[e-mail]/

- if (event->status & DEPEVT_STATUS_IOC)
+ if ((event->status & DEPEVT_STATUS_IOC) &&
+    (trb->ctrl & DWC3_TRB_CTRL_IOC))
+ return 1;
+
+ if ((event->status & DEPEVT_STATUS_LST) &&
+    (trb->ctrl & DWC3_TRB_CTRL_LST))
  return 1;

So I just merged the two checks into one line. But I'm ok to drop the
CTRL_LST check if that really isn't used.  Let me know and I'll rework
and resend.

thanks
-john

Thinh Nguyen Jan. 28, 2020, 6:23 p.m. UTC | #3

Hi,

Felipe Balbi wrote:
> Hi,
>
> John Stultz <[e-mail]> writes:
>
>> From: Anurag Kumar Vulisha <[e-mail]>
>>
>> The current code in dwc3_gadget_ep_reclaim_completed_trb() will
>> check for IOC/LST bit in the event->status and returns if
>> IOC/LST bit is set. This logic doesn't work if multiple TRBs
>> are queued per request and the IOC/LST bit is set on the last
>> TRB of that request.
>>
>> Consider an example where a queued request has multiple queued
>> TRBs and IOC/LST bit is set only for the last TRB. In this case,
>> the core generates XferComplete/XferInProgress events only for
>> the last TRB (since IOC/LST are set only for the last TRB). As
>> per the logic in dwc3_gadget_ep_reclaim_completed_trb()
>> event->status is checked for IOC/LST bit and returns on the
>> first TRB. This leaves the remaining TRBs left unhandled.
>>
>> Similarly, if the gadget function enqueues an unaligned request
>> with sglist already in it, it should fail the same way, since we
>> will append another TRB to something that already uses more than
>> one TRB.
>>
>> To aviod this, this patch changes the code to check for IOC/LST
>> bits in TRB->ctrl instead.
>>
>> At a practical level, this patch resolves USB transfer stalls seen
>> with adb on dwc3 based HiKey960 after functionfs gadget added
>> scatter-gather support around v4.20.
>>
>> Cc: Felipe Balbi <[e-mail]>
>> Cc: Yang Fei <[e-mail]>
>> Cc: Thinh Nguyen <[e-mail]>
>> Cc: Tejas Joglekar <[e-mail]>
>> Cc: Andrzej Pietrasiewicz <[e-mail]>
>> Cc: Jack Pham <[e-mail]>
>> Cc: Todd Kjos <[e-mail]>
>> Cc: Greg KH <[e-mail]>
>> Cc: Linux USB List <[e-mail]>
>> Cc: stable <[e-mail]>
>> Tested-by: Tejas Joglekar <[e-mail]>
>> Reviewed-by: Thinh Nguyen <[e-mail]>
>> Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
>> [jstultz: forward ported to mainline, reworded commit log, reworked
>>   to only check trb->ctrl as suggested by Felipe]
>> Signed-off-by: John Stultz <[e-mail]>
>> ---
>> v2:
>> * Rework to only check trb->ctrl as suggested by Felipe
>> * Reword the commit message to include more of Felipe's assessment
>> ---
>>   drivers/usb/dwc3/gadget.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
>> index 154f3f3e8cff..9a085eee1ae3 100644
>> --- a/drivers/usb/dwc3/gadget.c
>> +++ b/drivers/usb/dwc3/gadget.c
>> @@ -2420,7 +2420,8 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,
>>   	if (event->status & DEPEVT_STATUS_SHORT && !chain)
>>   		return 1;
>>   
>> -	if (event->status & DEPEVT_STATUS_IOC)
>> +	if ((trb->ctrl & DWC3_TRB_CTRL_IOC) ||
>> +	    (trb->ctrl & DWC3_TRB_CTRL_LST))
> why the LST bit here? It wasn't there before. In fact, we never set LST
> in dwc3 anymore :-)
>

Just a note: right now, it may be fine for non-stream endpoints to not 
set the LST bit in the TRBs. For streams, we need to set this bit so the 
controller know to allocate resource for different transfers of 
different streams. It may be fine now if you think that it should be 
added later when more fixes for streams are added, but I think it 
doesn't hurt checking it now either.

BR,
Thinh

Felipe Balbi Jan. 29, 2020, 7:16 a.m. UTC | #4

Hi,

Thinh Nguyen <[e-mail]> writes:
>> John Stultz <[e-mail]> writes:
>>
>>> From: Anurag Kumar Vulisha <[e-mail]>
>>>
>>> The current code in dwc3_gadget_ep_reclaim_completed_trb() will
>>> check for IOC/LST bit in the event->status and returns if
>>> IOC/LST bit is set. This logic doesn't work if multiple TRBs
>>> are queued per request and the IOC/LST bit is set on the last
>>> TRB of that request.
>>>
>>> Consider an example where a queued request has multiple queued
>>> TRBs and IOC/LST bit is set only for the last TRB. In this case,
>>> the core generates XferComplete/XferInProgress events only for
>>> the last TRB (since IOC/LST are set only for the last TRB). As
>>> per the logic in dwc3_gadget_ep_reclaim_completed_trb()
>>> event->status is checked for IOC/LST bit and returns on the
>>> first TRB. This leaves the remaining TRBs left unhandled.
>>>
>>> Similarly, if the gadget function enqueues an unaligned request
>>> with sglist already in it, it should fail the same way, since we
>>> will append another TRB to something that already uses more than
>>> one TRB.
>>>
>>> To aviod this, this patch changes the code to check for IOC/LST
>>> bits in TRB->ctrl instead.
>>>
>>> At a practical level, this patch resolves USB transfer stalls seen
>>> with adb on dwc3 based HiKey960 after functionfs gadget added
>>> scatter-gather support around v4.20.
>>>
>>> Cc: Felipe Balbi <[e-mail]>
>>> Cc: Yang Fei <[e-mail]>
>>> Cc: Thinh Nguyen <[e-mail]>
>>> Cc: Tejas Joglekar <[e-mail]>
>>> Cc: Andrzej Pietrasiewicz <[e-mail]>
>>> Cc: Jack Pham <[e-mail]>
>>> Cc: Todd Kjos <[e-mail]>
>>> Cc: Greg KH <[e-mail]>
>>> Cc: Linux USB List <[e-mail]>
>>> Cc: stable <[e-mail]>
>>> Tested-by: Tejas Joglekar <[e-mail]>
>>> Reviewed-by: Thinh Nguyen <[e-mail]>
>>> Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
>>> [jstultz: forward ported to mainline, reworded commit log, reworked
>>>   to only check trb->ctrl as suggested by Felipe]
>>> Signed-off-by: John Stultz <[e-mail]>
>>> ---
>>> v2:
>>> * Rework to only check trb->ctrl as suggested by Felipe
>>> * Reword the commit message to include more of Felipe's assessment
>>> ---
>>>   drivers/usb/dwc3/gadget.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
>>> index 154f3f3e8cff..9a085eee1ae3 100644
>>> --- a/drivers/usb/dwc3/gadget.c
>>> +++ b/drivers/usb/dwc3/gadget.c
>>> @@ -2420,7 +2420,8 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,
>>>   	if (event->status & DEPEVT_STATUS_SHORT && !chain)
>>>   		return 1;
>>>   
>>> -	if (event->status & DEPEVT_STATUS_IOC)
>>> +	if ((trb->ctrl & DWC3_TRB_CTRL_IOC) ||
>>> +	    (trb->ctrl & DWC3_TRB_CTRL_LST))
>> why the LST bit here? It wasn't there before. In fact, we never set LST
>> in dwc3 anymore :-)
>
> Just a note: right now, it may be fine for non-stream endpoints to not 
> set the LST bit in the TRBs. For streams, we need to set this bit so the 
> controller know to allocate resource for different transfers of 
> different streams. It may be fine now if you think that it should be 
> added later when more fixes for streams are added, but I think it 
> doesn't hurt checking it now either.

Indeed. Let's keep this version as is if we will need LST for Streams
anyway. Sorry for the noise.

Felipe Balbi Jan. 29, 2020, 7:23 a.m. UTC | #5

Hi,

John Stultz <[e-mail]> writes:
> From: Anurag Kumar Vulisha <[e-mail]>
>
> The current code in dwc3_gadget_ep_reclaim_completed_trb() will
> check for IOC/LST bit in the event->status and returns if
> IOC/LST bit is set. This logic doesn't work if multiple TRBs
> are queued per request and the IOC/LST bit is set on the last
> TRB of that request.
>
> Consider an example where a queued request has multiple queued
> TRBs and IOC/LST bit is set only for the last TRB. In this case,
> the core generates XferComplete/XferInProgress events only for
> the last TRB (since IOC/LST are set only for the last TRB). As
> per the logic in dwc3_gadget_ep_reclaim_completed_trb()
> event->status is checked for IOC/LST bit and returns on the
> first TRB. This leaves the remaining TRBs left unhandled.
>
> Similarly, if the gadget function enqueues an unaligned request
> with sglist already in it, it should fail the same way, since we
> will append another TRB to something that already uses more than
> one TRB.
>
> To aviod this, this patch changes the code to check for IOC/LST
> bits in TRB->ctrl instead.
>
> At a practical level, this patch resolves USB transfer stalls seen
> with adb on dwc3 based HiKey960 after functionfs gadget added
> scatter-gather support around v4.20.
>
> Cc: Felipe Balbi <[e-mail]>
> Cc: Yang Fei <[e-mail]>
> Cc: Thinh Nguyen <[e-mail]>
> Cc: Tejas Joglekar <[e-mail]>
> Cc: Andrzej Pietrasiewicz <[e-mail]>
> Cc: Jack Pham <[e-mail]>
> Cc: Todd Kjos <[e-mail]>
> Cc: Greg KH <[e-mail]>
> Cc: Linux USB List <[e-mail]>
> Cc: stable <[e-mail]>
> Tested-by: Tejas Joglekar <[e-mail]>
> Reviewed-by: Thinh Nguyen <[e-mail]>
> Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
> [jstultz: forward ported to mainline, reworded commit log, reworked
>  to only check trb->ctrl as suggested by Felipe]
> Signed-off-by: John Stultz <[e-mail]>

since v5.5 is already merged, I'll send this to Greg once -rc1 is
tagged. It's already in my testing/fixes branch waiting for a pull
request.

cheers

John Stultz Jan. 29, 2020, 7:35 a.m. UTC | #6

On Tue, Jan 28, 2020 at 11:23 PM Felipe Balbi <[e-mail]> wrote:
> John Stultz <[e-mail]> writes:
> > From: Anurag Kumar Vulisha <[e-mail]>
> >
> > The current code in dwc3_gadget_ep_reclaim_completed_trb() will
> > check for IOC/LST bit in the event->status and returns if
> > IOC/LST bit is set. This logic doesn't work if multiple TRBs
> > are queued per request and the IOC/LST bit is set on the last
> > TRB of that request.
> >
> > Consider an example where a queued request has multiple queued
> > TRBs and IOC/LST bit is set only for the last TRB. In this case,
> > the core generates XferComplete/XferInProgress events only for
> > the last TRB (since IOC/LST are set only for the last TRB). As
> > per the logic in dwc3_gadget_ep_reclaim_completed_trb()
> > event->status is checked for IOC/LST bit and returns on the
> > first TRB. This leaves the remaining TRBs left unhandled.
> >
> > Similarly, if the gadget function enqueues an unaligned request
> > with sglist already in it, it should fail the same way, since we
> > will append another TRB to something that already uses more than
> > one TRB.
> >
> > To aviod this, this patch changes the code to check for IOC/LST
> > bits in TRB->ctrl instead.
> >
> > At a practical level, this patch resolves USB transfer stalls seen
> > with adb on dwc3 based HiKey960 after functionfs gadget added
> > scatter-gather support around v4.20.
> >
> > Cc: Felipe Balbi <[e-mail]>
> > Cc: Yang Fei <[e-mail]>
> > Cc: Thinh Nguyen <[e-mail]>
> > Cc: Tejas Joglekar <[e-mail]>
> > Cc: Andrzej Pietrasiewicz <[e-mail]>
> > Cc: Jack Pham <[e-mail]>
> > Cc: Todd Kjos <[e-mail]>
> > Cc: Greg KH <[e-mail]>
> > Cc: Linux USB List <[e-mail]>
> > Cc: stable <[e-mail]>
> > Tested-by: Tejas Joglekar <[e-mail]>
> > Reviewed-by: Thinh Nguyen <[e-mail]>
> > Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
> > [jstultz: forward ported to mainline, reworded commit log, reworked
> >  to only check trb->ctrl as suggested by Felipe]
> > Signed-off-by: John Stultz <[e-mail]>
>
> since v5.5 is already merged, I'll send this to Greg once -rc1 is
> tagged. It's already in my testing/fixes branch waiting for a pull
> request.

Great, thanks so much for queueing this! I'll be digging on the db845c
side wrt the dma-api issue to hopefully get that one sorted as well.

Thanks again for the help and analysis!
-john

Felipe Balbi Jan. 29, 2020, 11:19 a.m. UTC | #7

Hi,

John Stultz <[e-mail]> writes:
> On Tue, Jan 28, 2020 at 11:23 PM Felipe Balbi <[e-mail]> wrote:
>> John Stultz <[e-mail]> writes:
>> > From: Anurag Kumar Vulisha <[e-mail]>
>> >
>> > The current code in dwc3_gadget_ep_reclaim_completed_trb() will
>> > check for IOC/LST bit in the event->status and returns if
>> > IOC/LST bit is set. This logic doesn't work if multiple TRBs
>> > are queued per request and the IOC/LST bit is set on the last
>> > TRB of that request.
>> >
>> > Consider an example where a queued request has multiple queued
>> > TRBs and IOC/LST bit is set only for the last TRB. In this case,
>> > the core generates XferComplete/XferInProgress events only for
>> > the last TRB (since IOC/LST are set only for the last TRB). As
>> > per the logic in dwc3_gadget_ep_reclaim_completed_trb()
>> > event->status is checked for IOC/LST bit and returns on the
>> > first TRB. This leaves the remaining TRBs left unhandled.
>> >
>> > Similarly, if the gadget function enqueues an unaligned request
>> > with sglist already in it, it should fail the same way, since we
>> > will append another TRB to something that already uses more than
>> > one TRB.
>> >
>> > To aviod this, this patch changes the code to check for IOC/LST
>> > bits in TRB->ctrl instead.
>> >
>> > At a practical level, this patch resolves USB transfer stalls seen
>> > with adb on dwc3 based HiKey960 after functionfs gadget added
>> > scatter-gather support around v4.20.
>> >
>> > Cc: Felipe Balbi <[e-mail]>
>> > Cc: Yang Fei <[e-mail]>
>> > Cc: Thinh Nguyen <[e-mail]>
>> > Cc: Tejas Joglekar <[e-mail]>
>> > Cc: Andrzej Pietrasiewicz <[e-mail]>
>> > Cc: Jack Pham <[e-mail]>
>> > Cc: Todd Kjos <[e-mail]>
>> > Cc: Greg KH <[e-mail]>
>> > Cc: Linux USB List <[e-mail]>
>> > Cc: stable <[e-mail]>
>> > Tested-by: Tejas Joglekar <[e-mail]>
>> > Reviewed-by: Thinh Nguyen <[e-mail]>
>> > Signed-off-by: Anurag Kumar Vulisha <[e-mail]>
>> > [jstultz: forward ported to mainline, reworded commit log, reworked
>> >  to only check trb->ctrl as suggested by Felipe]
>> > Signed-off-by: John Stultz <[e-mail]>
>>
>> since v5.5 is already merged, I'll send this to Greg once -rc1 is
>> tagged. It's already in my testing/fixes branch waiting for a pull
>> request.
>
> Great, thanks so much for queueing this! I'll be digging on the db845c

no worries, it was way past the time :-)

> side wrt the dma-api issue to hopefully get that one sorted as well.

Thanks, that would, indeed, be great :-)

> Thanks again for the help and analysis!

no worries. If you find anything odd, just collect traces and I can help
have a look.

Patch

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 154f3f3e8cff..9a085eee1ae3 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2420,7 +2420,8 @@  static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,
 	if (event->status & DEPEVT_STATUS_SHORT && !chain)
 		return 1;
 
-	if (event->status & DEPEVT_STATUS_IOC)
+	if ((trb->ctrl & DWC3_TRB_CTRL_IOC) ||
+	    (trb->ctrl & DWC3_TRB_CTRL_LST))
 		return 1;
 
 	return 0;