diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2015-02-23 18:40:14 +0530 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2015-04-14 05:48:10 +0200 |
| commit | 1f78f8fedab10f7b30559d6db9b142be5b6daf75 (patch) | |
| tree | 5ad30bcd5d553cd0b1564b4f0209cd62f8628dd0 /drivers/usb/dwc3/ep0.c | |
| parent | 526a50f8ec300194aa168e07d7dee6f32902d06d (diff) | |
| download | talos-obmc-uboot-1f78f8fedab10f7b30559d6db9b142be5b6daf75.tar.gz talos-obmc-uboot-1f78f8fedab10f7b30559d6db9b142be5b6daf75.zip | |
usb: dwc3: ep0: preparation for implementing chained TRB
No functional change. Modified few things so that there are no
code duplication while implementing chained TRB.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
Diffstat (limited to 'drivers/usb/dwc3/ep0.c')
| -rw-r--r-- | drivers/usb/dwc3/ep0.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 977d6d4fd2..fce2558df2 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -761,7 +761,10 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc, struct usb_request *ur; struct dwc3_trb *trb; struct dwc3_ep *ep0; - u32 transferred; + unsigned transfer_size = 0; + unsigned maxp; + void *buf; + u32 transferred = 0; u32 status; u32 length; u8 epnum; @@ -790,18 +793,19 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc, } ur = &r->request; + buf = ur->buf; length = trb->size & DWC3_TRB_SIZE_MASK; - if (dwc->ep0_bounced) { - unsigned transfer_size = ur->length; - unsigned maxp = ep0->endpoint.maxpacket; + maxp = ep0->endpoint.maxpacket; - transfer_size += (maxp - (transfer_size % maxp)); - transferred = min_t(u32, ur->length, - transfer_size - length); + if (dwc->ep0_bounced) { + transfer_size = roundup((ur->length - transfer_size), + maxp); + transferred = min_t(u32, ur->length - transferred, + transfer_size - length); dwc3_flush_cache((int)dwc->ep0_bounce, DWC3_EP0_BOUNCE_SIZE); - memcpy(ur->buf, dwc->ep0_bounce, transferred); + memcpy(buf, dwc->ep0_bounce, transferred); } else { transferred = ur->length - length; } |
