[75/82] usb: dwc3: gadget: wait for End Transfer to complete

Message ID 20161031104914.1990-76-felipe.balbi@linux.intel.com
State New
Headers show

Commit Message

Felipe Balbi Oct. 31, 2016, 10:49 a.m.
From: Baolin Wang <baolin.wang@linaro.org>


Instead of just delaying for 100us, we should
actually wait for End Transfer Command Complete
interrupt before moving on. Note that this should
only be done if we're dealing with one of the core
revisions that actually require the interrupt before
moving on.

[ felipe.balbi@linux.intel.com: minor improvements ]

NYET-Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

---
 drivers/usb/dwc3/core.h   |  8 ++++++++
 drivers/usb/dwc3/gadget.c | 40 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 3 deletions(-)

-- 
2.10.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Felipe Balbi Oct. 31, 2016, 10:55 a.m. | #1
Hi Baolin,

Felipe Balbi <felipe.balbi@linux.intel.com> writes:
> From: Baolin Wang <baolin.wang@linaro.org>

>

> Instead of just delaying for 100us, we should

> actually wait for End Transfer Command Complete

> interrupt before moving on. Note that this should

> only be done if we're dealing with one of the core

> revisions that actually require the interrupt before

> moving on.

>

> [ felipe.balbi@linux.intel.com: minor improvements ]

>

> NYET-Signed-off-by: Baolin Wang <baolin.wang@linaro.org>

> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>


I guess I should drop this patch from the queue since you wanted to send
your own version, right?

Let me know ;-)

-- 
balbi
Baolin Wang Oct. 31, 2016, 11:29 a.m. | #2
Hi Feilpe,

On 31 October 2016 at 18:55, Felipe Balbi <felipe.balbi@linux.intel.com> wrote:
>

> Hi Baolin,

>

> Felipe Balbi <felipe.balbi@linux.intel.com> writes:

>> From: Baolin Wang <baolin.wang@linaro.org>

>>

>> Instead of just delaying for 100us, we should

>> actually wait for End Transfer Command Complete

>> interrupt before moving on. Note that this should

>> only be done if we're dealing with one of the core

>> revisions that actually require the interrupt before

>> moving on.

>>

>> [ felipe.balbi@linux.intel.com: minor improvements ]

>>

>> NYET-Signed-off-by: Baolin Wang <baolin.wang@linaro.org>

>> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

>

> I guess I should drop this patch from the queue since you wanted to send

> your own version, right?


Yes, I think so. Since I just pasted the sample code in previous email
and I did not see in your patchset, I will send out the new patch.

>

> Let me know ;-)

>

> --

> balbi




-- 
Baolin.wang
Best Regards
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 5fc437021ac7..0cb3b78d28b7 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -26,6 +26,7 @@ 
 #include <linux/dma-mapping.h>
 #include <linux/mm.h>
 #include <linux/debugfs.h>
+#include <linux/wait.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -505,6 +506,7 @@  struct dwc3_event_buffer {
  * @endpoint: usb 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
@@ -530,6 +532,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;
 
@@ -546,6 +550,7 @@  struct dwc3_ep {
 #define DWC3_EP_BUSY		(1 << 4)
 #define DWC3_EP_PENDING_REQUEST	(1 << 5)
 #define DWC3_EP_MISSED_ISOC	(1 << 6)
+#define DWC3_EP_END_TRANSFER_PENDING (1 << 7)
 
 	/* This last one is specific to EP0 */
 #define DWC3_EP0_DIR_IN		(1 << 31)
@@ -1050,6 +1055,9 @@  struct dwc3_event_depevt {
 #define DEPEVT_TRANSFER_BUS_EXPIRY	2
 
 	u32	parameters:16;
+
+/* For Command Complete Events */
+#define DEPEVT_PARAMETER_CMD(n) (((n) & (0xf << 8)) >> 8)
 } __packed;
 
 /**
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 3b53a5714df4..bc985f8571c6 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -598,6 +598,8 @@  static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
 		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))
 			return 0;
 
@@ -772,6 +774,10 @@  static int dwc3_gadget_ep_disable(struct usb_ep *ep)
 					dep->name))
 		return 0;
 
+	if (dep->flags & DWC3_EP_END_TRANSFER_PENDING)
+		wait_event(dep->wait_end_transfer,
+				!(dep->flags & DWC3_EP_END_TRANSFER_PENDING));
+
 	spin_lock_irqsave(&dwc->lock, flags);
 	ret = __dwc3_gadget_ep_disable(dep);
 	spin_unlock_irqrestore(&dwc->lock, flags);
@@ -1782,13 +1788,30 @@  static int dwc3_gadget_start(struct usb_gadget *g,
 }
 
 static void __dwc3_gadget_stop(struct dwc3 *dwc)
+__releases(&dwc->lock) __acquires(&dwc->lock)
 {
+	int			epnum;
+
 	if (pm_runtime_suspended(dwc->dev))
 		return;
 
 	dwc3_gadget_disable_irq(dwc);
 	__dwc3_gadget_ep_disable(dwc->eps[0]);
 	__dwc3_gadget_ep_disable(dwc->eps[1]);
+
+	for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
+		struct dwc3_ep	*dep = dwc->eps[epnum];
+
+		if (!(dep->flags & DWC3_EP_ENABLED))
+			continue;
+
+		if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
+			continue;
+
+		wait_event_lock_irq(dep->wait_end_transfer,
+				!(dep->flags & DWC3_EP_END_TRANSFER_PENDING),
+				dwc->lock);
+	}
 }
 
 static int dwc3_gadget_stop(struct usb_gadget *g)
@@ -2171,6 +2194,7 @@  static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
 {
 	struct dwc3_ep		*dep;
 	u8			epnum = event->endpoint_number;
+	u8			cmd;
 
 	dep = dwc->eps[epnum];
 
@@ -2215,8 +2239,15 @@  static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
 			return;
 		}
 		break;
-	case DWC3_DEPEVT_RXTXFIFOEVT:
 	case DWC3_DEPEVT_EPCMDCMPLT:
+		cmd = DEPEVT_PARAMETER_CMD(event->parameters);
+
+		if (cmd == DWC3_DEPCMD_ENDTRANSFER) {
+			dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING;
+			wake_up_all(&dep->wait_end_transfer);
+		}
+		break;
+	case DWC3_DEPEVT_RXTXFIFOEVT:
 		break;
 	}
 }
@@ -2269,7 +2300,8 @@  static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force)
 
 	dep = dwc->eps[epnum];
 
-	if (!dep->resource_index)
+	if ((dep->flags & DWC3_EP_END_TRANSFER_PENDING) ||
+			!dep->resource_index)
 		return;
 
 	/*
@@ -2313,8 +2345,10 @@  static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force)
 	dep->resource_index = 0;
 	dep->flags &= ~DWC3_EP_BUSY;
 
-	if (dwc3_is_usb31(dwc) || dwc->revision < DWC3_REVISION_310A)
+	if (dwc3_is_usb31(dwc) || dwc->revision < DWC3_REVISION_310A) {
+		dep->flags |= DWC3_EP_END_TRANSFER_PENDING;
 		udelay(100);
+	}
 }
 
 static void dwc3_clear_stall_all_ep(struct dwc3 *dwc)