Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0608eec authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

usb: dwc3: gadget: clear DWC3_EP_TRANSFER_STARTED on cmd complete 



[ Upstream commit acbfa6c26f21a18830ee064b588c92334305b6af ]

We must wait until End Transfer completes in order to clear
DWC3_EP_TRANSFER_STARTED, otherwise we may confuse the driver.

This patch is in preparation to fix a rare race condition that happens
upon Disconnect Interrupt.

Tested-by: default avatarThinh Nguyen <thinhn@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d0e8b35e

drivers/usb/dwc3/gadget.c

+5 −14
Original line number Diff line number Diff line
@@ -375,19 +375,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd, 


	trace_dwc3_gadget_ep_cmd(dep, cmd, params, cmd_status);



	if (ret == 0) {

		switch (DWC3_DEPCMD_CMD(cmd)) {

		case DWC3_DEPCMD_STARTTRANSFER:

	if (ret == 0 && DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {

		dep->flags |= DWC3_EP_TRANSFER_STARTED;

		dwc3_gadget_ep_get_transfer_index(dep);

			break;

		case DWC3_DEPCMD_ENDTRANSFER:

			dep->flags &= ~DWC3_EP_TRANSFER_STARTED;

			break;

		default:

			/* nothing */

			break;

		}

	}



	if (unlikely(susphy)) {
@@ -2417,7 +2407,8 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc, 
		cmd = DEPEVT_PARAMETER_CMD(event->parameters);



		if (cmd == DWC3_DEPCMD_ENDTRANSFER) {

			dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING;

			dep->flags &= ~(DWC3_EP_END_TRANSFER_PENDING |

					DWC3_EP_TRANSFER_STARTED);

			dwc3_gadget_ep_cleanup_cancelled_requests(dep);

		}

		break;