lkml.org 
[lkml]   [2016]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 035/113] usb: dwc3: gadget: increment request->actual once
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felipe Balbi <felipe.balbi@linux.intel.com>

    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 <brian.e.rogers@intel.com>
    Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
    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
    @@ -1892,14 +1892,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) &&
    @@ -1919,6 +1911,7 @@ static int dwc3_cleanup_done_reqs(struct
    struct dwc3_trb *trb;
    unsigned int slot;
    unsigned int i;
    + int count = 0;
    int ret;

    do {
    @@ -1935,6 +1928,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);
    @@ -1942,6 +1937,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)

    \
     
     \ /
      Last update: 2016-09-17 09:58    [W:4.126 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site