Commit d74dc3e9 authored by Thinh Nguyen's avatar Thinh Nguyen Committed by Greg Kroah-Hartman
Browse files

usb: dwc3: gadget: Ignore NoStream after End Transfer 



The End Transfer command from a stream endpoint will generate a NoStream
event, and we should ignore it. Currently we set the flag
DWC3_EP_IGNORE_NEXT_NOSTREAM to track this prior to sending the command,
and it will be cleared on the next stream event. However, a stream event
may be generated before the End Transfer command completion and
prematurely clear the flag. Fix this by setting the flag on End Transfer
completion instead.

Fixes: 140ca4cf ("usb: dwc3: gadget: Handle stream transfers")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/cee1253af4c3600edb878d11c9c08b040817ae23.1635203975.git.Thinh.Nguyen@synopsys.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 250fdabe

drivers/usb/dwc3/gadget.c

+8 −8
Original line number Diff line number Diff line
@@ -3352,6 +3352,14 @@ static void dwc3_gadget_endpoint_command_complete(struct dwc3_ep *dep, 
	if (cmd != DWC3_DEPCMD_ENDTRANSFER)

		return;



	/*

	 * The END_TRANSFER command will cause the controller to generate a

	 * NoStream Event, and it's not due to the host DP NoStream rejection.

	 * Ignore the next NoStream event.

	 */

	if (dep->stream_capable)

		dep->flags |= DWC3_EP_IGNORE_NEXT_NOSTREAM;



	dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING;

	dep->flags &= ~DWC3_EP_TRANSFER_STARTED;

	dwc3_gadget_ep_cleanup_cancelled_requests(dep);
@@ -3574,14 +3582,6 @@ static void dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, 
	WARN_ON_ONCE(ret);

	dep->resource_index = 0;



	/*

	 * The END_TRANSFER command will cause the controller to generate a

	 * NoStream Event, and it's not due to the host DP NoStream rejection.

	 * Ignore the next NoStream event.

	 */

	if (dep->stream_capable)

		dep->flags |= DWC3_EP_IGNORE_NEXT_NOSTREAM;



	if (!interrupt)

		dep->flags &= ~DWC3_EP_TRANSFER_STARTED;

	else