Linux on ARM based TI OMAP SoCs
 help / color / mirror / Atom feed
* [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
@ 2010-08-27 11:37 tom.leiming
  2010-08-27 13:40 ` Gadiyar, Anand
  2010-08-27 20:27 ` Mike Frysinger
  0 siblings, 2 replies; 6+ messages in thread
From: tom.leiming @ 2010-08-27 11:37 UTC (permalink / raw)
  To: greg, dbrownell, felipe.balbi
  Cc: linux-usb, linux-omap, Ming Lei, Anand Gadiyar, Mike Frysinger,
	Sergei Shtylyov

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",
-- 
1.6.2.5


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

* RE: [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
  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 20:27 ` Mike Frysinger
  1 sibling, 1 reply; 6+ messages in thread
From: Gadiyar, Anand @ 2010-08-27 13:40 UTC (permalink / raw)
  To: tom.leiming@gmail.com, greg@kroah.com,
	dbrownell@users.sourceforge.net,
	"felipe.balbi@nokia.com" <feli>
  Cc: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
	Mike Frysinger, Sergei Shtylyov

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>
> 

For OMAPs,
Acked-by: Anand Gadiyar <gadiyar@ti.com>

I sent out this patch a while ago [1]. I've tested it on
OMAP3 and OMAP4 silicon.

It does look like a logic bug to me, but I'd like the Blackfin
and Davinci guys to take a look at the code as well.

- Anand

[1] <http://marc.info/?l=linux-usb&m=127055442703499&w=2>

> ---
>  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",
> -- 
> 1.6.2.5
> 
> 

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

* Re: [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
       [not found]   ` <5A47E75E594F054BAF48C5E4FC4B92AB0328C1CB42-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
@ 2010-08-27 15:01     ` Ming Lei
  2010-08-27 15:06       ` Gadiyar, Anand
  0 siblings, 1 reply; 6+ messages in thread
From: Ming Lei @ 2010-08-27 15:01 UTC (permalink / raw)
  To: Gadiyar, Anand
  Cc: greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org,
	dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
	felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Mike Frysinger, Sergei Shtylyov

2010/8/27 Gadiyar, Anand <gadiyar-l0cyMroinI0@public.gmane.org>:
> tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org wrote:
>> From: Ming Lei <tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>>
>> 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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> Cc: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
>> Cc: Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
>> Cc: Sergei Shtylyov <sshtylyov-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
>>
>
> For OMAPs,
> Acked-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
>
> I sent out this patch a while ago [1]. I've tested it on
> OMAP3 and OMAP4 silicon.

Oh, I did not see your patch before,  you have seen the issue
for long time,  why not merge into mainline?

>
> It does look like a logic bug to me, but I'd like the Blackfin
> and Davinci guys to take a look at the code as well.
>
> - Anand
>
> [1] <http://marc.info/?l=linux-usb&m=127055442703499&w=2>
>
>> ---
>>  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",
>> --
>> 1.6.2.5
>>
>>



-- 
Lei Ming
--
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	[flat|nested] 6+ messages in thread

* RE: [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
  2010-08-27 15:01     ` Ming Lei
@ 2010-08-27 15:06       ` Gadiyar, Anand
  0 siblings, 0 replies; 6+ messages in thread
From: Gadiyar, Anand @ 2010-08-27 15:06 UTC (permalink / raw)
  To: Ming Lei
  Cc: greg@kroah.com, dbrownell@users.sourceforge.net,
	felipe.balbi@nokia.com, linux-usb@vger.kernel.org,
	linux-omap@vger.kernel.org, Mike Frysinger, Sergei Shtylyov

Ming Lei wrote:
> 2010/8/27 Gadiyar, Anand <gadiyar@ti.com>:
> > 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.
> > I sent out this patch a while ago [1]. I've tested it on
> > OMAP3 and OMAP4 silicon.
> 
> Oh, I did not see your patch before,  you have seen the issue
> for long time,  why not merge into mainline?
> 

I discovered this a week or so before sending it out doing some
weekend spare-time debugging of the double-buffering problem. I
posted it out to get some feedback, and then forgot about it. :(

MUSB in general has been hammered by many lost patches in the
recent past - I know folks have been busy getting products out,
and haven't followed up as well as they could have. Hopefully
this will change in future.

- Anand

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

* Re: [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
  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
@ 2010-08-27 20:27 ` Mike Frysinger
       [not found]   ` <201008271627.08137.vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
  1 sibling, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2010-08-27 20:27 UTC (permalink / raw)
  To: tom.leiming
  Cc: greg, dbrownell, felipe.balbi, linux-usb, linux-omap,
	Anand Gadiyar, Sergei Shtylyov

[-- 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 --]

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

* Re: [PATCH 1/2] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case
       [not found]   ` <201008271627.08137.vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
@ 2010-08-28  2:51     ` Ming Lei
  0 siblings, 0 replies; 6+ messages in thread
From: Ming Lei @ 2010-08-28  2:51 UTC (permalink / raw)
  To: Mike Frysinger
  Cc: greg-U8xfFu+wG4EAvxtiuMwx3w,
	dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f,
	felipe.balbi-xNZwKgViW5gAvxtiuMwx3w,
	linux-usb-u79uwXL29TY76Z2rM5mHXA,
	linux-omap-u79uwXL29TY76Z2rM5mHXA, Anand Gadiyar, Sergei Shtylyov

2010/8/28 Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>:
> On Friday, August 27, 2010 07:37:20 tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org wrote:
>> From: Ming Lei <tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>>
>> 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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> Cc: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
>> Cc: Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
>> Cc: Sergei Shtylyov <sshtylyov-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
>>
>> ---
>>  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 ?

No,  only your change can not prevent the infinite  hangs for OUT transfer,
see the explanation in my commit log. Even the change may cause infinite
hangs  again, once return if request->actual is less than request->length,
musb will stop loading data from requst->buf into fifo, so hangs...

> From 13fa6c9cec387893e2b22db6c055028f96fea5b8 Mon Sep 17 00:00:00 2001
> From: Cliff Cai <cliff.cai-OyLXuOCK7orQT0dZR+AlfA@public.gmane.org>
> 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

Oh, another local change...

>
> 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;

As said above, this change above should be wrong, follows the fix which
may complete request only if data is transfered over for the request.

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index e898228..1cf6d28 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -503,14 +503,14 @@ void musb_g_tx(struct musb *musb, u8 epnum)
 				request->zero = 0;
 			}

-			/* ... or if not, then complete it. */
-			musb_g_giveback(musb_ep, request, 0);

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

end of thread, other threads:[~2010-08-28  2:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
     [not found]   ` <201008271627.08137.vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
2010-08-28  2:51     ` Ming Lei

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox