summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2011-08-28 07:17:16 +0100
committerAndy Green <andy.green@linaro.org>2011-08-28 07:17:16 +0100
commitcdbb60ae121869ea63807b51e35f6c206f646ee2 (patch)
tree2d7c4215c1898fdd605536b3e5318d43a2d2660e
parentfd92ad9605b40ef5e55b26d81ed6f13799fc2fc5 (diff)
usb: ehci: fix update qtd->token in qh_append_tds
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. In fact, one mb() on ARM is enough to flush L2 cache, but 'dummy->hw_token = token;' after mb() is added just for obeying correct mb() usage. The patch has been tested ok on OMAP4 panda A1 board, the performance of 'dd' over usb mass storage can be increased from 4~5MB/sec to 14~16MB/sec after applying this patch. Signed-off-by: Ming Lei <ming.lei@canonical.com>
-rw-r--r--drivers/usb/host/ehci-q.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 0917e3a3246..e307aebcdde 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -1082,6 +1082,20 @@ static struct ehci_qh *qh_append_tds (
wmb ();
dummy->hw_token = token;
+ /* The mb() below is added to make sure that
+ * 'token' can be writen into qtd, so that ehci
+ * HC can see the up-to-date qtd descriptor. On
+ * some archs(at least on ARM Cortex A9 dual core),
+ * writing into coherenet memory doesn't mean the
+ * value written can reach physical memory
+ * immediately, and the value may be buffered
+ * inside L2 cache. 'dummy->hw_token = token;'
+ * after mb() is added for obeying correct mb()
+ * usage.
+ * */
+ mb();
+ token = dummy->hw_token;
+
urb->hcpriv = qh_get (qh);
}
}