From: Mike Frysinger <vapier@gentoo.org>
To: tom.leiming@gmail.com
Cc: greg@kroah.com, dbrownell@users.sourceforge.net,
felipe.balbi@nokia.com, linux-usb@vger.kernel.org,
linux-omap@vger.kernel.org, Anand Gadiyar <gadiyar@ti.com>,
Sergei Shtylyov <sshtylyov@ru.mvista.com>
Subject: Re: [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
Date: Fri, 27 Aug 2010 16:27:05 -0400 [thread overview]
Message-ID: <201008271627.08137.vapier@gentoo.org> (raw)
In-Reply-To: <1282909040-2936-1-git-send-email-tom.leiming@gmail.com>
[-- Attachment #1: Type: Text/Plain, Size: 3524 bytes --]
On Friday, August 27, 2010 07:37:20 tom.leiming@gmail.com wrote:
> 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>
> 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 550b397..e0bd1c1 100644
> --- a/drivers/usb/musb/musb_gadget.c
> +++ b/drivers/usb/musb/musb_gadget.c
> @@ -506,18 +506,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",
maybe this change will make a difference ?
From 13fa6c9cec387893e2b22db6c055028f96fea5b8 Mon Sep 17 00:00:00 2001
From: Cliff Cai <cliff.cai@analog.com>
Date: Fri, 3 Jul 2009 06:32:02 +0000
Subject: [PATCH] USB: musb: only complete the request when all data has been
transfered [local/log]
bug[#5269],bug[#5268],bug[#5264]only complete the request when all data has
been transfered
git-svn-id: svn://localhost/svn/linux-kernel/trunk@6915 526b6c2d-f592-4532-
a319-5dd88ccb003d
---
drivers/usb/musb/musb_gadget.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 6fca870..f019843 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -500,6 +500,8 @@ void musb_g_tx(struct musb *musb, u8 epnum)
| MUSB_TXCSR_TXPKTRDY);
request->zero = 0;
}
+ if (request->actual < request->length)
+ return;
/* ... or if not, then complete it. */
musb_g_giveback(musb_ep, request, 0);
--
1.7.2.2
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2010-08-27 20:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-27 11:37 [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case tom.leiming
2010-08-27 13:40 ` Gadiyar, Anand
[not found] ` <5A47E75E594F054BAF48C5E4FC4B92AB0328C1CB42-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2010-08-27 15:01 ` Ming Lei
2010-08-27 15:06 ` Gadiyar, Anand
2010-08-27 20:27 ` Mike Frysinger [this message]
[not found] ` <201008271627.08137.vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
2010-08-28 2:51 ` Ming Lei
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=201008271627.08137.vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=dbrownell@users.sourceforge.net \
--cc=felipe.balbi@nokia.com \
--cc=gadiyar@ti.com \
--cc=greg@kroah.com \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sshtylyov@ru.mvista.com \
--cc=tom.leiming@gmail.com \
/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