usb: musb bug fixing patches
Subsystems (2)
cover usb: musb bug fixing patches
Hi Felipe,
I found some MUSB bugs on Blackfin, here are 2 patches to fix them.
Thanks
-Bryan
PATCH 1/2 usb: musb: fix bug - don't mess up count number and CSR0 register value
--- drivers/usb/musb/musb_gadget_ep0.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/usb/musb/musb_gadget_ep0.c +12 -12
@@ -437,7 +437,7 @@ static void ep0_rxstate(struct musb *musb) {void __iomem *regs = musb->control_ep->regs;struct usb_request *req; -u16 tmp; +u16 count, csr; req =next_ep0_request (musb);
@@ -449,35 +449,35 @@ static void ep0_rxstate(struct musb *musb)unsigned len = req->length - req->actual;/* read the buffer */ - tmp =musb_readb (regs,MUSB_COUNT0 ); -if (tmp > len) { + count =musb_readb (regs,MUSB_COUNT0 ); +if (count > len) { req->status = -EOVERFLOW ; - tmp = len; + count = len; } -musb_read_fifo (&musb->endpoints[0 ], tmp, buf); - req->actual += tmp; - tmp =MUSB_CSR0_P_SVDRXPKTRDY ; -if (tmp <64 || req->actual == req->length) { +musb_read_fifo (&musb->endpoints[0 ], count, buf); + req->actual += count; + csr =MUSB_CSR0_P_SVDRXPKTRDY ; +if (count <64 || req->actual == req->length) { musb->ep0_state =MUSB_EP0_STAGE_STATUSIN ; - tmp |=MUSB_CSR0_P_DATAEND ; + csr |=MUSB_CSR0_P_DATAEND ; }else req =NULL ; }else - tmp =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ; + csr =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ;/* Completion handler may choose to stall, e.g. because the * message just received holds invalid data. */ if (req) { - musb->ackpend = tmp; + musb->ackpend = csr;musb_g_ep0_giveback (musb, req);if (!musb->ackpend)return ; musb->ackpend =0 ; }musb_ep_select (musb->mregs,0 ); -musb_writew (regs,MUSB_CSR0 , tmp); +musb_writew (regs,MUSB_CSR0 , csr); }/*
Signature · 1 line
1.5.6
Re: [PATCH 1/2] usb: musb: fix bug - don't mess up count number and CSR0 register value
Quoted 1 line · ext Bryan Wu
Signed-off-by Bryan Wu <[email protected]>
This patch looks ok, but doesn't apply on top of the previous series.
Greg, please apply the refreshed version attached.
thanks,
Signature · 1 line
balbi
Quoted 1 line
From
efae64b5f222e1b57b354e8207c62975c5a7618bMon Sep 17 00:00:00 2001
From: Bryan Wu <[email protected]>
Date: Mon, 25 Aug 2008 14:39:39 +0300
Subject: [PATCH] usb: musb: do not mess up count number and CSR0 register value
--- drivers/usb/musb/musb_gadget_ep0.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/usb/musb/musb_gadget_ep0.c +12 -12
@@ -437,7 +437,7 @@ static void ep0_rxstate(struct musb *musb) {void __iomem *regs = musb->control_ep->regs;struct usb_request *req; -u16 tmp; +u16 count, csr; req =next_ep0_request (musb);
@@ -449,34 +449,34 @@ static void ep0_rxstate(struct musb *musb)unsigned len = req->length - req->actual;/* read the buffer */ - tmp =musb_readb (regs,MUSB_COUNT0 ); -if (tmp > len) { + count =musb_readb (regs,MUSB_COUNT0 ); +if (count > len) { req->status = -EOVERFLOW ; - tmp = len; + count = len; } -musb_read_fifo (&musb->endpoints[0 ], tmp, buf); - req->actual += tmp; - tmp =MUSB_CSR0_P_SVDRXPKTRDY ; -if (tmp <64 || req->actual == req->length) { +musb_read_fifo (&musb->endpoints[0 ], count, buf); + req->actual += count; + csr =MUSB_CSR0_P_SVDRXPKTRDY ; +if (count <64 || req->actual == req->length) { musb->ep0_state =MUSB_EP0_STAGE_STATUSIN ; - tmp |=MUSB_CSR0_P_DATAEND ; + csr |=MUSB_CSR0_P_DATAEND ; }else req =NULL ; }else - tmp =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ; + csr =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ;/* Completion handler may choose to stall, e.g. because the * message just received holds invalid data. */ if (req) { - musb->ackpend = tmp; + musb->ackpend = csr;musb_g_ep0_giveback (musb, req);if (!musb->ackpend)return ; musb->ackpend =0 ; } -musb_writew (regs,MUSB_CSR0 , tmp); +musb_writew (regs,MUSB_CSR0 , csr); }/*
Signature · 1 line
1.6.0.rc1.71.gfba5
Re: [PATCH 1/2] usb: musb: fix bug - don't mess up count number and CSR0 register value
Quoted 16 lines · Felipe Balbi
Quoted 1 line · ext Bryan Wu
Signed-off-by Bryan Wu <[email protected]>This patch looks ok, but doesn't apply on top of the previous series.
Greg, please apply the refreshed version attached.
thanks,
Signature · 1 line
balbiQuoted 1 line
From
efae64b5f222e1b57b354e8207c62975c5a7618bMon Sep 17 00:00:00 2001From: Bryan Wu <[email protected]>
Date: Mon, 25 Aug 2008 14:39:39 +0300
Subject: [PATCH] usb: musb: do not mess up count number and CSR0 register value
Quoted 67 lines
Signed-off-by Felipe Balbi <[email protected]>--- drivers/usb/musb/musb_gadget_ep0.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)drivers/usb/musb/musb_gadget_ep0.c +12
-12@@ -437,7 +437,7 @@ static void ep0_rxstate(struct musb *musb) {void __iomem *regs = musb->control_ep->regs;struct usb_request *req; -u16 tmp; +u16 count, csr; req =next_ep0_request (musb);@@ -449,34 +449,34 @@ static void ep0_rxstate(struct musb *musb)unsigned len = req->length - req->actual;/* read the buffer */ - tmp =musb_readb (regs,MUSB_COUNT0 ); -if (tmp > len) { + count =musb_readb (regs,MUSB_COUNT0 ); +if (count > len) { req->status = -EOVERFLOW ; - tmp = len; + count = len; } -musb_read_fifo (&musb->endpoints[0 ], tmp, buf); - req->actual += tmp; - tmp =MUSB_CSR0_P_SVDRXPKTRDY ; -if (tmp <64 || req->actual == req->length) { +musb_read_fifo (&musb->endpoints[0 ], count, buf); + req->actual += count; + csr =MUSB_CSR0_P_SVDRXPKTRDY ; +if (count <64 || req->actual == req->length) { musb->ep0_state =MUSB_EP0_STAGE_STATUSIN ; - tmp |=MUSB_CSR0_P_DATAEND ; + csr |=MUSB_CSR0_P_DATAEND ; }else req =NULL ; }else - tmp =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ; + csr =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ;/* Completion handler may choose to stall, e.g. because the * message just received holds invalid data. */ if (req) { - musb->ackpend = tmp; + musb->ackpend = csr;musb_g_ep0_giveback (musb, req);if (!musb->ackpend)return ; musb->ackpend =0 ; } -musb_writew (regs,MUSB_CSR0 , tmp); +musb_writew (regs,MUSB_CSR0 , csr); }/* Signature · 1 line
1.6.0.rc1.71.gfba5
Signature · 1 line
balbi
RE: [PATCH 1/2] usb: musb: fix bug - don't mess up count number and CSR0 register value
Quoted 13 lines · Felipe Balbi
Quoted 4 lines · ext Bryan Wu
Quoted 1 line
Signed-off-by Bryan Wu <[email protected]>This patch looks ok, but doesn't apply on top of the
previous series.
Quoted 6 lines
Greg, please apply the refreshed version attached.
thanks,
Signature · 1 line
balbi
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
From
efae64b5f222e1b57b354e8207c62975c5a7618bMon Sep 17 00:00:00 2001From: Bryan Wu <[email protected]>
Date: Mon, 25 Aug 2008 14:39:39 +0300
Subject: [PATCH] usb: musb: do not mess up count number and CSR0 register valueSigned-off-by Bryan Wy <[email protected]>
Quoted 68 lines
Quoted 67 lines
Signed-off-by Felipe Balbi <[email protected]>--- drivers/usb/musb/musb_gadget_ep0.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)drivers/usb/musb/musb_gadget_ep0.c +12
-12@@ -437,7 +437,7 @@ static void ep0_rxstate(struct musb *musb) {void __iomem *regs = musb->control_ep->regs;struct usb_request *req; -u16 tmp; +u16 count, csr; req =next_ep0_request (musb);@@ -449,34 +449,34 @@ static void ep0_rxstate(struct musb *musb)unsigned len = req->length - req->actual;/* read the buffer */ - tmp =musb_readb (regs,MUSB_COUNT0 ); -if (tmp > len) { + count =musb_readb (regs,MUSB_COUNT0 ); +if (count > len) { req->status = -EOVERFLOW ; - tmp = len; + count = len; } -musb_read_fifo (&musb->endpoints[0 ], tmp, buf); - req->actual += tmp; - tmp =MUSB_CSR0_P_SVDRXPKTRDY ; -if (tmp <64 || req->actual == req->length) { +musb_read_fifo (&musb->endpoints[0 ], count, buf); + req->actual += count; + csr =MUSB_CSR0_P_SVDRXPKTRDY ; +if (count <64 || req->actual == req->length) { musb->ep0_state =MUSB_EP0_STAGE_STATUSIN ; - tmp |=MUSB_CSR0_P_DATAEND ; + csr |=MUSB_CSR0_P_DATAEND ; }else req =NULL ; }else - tmp =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ; + csr =MUSB_CSR0_P_SVDRXPKTRDY |MUSB_CSR0_P_SENDSTALL ;/* Completion handler may choose to stall, e.g. because the * message just received holds invalid data. */ if (req) { - musb->ackpend = tmp; + musb->ackpend = csr;musb_g_ep0_giveback (musb, req);if (!musb->ackpend)return ; musb->ackpend =0 ; } -musb_writew (regs,MUSB_CSR0 , tmp); +musb_writew (regs,MUSB_CSR0 , csr); }/* Signature · 1 line
1.6.0.rc1.71.gfba5
PATCH 2/2 usb: musb: fix bug - should call usb_hcd_unlink_urb_from_ep before usb_hcd_giveback_urb
In reply to Bryan WuThis bug was found on Blackfin BF54x and BF52x board since kernel 2.6.24 USB API change
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=4265
__musb_giveback is called by not only musb_giveback but also musb_urb_dequeue. musb_urb_dequeue also need call usb_hcd_unlink_urb_from_ep before usb_hcd_giveback_urb.
So move usb_hcd_unlink_urb_from_ep from musb_giveback to __musb_giveback to fix this bug.
--- drivers/usb/musb/musb_host.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/musb/musb_host.c +2 -2
@@ -291,6 +291,8 @@ __acquires(musb->lock) urb->actual_length, urb->transfer_buffer_length ); +usb_hcd_unlink_urb_from_ep (musb_to_hcd (musb), urb); +spin_unlock (&musb->lock);usb_hcd_giveback_urb (musb_to_hcd (musb), urb, status);spin_lock (&musb->lock);
@@ -353,8 +355,6 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)break ; } -usb_hcd_unlink_urb_from_ep (musb_to_hcd (musb), urb); - qh->is_ready =0 ;__musb_giveback (musb, urb, status); qh->is_ready = ready;
Signature · 1 line
1.5.6
Re: [PATCH 2/2] usb: musb: fix bug - should call usb_hcd_unlink_urb_from_ep before usb_hcd_giveback_urb
This patch was posted by Ajay. Please ignore it.
-Bryan
Quoted 38 lines · Bryan Wu
This bug was found on Blackfin BF54x and BF52x board since kernel 2.6.24 USB API change
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=4265
__musb_givebackis called by not onlymusb_givebackbut alsomusb_urb_dequeue.musb_urb_dequeuealso need callusb_hcd_unlink_urb_from_epbeforeusb_hcd_giveback_urb.So move
usb_hcd_unlink_urb_from_epfrommusb_givebackto__musb_givebackto fix this bug.Signed-off-by Bryan Wu <[email protected]>--- drivers/usb/musb/musb_host.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)drivers/usb/musb/musb_host.c +2
-3@@ -291,6 +291,8 @@ __acquires(musb->lock) urb->actual_length, urb->transfer_buffer_length ); +usb_hcd_unlink_urb_from_ep (musb_to_hcd (musb), urb); +spin_unlock (&musb->lock);usb_hcd_giveback_urb (musb_to_hcd (musb), urb, status);spin_lock (&musb->lock);@@ -353,8 +355,6 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)break ; } -usb_hcd_unlink_urb_from_ep (musb_to_hcd (musb), urb); - qh->is_ready =0 ;__musb_giveback (musb, urb, status); qh->is_ready = ready; --1.5.6