[PATCH 4.7 033/143] usb: dwc3: gadget: increment request->actual once
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2016-09-05 16:48:26
Also in:
lkml
4.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felipe Balbi <redacted> commit c7de573471832dff7d31f0c13b0f143d6f017799 upstream. When using SG lists, we would end up setting request->actual to: num_mapped_sgs * (request->length - count) Let's fix that up by incrementing request->actual only once. Reported-by: Brian E Rogers <redacted> Signed-off-by: Felipe Balbi <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/usb/dwc3/gadget.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c@@ -1954,14 +1954,6 @@ static int __dwc3_cleanup_done_trbs(stru s_pkt = 1; } - /* - * We assume here we will always receive the entire data block - * which we should receive. Meaning, if we program RX to - * receive 4K but we receive only 2K, we assume that's all we - * should receive and we simply bounce the request back to the - * gadget driver for further processing. - */ - req->request.actual += req->request.length - count; if (s_pkt) return 1; if ((event->status & DEPEVT_STATUS_LST) &&
@@ -1981,6 +1973,7 @@ static int dwc3_cleanup_done_reqs(struct struct dwc3_trb *trb; unsigned int slot; unsigned int i; + int count = 0; int ret; do {
@@ -1995,6 +1988,8 @@ static int dwc3_cleanup_done_reqs(struct slot++; slot %= DWC3_TRB_NUM; trb = &dep->trb_pool[slot]; + count += trb->size & DWC3_TRB_SIZE_MASK; + ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb, event, status);
@@ -2002,6 +1997,14 @@ static int dwc3_cleanup_done_reqs(struct break; } while (++i < req->request.num_mapped_sgs); + /* + * We assume here we will always receive the entire data block + * which we should receive. Meaning, if we program RX to + * receive 4K but we receive only 2K, we assume that's all we + * should receive and we simply bounce the request back to the + * gadget driver for further processing. + */ + req->request.actual += req->request.length - count; dwc3_gadget_giveback(dep, req, status); if (ret)