OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: dwc3: gadget: remove wait_end_transfer 

Now that we have a list of cancelled requests, we can skip over TRBs
when END_TRANSFER command completes.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Felipe Balbi 2018-08-01 13:56:50 +03:00
parent d4f1afe5e8
commit fec9095bde
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/dwc3/core.h
View File

@ -649,7 +649,6 @@ struct dwc3_event_buffer {
* @cancelled_list: list of cancelled requests for this endpoint * @cancelled_list: list of cancelled requests for this endpoint
* @pending_list: list of pending requests for this endpoint * @pending_list: list of pending requests for this endpoint
* @started_list: list of started requests on 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 * @lock: spinlock for endpoint request queue traversal
* @regs: pointer to first endpoint register * @regs: pointer to first endpoint register
* @trb_pool: array of transaction buffers * @trb_pool: array of transaction buffers
@ -678,8 +677,6 @@ struct dwc3_ep {
struct list_head pending_list; struct list_head pending_list;
struct list_head started_list; struct list_head started_list;
wait_queue_head_t wait_end_transfer;
spinlock_t lock; spinlock_t lock;
void __iomem *regs; void __iomem *regs;

40
drivers/usb/dwc3/gadget.c
View File

@ -647,8 +647,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, unsigned int action)
reg |= DWC3_DALEPENA_EP(dep->number); reg |= DWC3_DALEPENA_EP(dep->number);
dwc3_writel(dwc->regs, DWC3_DALEPENA, reg); dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);
init_waitqueue_head(&dep->wait_end_transfer);
if (usb_endpoint_xfer_control(desc)) if (usb_endpoint_xfer_control(desc))
goto out; goto out;
@ -1538,15 +1536,11 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
if (r == req) { if (r == req) {
/* wait until it is processed */ /* wait until it is processed */
dwc3_stop_active_transfer(dep, true); 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) if (!r->trb)
goto out0; goto out0;
dwc3_gadget_move_cancelled_request(req); dwc3_gadget_move_cancelled_request(req);
dwc3_gadget_ep_cleanup_cancelled_requests(dep);
goto out0; goto out0;
} }
dev_err(dwc->dev, "request %pK was not queued to %s\n", dev_err(dwc->dev, "request %pK was not queued to %s\n",
@ -2051,8 +2045,6 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
{ {
struct dwc3 *dwc = gadget_to_dwc(g); struct dwc3 *dwc = gadget_to_dwc(g);
unsigned long flags; unsigned long flags;
int epnum;
u32 tmo_eps = 0;
spin_lock_irqsave(&dwc->lock, flags); spin_lock_irqsave(&dwc->lock, flags);
@ -2061,36 +2053,6 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
__dwc3_gadget_stop(dwc); __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: out:
dwc->gadget_driver = NULL; dwc->gadget_driver = NULL;
spin_unlock_irqrestore(&dwc->lock, flags); spin_unlock_irqrestore(&dwc->lock, flags);
@ -2589,7 +2551,7 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
if (cmd == DWC3_DEPCMD_ENDTRANSFER) { if (cmd == DWC3_DEPCMD_ENDTRANSFER) {
dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING; dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING;
wake_up(&dep->wait_end_transfer); dwc3_gadget_ep_cleanup_cancelled_requests(dep);
} }
break; break;
case DWC3_DEPEVT_STREAMEVT: case DWC3_DEPEVT_STREAMEVT: