linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] usb: ehci: make HC see up-to-date qh/qtd descriptor ASAP
@ 2011-08-30 16:03 ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw
  2011-08-30 16:15 ` Alan Stern
  2011-08-30 16:38 ` Mark Salter
  0 siblings, 2 replies; 33+ messages in thread
From: ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw @ 2011-08-30 16:03 UTC (permalink / raw)
  To: greg-U8xfFu+wG4EAvxtiuMwx3w,
	stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz
  Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-omap-u79uwXL29TY76Z2rM5mHXA, Ming Lei, Russell King

From: Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>

This patch introduces the helper of ehci_sync_mem to flush
qtd/qh into memory immediately on some ARM, so that HC can
see the up-to-date qtd/qh descriptor asap.

This patch fixs one performance bug on ARM Cortex A9 dual core
platform, which has been reported on quite a few ARM machines
(OMAP4, Tegra 2, snowball...), see details from link of
https://bugs.launchpad.net/bugs/709245.

The patch has been tested ok on OMAP4 panda A1 board, and the
performance of 'dd' over usb mass storage can be increased from
4~5MB/sec to 14~16MB/sec after applying this patch.

Cc: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>
Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Signed-off-by: Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
---
 drivers/usb/host/ehci-q.c |   18 ++++++++++++++++++
 drivers/usb/host/ehci.h   |   17 +++++++++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 0917e3a..2719879 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -995,6 +995,12 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
 	head->qh_next.qh = qh;
 	head->hw->hw_next = dma;
 
+	/*
+	 * flush qh descriptor into memory immediately,
+	 * see comments in qh_append_tds.
+	 * */
+	ehci_sync_mem();
+
 	qh_get(qh);
 	qh->xacterrs = 0;
 	qh->qh_state = QH_STATE_LINKED;
@@ -1082,6 +1088,18 @@ static struct ehci_qh *qh_append_tds (
 			wmb ();
 			dummy->hw_token = token;
 
+			/*
+			 * Writing to dma coherent buffer on ARM may
+			 * be delayed to reach memory, so HC may not see
+			 * hw_token of dummy qtd in time, which can cause
+			 * the qtd transaction to be executed very late,
+			 * and degrade performance a lot. ehci_sync_mem
+			 * is added to flush 'token' immediatelly into
+			 * memory, so that ehci can execute the transaction
+			 * ASAP.
+			 * */
+			ehci_sync_mem();
+
 			urb->hcpriv = qh_get (qh);
 		}
 	}
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index cc7d337..313d9d6 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -738,6 +738,23 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
 
 #endif
 
+/*
+ * Writing to dma coherent memory on ARM may be delayed via L2
+ * writing buffer, so introduce the helper which can flush L2 writing
+ * buffer into memory immediately, especially used to flush ehci
+ * descriptor to memory.
+ * */
+#ifdef	CONFIG_ARM_DMA_MEM_BUFFERABLE
+static inline void ehci_sync_mem()
+{
+	mb();
+}
+#else
+static inline void ehci_sync_mem()
+{
+}
+#endif
+
 /*-------------------------------------------------------------------------*/
 
 #ifndef DEBUG
-- 
1.7.4.1

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

^ permalink raw reply related	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2011-10-31  6:49 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-30 16:03 [PATCH] usb: ehci: make HC see up-to-date qh/qtd descriptor ASAP ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw
2011-08-30 16:15 ` Alan Stern
2011-08-30 16:38 ` Mark Salter
2011-08-30 17:15   ` Alan Stern
2011-08-30 18:45     ` Mark Salter
2011-08-30 17:26   ` Will Deacon
     [not found]     ` <20110830172642.GE3464-SGELLbQ0bobZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2011-08-30 17:48       ` Greg KH
2011-08-30 17:54         ` Will Deacon
     [not found]           ` <20110830175432.GG3464-SGELLbQ0bobZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2011-08-31  0:23             ` Chen Peter-B29397
2011-08-31  8:49               ` Will Deacon
2011-08-31 12:33                 ` Chen Peter-B29397
2011-08-31 13:43                 ` Mark Salter
2011-08-31 15:21                   ` Will Deacon
2011-08-31 15:27                     ` Mark Salter
2011-08-31 16:12                       ` Marc Zyngier
2011-08-31 16:55                         ` Marc Dietrich
2011-09-01 10:34                           ` Marc Zyngier
     [not found]                             ` <4E5F5FA9.3010305-5wv7dgnIgG8@public.gmane.org>
2011-09-01 11:13                               ` Marc Dietich
2011-09-01 19:08                                 ` Stephen Warren
2011-09-02  9:50                                   ` Marc Zyngier
2011-09-02 17:07                                     ` Stephen Warren
     [not found]                                   ` <74CDBE0F657A3D45AFBB94109FB122FF04B327A383-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-09-02 11:13                                     ` Marc Dietich
2011-08-31 17:46                     ` Nicolas Pitre
2011-08-31 17:51                       ` Will Deacon
     [not found]                         ` <20110831175147.GI8777-SGELLbQ0bobZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2011-08-31 18:19                           ` Rob Herring
2011-08-31 18:35                             ` Mark Salter
2011-08-31 18:49                               ` Rob Herring
     [not found]                                 ` <4E5E8230.9060307-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-08-31 18:58                                   ` Mark Salter
2011-08-31 19:35                             ` Will Deacon
2011-09-08 22:41                               ` Mark Salter
     [not found]                                 ` <1315521779.2313.29.camel-PDpCo7skNiwAicBL8TP8PQ@public.gmane.org>
2011-10-31  6:49                                   ` Pandita, Vikram
2011-08-31  0:56           ` Ming Lei
2011-09-01 23:16   ` Grant Grundler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).