diff options
| author | Yoshihiro Shimoda | 2015-05-26 13:13:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-05-31 09:14:07 +0200 |
| commit | c5d496ad98c212e7d074040504b7737afb4d8bd7 (patch) | |
| tree | 122be2742d54160f0314959e7f9065afa8eb1ef6 /drivers/usb/renesas_usbhs | |
| parent | usb: renesas_usbhs: Fix fifo unclear in usbhsf_prepare_pop (diff) | |
| download | kernel-qcow2-linux-c5d496ad98c212e7d074040504b7737afb4d8bd7.tar.gz kernel-qcow2-linux-c5d496ad98c212e7d074040504b7737afb4d8bd7.tar.xz kernel-qcow2-linux-c5d496ad98c212e7d074040504b7737afb4d8bd7.zip | |
usb: renesas_usbhs: Don't disable the pipe if Control write status stage
This patch fixes an issue that sometimes this controller is not able
to complete the Control write status stage.
This driver should enable DCPCTR.CCPL and PID_BUF to complete the status
stage. However, if this driver detects the ctrl_stage interruption first
before the control write data is received, this driver will clear the
PID_BUF wrongly in the usbhsf_pio_try_pop(). To avoid this issue, this
patch doesn't clear the PID_BUF in the usbhsf_pio_try_pop().
(Since also the privious code doesn't disable the PID_BUF after a control
transfer was finished, this patch doesn't have any side efforts.)
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/renesas_usbhs')
| -rw-r--r-- | drivers/usb/renesas_usbhs/fifo.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index 50f4e3a12072..fa126a2b0c33 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c @@ -678,7 +678,14 @@ static int usbhsf_pio_try_pop(struct usbhs_pkt *pkt, int *is_done) *is_done = 1; usbhsf_rx_irq_ctrl(pipe, 0); usbhs_pipe_running(pipe, 0); - usbhs_pipe_disable(pipe); /* disable pipe first */ + /* + * If function mode, since this controller is possible to enter + * Control Write status stage at this timing, this driver + * should not disable the pipe. If such a case happens, this + * controller is not able to complete the status stage. + */ + if (!usbhs_mod_is_host(priv) && !usbhs_pipe_is_dcp(pipe)) + usbhs_pipe_disable(pipe); /* disable pipe first */ } /* |