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

Commit de175b35 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Revert "usb: dwc3: gadget: remove wait_end_transfer" 



This reverts commit 6edcdd0e.

This is a preparation change for merging android-4.19.57 into
msm-4.19 branch.

Reverted due to BootTimeRunner regression.

Change-Id: If6a1340a9ff3f72c412c87a98b6cf94a1b165c7f
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parent 741e1fe7

drivers/usb/dwc3/core.h

+3 −0
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ struct dwc3_event_buffer { 
 * @cancelled_list: list of cancelled requests for this endpoint

 * @pending_list: list of pending requests for this endpoint

 * @started_list: list of started requests on this endpoint

 * @wait_end_transfer: wait_queue_head_t for waiting on End Transfer complete

 * @lock: spinlock for endpoint request queue traversal

 * @regs: pointer to first endpoint register

 * @trb_pool: array of transaction buffers
@@ -663,6 +664,8 @@ struct dwc3_ep { 
	struct list_head	pending_list;

	struct list_head	started_list;



	wait_queue_head_t	wait_end_transfer;



	spinlock_t		lock;

	void __iomem		*regs;

drivers/usb/dwc3/gadget.c

+39 −1
Original line number Diff line number Diff line
@@ -638,6 +638,8 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, unsigned int action) 
		reg |= DWC3_DALEPENA_EP(dep->number);

		dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);



		init_waitqueue_head(&dep->wait_end_transfer);



		if (usb_endpoint_xfer_control(desc))

			goto out;
@@ -1402,11 +1404,15 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, 
		if (r == req) {

			/* wait until it is processed */

			dwc3_stop_active_transfer(dep, true);

			wait_event_lock_irq(dep->wait_end_transfer,

					!(dep->flags & DWC3_EP_END_TRANSFER_PENDING),

					dwc->lock);



			if (!r->trb)

				goto out0;



			dwc3_gadget_move_cancelled_request(req);

			dwc3_gadget_ep_cleanup_cancelled_requests(dep);

			goto out0;

		}

		dev_err(dwc->dev, "request %pK was not queued to %s\n",
@@ -1907,6 +1913,8 @@ static int dwc3_gadget_stop(struct usb_gadget *g) 
{

	struct dwc3		*dwc = gadget_to_dwc(g);

	unsigned long		flags;

	int			epnum;

	u32			tmo_eps = 0;



	spin_lock_irqsave(&dwc->lock, flags);
@@ -1915,6 +1923,36 @@ static int dwc3_gadget_stop(struct usb_gadget *g) 


	__dwc3_gadget_stop(dwc);



	for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {

		struct dwc3_ep  *dep = dwc->eps[epnum];

		int ret;



		if (!dep)

			continue;



		if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING))

			continue;



		ret = wait_event_interruptible_lock_irq_timeout(dep->wait_end_transfer,

			    !(dep->flags & DWC3_EP_END_TRANSFER_PENDING),

			    dwc->lock, msecs_to_jiffies(5));



		if (ret <= 0) {

			/* Timed out or interrupted! There's nothing much

			 * we can do so we just log here and print which

			 * endpoints timed out at the end.

			 */

			tmo_eps |= 1 << epnum;

			dep->flags &= DWC3_EP_END_TRANSFER_PENDING;

		}

	}



	if (tmo_eps) {

		dev_err(dwc->dev,

			"end transfer timed out on endpoints 0x%x [bitmap]\n",

			tmo_eps);

	}



out:

	dwc->gadget_driver	= NULL;

	spin_unlock_irqrestore(&dwc->lock, flags);
@@ -2411,7 +2449,7 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc, 


		if (cmd == DWC3_DEPCMD_ENDTRANSFER) {

			dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING;

			dwc3_gadget_ep_cleanup_cancelled_requests(dep);

			wake_up(&dep->wait_end_transfer);

		}

		break;

	case DWC3_DEPEVT_STREAMEVT: