From: tom.leiming@gmail.com
To: greg@kroah.com
Cc: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, Ming Lei <tom.leiming@gmail.com>,
David Brownell <dbrownell@users.sourceforge.net>,
Felipe Balbi <me@felipebalbi.com>, Anand Gadiyar <gadiyar@ti.com>,
Mike Frysinger <vapier@gentoo.org>,
Sergei Shtylyov <sshtylyov@ru.mvista.com>
Subject: [RESEND/PATCH 2/6] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
Date: Tue, 7 Sep 2010 23:23:30 +0800 [thread overview]
Message-ID: <1283873014-32511-3-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1283873014-32511-1-git-send-email-tom.leiming@gmail.com>
From: Ming Lei <tom.leiming@gmail.com>
This patch fixes one infinite hang of bulk IN transfer in double buffer
case, the hang can be observed easily by test #6 of usbtest if musb is
configured as g_zero and fifo mode 3 is taken to enable double fifo.
In fact, the patch only removes the check for non-empty fifo before
loading data from new request into fifo since the check is not correct:
-in double buffer case, fifo may accommodate more than one packet,
even though it has contained one packet already and is non-empty
-since last DMA is completed before calling musb_g_tx, it is sure
that fifo may accommodate at least one packet
Without applying the patch, new requst enqueued from .complte may not
have a chance to be loaded into fifo, then will never be completed and
cause infinite hangs.
With the patch, on my beagle B5, test#6(queued bulk in) can be passed and
test result may go beyond 33Mbyte/s if musb is configured as g_zero and
fifo mode 3 is taken, follows the test command:
#testusb -D DEV_NAME -c 1024 -t 6 -s 32768 -g 8 [1]
[1],
-source of testusb : tools/usb/testusb.c under linux kernel;
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Acked-by: Anand Gadiyar <gadiyar@ti.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Felipe Balbi <me@felipebalbi.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
---
drivers/usb/musb/musb_gadget.c | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index de0ca90..f206c94 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -504,18 +504,6 @@ void musb_g_tx(struct musb *musb, u8 epnum)
/* ... or if not, then complete it. */
musb_g_giveback(musb_ep, request, 0);
- /*
- * Kickstart next transfer if appropriate;
- * the packet that just completed might not
- * be transmitted for hours or days.
- * REVISIT for double buffering...
- * FIXME revisit for stalls too...
- */
- musb_ep_select(mbase, epnum);
- csr = musb_readw(epio, MUSB_TXCSR);
- if (csr & MUSB_TXCSR_FIFONOTEMPTY)
- return;
-
request = musb_ep->desc ? next_request(musb_ep) : NULL;
if (!request) {
DBG(4, "%s idle now\n",
--
1.6.2.5
next prev parent reply other threads:[~2010-09-07 15:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-07 15:23 [RESEND/PATCH 0/6] USB: musb-gadget: bug fix tom.leiming
2010-09-07 15:23 ` [RESEND/PATCH 1/6] USB: musb-gadget: fix kernel panic if using out ep with FIFO_TXRX style(v1) tom.leiming
2010-09-07 15:23 ` tom.leiming [this message]
2010-09-07 15:23 ` [RESEND/PATCH 3/6] USB: musb-gadget: enable autoclear for OUT transfer in both DMA 0 and DMA 1 tom.leiming
2010-09-07 15:23 ` [RESEND/PATCH 4/6] USB: musb-gadget: fix DMA length for OUT transfer tom.leiming
2010-09-07 15:23 ` [RESEND/PATCH 5/6] USB: musb-gadget: complete request only if data is transfered over tom.leiming
2010-09-13 12:27 ` Sergei Shtylyov
2010-09-13 14:34 ` Ming Lei
2010-09-13 15:51 ` Sergei Shtylyov
2010-09-13 16:26 ` Sergei Shtylyov
2010-09-14 6:56 ` Felipe Balbi
2010-09-14 10:46 ` Sergei Shtylyov
2010-09-14 10:54 ` Felipe Balbi
2010-09-14 17:51 ` Sergei Shtylyov
2010-09-15 6:53 ` Felipe Balbi
2010-09-15 9:56 ` Ming Lei
2010-09-15 10:01 ` Sergei Shtylyov
2010-09-15 10:05 ` Felipe Balbi
2010-09-15 10:08 ` Sergei Shtylyov
2010-09-15 10:14 ` Ming Lei
2010-09-15 10:18 ` Sergei Shtylyov
2010-09-15 10:22 ` Felipe Balbi
2010-09-15 10:27 ` Sergei Shtylyov
2010-09-15 10:31 ` Felipe Balbi
2010-09-15 10:41 ` Sergei Shtylyov
2010-09-15 10:52 ` Felipe Balbi
2010-09-15 13:02 ` Sergei Shtylyov
2010-09-15 10:37 ` Ming Lei
2010-09-07 15:23 ` [RESEND/PATCH 6/6] USB: musb-gadget: fix dma length in txstate tom.leiming
2010-09-14 17:43 ` Sergei Shtylyov
2010-09-15 7:09 ` Felipe Balbi
2010-09-08 2:19 ` [RESEND/PATCH 0/6] USB: musb-gadget: bug fix Greg KH
2010-09-08 4:32 ` Ming Lei
2010-09-08 6:18 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283873014-32511-3-git-send-email-tom.leiming@gmail.com \
--to=tom.leiming@gmail.com \
--cc=dbrownell@users.sourceforge.net \
--cc=gadiyar@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=me@felipebalbi.com \
--cc=sshtylyov@ru.mvista.com \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox