Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: mtu3: add a new function to do status stage

Browse Source 
Exact a new static function to do status stage

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1570611900-7112-1-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chunfeng Yun 2019-10-09 17:04:59 +08:00 committed by Greg Kroah-Hartman
parent da4b5d18dd
commit 71460342d4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/mtu3/mtu3_gadget_ep0.c
View File

@ -153,6 +153,15 @@ static void ep0_stall_set(struct mtu3_ep *mep0, bool set, u32 pktrdy)
set ? "SEND" : "CLEAR", decode_ep0_state(mtu)); set ? "SEND" : "CLEAR", decode_ep0_state(mtu));
} }
static void ep0_do_status_stage(struct mtu3 *mtu)
{
void __iomem *mbase = mtu->mac_base;
u32 value;
value = mtu3_readl(mbase, U3D_EP0CSR) & EP0_W1C_BITS;
mtu3_writel(mbase, U3D_EP0CSR, value | EP0_SETUPPKTRDY | EP0_DATAEND);
}
static int ep0_queue(struct mtu3_ep *mep0, struct mtu3_request *mreq); static int ep0_queue(struct mtu3_ep *mep0, struct mtu3_request *mreq);
static void ep0_dummy_complete(struct usb_ep *ep, struct usb_request *req) static void ep0_dummy_complete(struct usb_ep *ep, struct usb_request *req)
@ -297,8 +306,7 @@ static int handle_test_mode(struct mtu3 *mtu, struct usb_ctrlrequest *setup)
ep0_load_test_packet(mtu); ep0_load_test_packet(mtu);
/* send status before entering test mode. */ /* send status before entering test mode. */
value = mtu3_readl(mbase, U3D_EP0CSR) & EP0_W1C_BITS; ep0_do_status_stage(mtu);
mtu3_writel(mbase, U3D_EP0CSR, value | EP0_SETUPPKTRDY | EP0_DATAEND);
/* wait for ACK status sent by host */ /* wait for ACK status sent by host */
readl_poll_timeout_atomic(mbase + U3D_EP0CSR, value, readl_poll_timeout_atomic(mbase + U3D_EP0CSR, value,
@ -632,7 +640,6 @@ __acquires(mtu->lock)
{ {
struct usb_ctrlrequest setup; struct usb_ctrlrequest setup;
struct mtu3_request *mreq; struct mtu3_request *mreq;
void __iomem *mbase = mtu->mac_base;
int handled = 0; int handled = 0;
ep0_read_setup(mtu, &setup); ep0_read_setup(mtu, &setup);
@ -668,10 +675,7 @@ finish:
mtu->delayed_status = true; mtu->delayed_status = true;
} else if (le16_to_cpu(setup.wLength) == 0) { /* no data stage */ } else if (le16_to_cpu(setup.wLength) == 0) { /* no data stage */
mtu3_writel(mbase, U3D_EP0CSR, ep0_do_status_stage(mtu);
(mtu3_readl(mbase, U3D_EP0CSR) & EP0_W1C_BITS)
| EP0_SETUPPKTRDY | EP0_DATAEND);
/* complete zlp request directly */ /* complete zlp request directly */
mreq = next_ep0_request(mtu); mreq = next_ep0_request(mtu);
if (mreq && !mreq->request.length) if (mreq && !mreq->request.length)
@ -802,12 +806,9 @@ static int ep0_queue(struct mtu3_ep *mep, struct mtu3_request *mreq)
} }
if (mtu->delayed_status) { if (mtu->delayed_status) {
u32 csr;
mtu->delayed_status = false; mtu->delayed_status = false;
csr = mtu3_readl(mtu->mac_base, U3D_EP0CSR) & EP0_W1C_BITS; ep0_do_status_stage(mtu);
csr |= EP0_SETUPPKTRDY | EP0_DATAEND;
mtu3_writel(mtu->mac_base, U3D_EP0CSR, csr);
/* needn't giveback the request for handling delay STATUS */ /* needn't giveback the request for handling delay STATUS */
return 0; return 0;
} }