korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()

Browse Source 
This patch fixes an issue that the CFIFOSEL register value is possible
to be changed by usbhsg_ep_enable() wrongly. And then, a data transfer
using CFIFO may not work correctly.

For example:
 # modprobe g_multi file=usb-storage.bin
 # ifconfig usb0 192.168.1.1 up
 (During the USB host is sending file to the mass storage)
 # ifconfig usb0 down

In this case, since the u_ether.c may call usb_ep_enable() in
eth_stop(), if the renesas_usbhs driver is also using CFIFO for
mass storage, the mass storage may not work correctly.

So, this patch adds usbhs_lock() and usbhs_unlock() calling in
usbhsg_ep_enable() to protect CFIFOSEL register. This is because:
 - CFIFOSEL.CURPIPE = 0 is also needed for the pipe configuration
 - The CFIFOSEL (fifo->sel) is already protected by usbhs_lock()

Fixes: 97664a207b ("usb: renesas_usbhs: shrink spin lock area")
Cc: <stable@vger.kernel.org> # v3.1+
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Yoshihiro Shimoda 2016-06-08 16:32:50 +09:00 committed by Felipe Balbi
parent 4fdef69838
commit 15e4292a2d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/renesas_usbhs/mod_gadget.c
View File

@ -585,6 +585,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv); struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
struct usbhs_pipe *pipe; struct usbhs_pipe *pipe;
int ret = -EIO; int ret = -EIO;
unsigned long flags;
usbhs_lock(priv, flags);
/* /*
* if it already have pipe, * if it already have pipe,
@ -593,7 +596,8 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
if (uep->pipe) { if (uep->pipe) {
usbhs_pipe_clear(uep->pipe); usbhs_pipe_clear(uep->pipe);
usbhs_pipe_sequence_data0(uep->pipe); usbhs_pipe_sequence_data0(uep->pipe);
return 0; ret = 0;
goto usbhsg_ep_enable_end;
} }
pipe = usbhs_pipe_malloc(priv, pipe = usbhs_pipe_malloc(priv,
@ -621,6 +625,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
ret = 0; ret = 0;
} }
usbhsg_ep_enable_end:
usbhs_unlock(priv, flags);
return ret; return ret;
} }