From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52177 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932341AbcIBOXB (ORCPT ); Fri, 2 Sep 2016 10:23:01 -0400 Subject: Patch "usb: dwc3: gadget: increment request->actual once" has been added to the 4.4-stable tree To: felipe.balbi@linux.intel.com, brian.e.rogers@intel.com, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 02 Sep 2016 16:23:06 +0200 Message-ID: <147282618646179@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled usb: dwc3: gadget: increment request->actual once to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-dwc3-gadget-increment-request-actual-once.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From c7de573471832dff7d31f0c13b0f143d6f017799 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 29 Jul 2016 03:17:58 +0300 Subject: usb: dwc3: gadget: increment request->actual once From: Felipe Balbi 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 Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- 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) Patches currently in stable-queue which might be from felipe.balbi@linux.intel.com are queue-4.4/usb-dwc3-pci-add-intel-kabylake-pci-id.patch queue-4.4/usb-renesas_usbhs-clear-the-brdysts-in-usbhsg_ep_enable.patch queue-4.4/usb-gadget-fix-gadgetfs-aio-support.patch queue-4.4/usb-renesas_usbhs-use-dmac-only-if-the-pipe-type-is-bulk.patch queue-4.4/usb-gadget-fsl_qe_udc-off-by-one-in-setup_received_handle.patch queue-4.4/usb-dwc3-gadget-increment-request-actual-once.patch