diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-12-09 06:31:37 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-12-13 15:06:30 +0400 |
| commit | 2d833faad260ad074fb1ed0a378f4ccd1b8025b8 (patch) | |
| tree | c6dc58947216bd0cc4afb48b9542a5acfedb7b4b /drivers/usb/renesas_usbhs/mod_host.c | |
| parent | 6d0376f84446507d07ae83935cbe7538d07c352f (diff) | |
| download | linux-2d833faad260ad074fb1ed0a378f4ccd1b8025b8.tar.xz | |
usb: renesas_usbhs: add force packet remove method
Packet should be force removed when reset/detach
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/renesas_usbhs/mod_host.c')
| -rw-r--r-- | drivers/usb/renesas_usbhs/mod_host.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c index 9715a7013734..92dcc7e64630 100644 --- a/drivers/usb/renesas_usbhs/mod_host.c +++ b/drivers/usb/renesas_usbhs/mod_host.c @@ -703,6 +703,34 @@ static int usbhsh_queue_push(struct usb_hcd *hcd, return 0; } +static void usbhsh_queue_force_pop(struct usbhs_priv *priv, + struct usbhs_pipe *pipe) +{ + struct usbhs_pkt *pkt; + + while (1) { + pkt = usbhs_pkt_pop(pipe, NULL); + if (!pkt) + break; + + /* + * if all packet are gone, usbhsh_endpoint_disable() + * will be called. + * then, attached device/endpoint/pipe will be detached + */ + usbhsh_queue_done(priv, pkt); + } +} + +static void usbhsh_queue_force_pop_all(struct usbhs_priv *priv) +{ + struct usbhs_pipe *pos; + int i; + + usbhs_for_each_pipe_with_dcp(pos, priv, i) + usbhsh_queue_force_pop(priv, pos); +} + /* * DCP setup stage */ @@ -1106,6 +1134,8 @@ static int __usbhsh_hub_port_feature(struct usbhsh_hpriv *hpriv, USB_PORT_STAT_HIGH_SPEED | USB_PORT_STAT_LOW_SPEED); + usbhsh_queue_force_pop_all(priv); + usbhs_bus_send_reset(priv); msleep(20); usbhs_bus_send_sof_enable(priv); @@ -1309,6 +1339,12 @@ static int usbhsh_irq_dtch(struct usbhs_priv *priv, hpriv->mod.irq_attch = usbhsh_irq_attch; usbhs_irq_callback_update(priv, &hpriv->mod); + /* + * usbhsh_queue_force_pop_all() should be called + * after usbhsh_is_running() becomes invalid. + */ + usbhsh_queue_force_pop_all(priv); + return 0; } |