diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-22 14:39:41 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-22 14:39:41 -0400 |
| commit | 88d0cfcc86e7e9eaf5ef135b007e1728bcd3f36c (patch) | |
| tree | 3e4cbeb5d0bd3ce90feac026432baf028fe869f9 | |
| parent | dcfb6cc2875e74656fbc1b58cf91c52fe893b49e (diff) | |
| download | longterm-queue-4.8-88d0cfcc86e7e9eaf5ef135b007e1728bcd3f36c.tar.gz | |
dwc3: drop patch referencing sysdev not present in 4.8.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/usb-dwc3-gadget-delay-unmap-of-bounced-requests.patch | 66 |
2 files changed, 0 insertions, 67 deletions
diff --git a/queue/series b/queue/series index 3a14f53..9f601f1 100644 --- a/queue/series +++ b/queue/series @@ -51,7 +51,6 @@ random-use-chacha20-for-get_random_int-long.patch clk-lpc32xx-add-a-quirk-for-PWM-and-MS-clock-divider.patch HID-usbhid-Add-quirks-for-Mayflash-Dragonrise-GameCu.patch HID-i2c-hid-add-a-simple-quirk-to-fix-device-defects.patch -usb-dwc3-gadget-delay-unmap-of-bounced-requests.patch net-mlx4_core-Use-device-ID-defines.patch clocksource-drivers-arm_arch_timer-Don-t-assume-cloc.patch scsi-ufs-Enable-no-vccq-quirk-for-skhynix-device.patch diff --git a/queue/usb-dwc3-gadget-delay-unmap-of-bounced-requests.patch b/queue/usb-dwc3-gadget-delay-unmap-of-bounced-requests.patch deleted file mode 100644 index f539d75..0000000 --- a/queue/usb-dwc3-gadget-delay-unmap-of-bounced-requests.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 2db5e03f7814aa69e715eef4f39eb5290f4c1e8c Mon Sep 17 00:00:00 2001 -From: Janusz Dziedzic <januszx.dziedzic@intel.com> -Date: Mon, 13 Mar 2017 14:11:32 +0200 -Subject: [PATCH] usb: dwc3: gadget: delay unmap of bounced requests - -commit de288e36fe33f7e06fa272bc8e2f85aa386d99aa upstream. - -In the case of bounced ep0 requests, we must delay DMA operation until -after ->complete() otherwise we might overwrite contents of req->buf. - -This caused problems with RNDIS gadget. - -Signed-off-by: Janusz Dziedzic <januszx.dziedzic@intel.com> -Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -index cdb78d2b3513..5b13ead754a7 100644 ---- a/drivers/usb/dwc3/gadget.c -+++ b/drivers/usb/dwc3/gadget.c -@@ -174,6 +174,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, - int status) - { - struct dwc3 *dwc = dep->dwc; -+ unsigned int unmap_after_complete = false; - int i; - - if (req->started) { -@@ -189,11 +190,19 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, - if (req->request.status == -EINPROGRESS) - req->request.status = status; - -- if (dwc->ep0_bounced && dep->number <= 1) -+ /* -+ * NOTICE we don't want to unmap before calling ->complete() if we're -+ * dealing with a bounced ep0 request. If we unmap it here, we would end -+ * up overwritting the contents of req->buf and this could confuse the -+ * gadget driver. -+ */ -+ if (dwc->ep0_bounced && dep->number <= 1) { - dwc->ep0_bounced = false; -- -- usb_gadget_unmap_request(&dwc->gadget, &req->request, -- req->direction); -+ unmap_after_complete = true; -+ } else { -+ usb_gadget_unmap_request(&dwc->gadget, &req->request, -+ req->direction); -+ } - - trace_dwc3_gadget_giveback(req); - -@@ -201,6 +210,10 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, - usb_gadget_giveback_request(&dep->endpoint, &req->request); - spin_lock(&dwc->lock); - -+ if (unmap_after_complete) -+ usb_gadget_unmap_request_by_dev(dwc->sysdev, -+ &req->request, req->direction); -+ - if (dep->number > 1) - pm_runtime_put(dwc->dev); - } --- -2.12.0 - |