Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-04 10:43:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

musb-new: Properly remove a transfer from the schedule on timeout

Browse source 
If a transfer / urb times-out, properly remove it from the schedule, rather
then letting it sit on the ep head. This stops the musb code from getting
confused and refusing to queue further transfers after a timeout.

Tested by unplugging a usb-keyboard, replugging it and doing a usb-reset,
before this commit the keyboard would not work after the usb-reset.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2015-01-11 20:34:52 +01:00 • committed by Marek Vasut
parent 90cdc1039d
commit b918a0c6f6
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/usb/musb-new/musb_host.c
View file

@ -2130,8 +2130,6 @@ done:
return ret; return ret;
} }
#ifndef __UBOOT__
/* /*
* abort a transfer that's at the head of a hardware queue. * abort a transfer that's at the head of a hardware queue.
* called with controller locked, irqs blocked * called with controller locked, irqs blocked
@ -2195,7 +2193,14 @@ static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh)
return status; return status;
} }
static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) #ifndef __UBOOT__
static int musb_urb_dequeue(
#else
int musb_urb_dequeue(
#endif
struct usb_hcd *hcd,
struct urb *urb,
int status)
{ {
struct musb *musb = hcd_to_musb(hcd); struct musb *musb = hcd_to_musb(hcd);
struct musb_qh *qh; struct musb_qh *qh;
@ -2253,6 +2258,7 @@ done:
return ret; return ret;
} }
#ifndef __UBOOT__
/* disable an endpoint */ /* disable an endpoint */
static void static void
musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep) musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep)

1
drivers/usb/musb-new/musb_host.h
View file

@ -110,5 +110,6 @@ static inline struct urb *next_urb(struct musb_qh *qh)
#ifdef __UBOOT__ #ifdef __UBOOT__
int musb_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags); int musb_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags);
int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status);
#endif #endif
#endif /* _MUSB_HOST_H */ #endif /* _MUSB_HOST_H */

3
drivers/usb/musb-new/musb_uboot.c
View file

@ -77,6 +77,9 @@ static int submit_urb(struct usb_hcd *hcd, struct urb *urb)
} while (urb->status == -EINPROGRESS && } while (urb->status == -EINPROGRESS &&
get_timer(0) < timeout); get_timer(0) < timeout);
if (urb->status == -EINPROGRESS)
musb_urb_dequeue(hcd, urb, -ETIME);
return urb->status; return urb->status;
} }

1
drivers/usb/musb-new/usb-compat.h
View file

@ -48,6 +48,7 @@ struct urb {
list_add_tail(&urb->urb_list, &urb->ep->urb_list); \ list_add_tail(&urb->urb_list, &urb->ep->urb_list); \
ret; }) ret; })
#define usb_hcd_unlink_urb_from_ep(hcd, urb) list_del_init(&urb->urb_list) #define usb_hcd_unlink_urb_from_ep(hcd, urb) list_del_init(&urb->urb_list)
#define usb_hcd_check_unlink_urb(hdc, urb, status) 0
static inline void usb_hcd_giveback_urb(struct usb_hcd *hcd, static inline void usb_hcd_giveback_urb(struct usb_hcd *hcd,
struct urb *urb, struct urb *urb,