3.10-stable patches

added patches:
	usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch
	usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch

diff --git a/queue-3.10/series b/queue-3.10/series
index 8c0dde2227bedd37acf328330308180b743f8cec..6085cb98cf2ba0447f65475108e26827d7331002 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -110,3 +110,5 @@ posix-timers-fix-stack-info-leak-in-timer_create.patch
 x86-apic-handle-a-bad-tsc-more-gracefully.patch
 mm-remove-false-warn_on-from-pagecache_isize_extended.patch
 crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch
+usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch
+usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch

diff --git a/queue-3.10/usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch b/queue-3.10/usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch
new file mode 100644 (file)
index 0000000..62e0c75
--- /dev/null
+++ b/queue-3.10/usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch
@@ -0,0 +1,115 @@
+From balbi@ti.com  Wed Nov 12 08:38:02 2014
+From: Felipe Balbi <balbi@ti.com>
+Date: Mon, 10 Nov 2014 08:55:44 -0600
+Subject: usb: dwc3: gadget: fix set_halt() bug with pending transfers
+To: Greg KH <gregkh@linuxfoundation.org>
+Cc: <stable@vger.kernel.org>, Felipe Balbi <balbi@ti.com>
+Message-ID: <1415631344-23269-1-git-send-email-balbi@ti.com>
+
+From: Felipe Balbi <balbi@ti.com>
+
+[ Upstream commit 7a60855972f0d3c014093046cb6f013a1ee5bb19 ]
+
+According to our Gadget Framework API documentation,
+->set_halt() *must* return -EAGAIN if we have pending
+transfers (on either direction) or FIFO isn't empty (on
+TX endpoints).
+
+Fix this bug so that the mass storage gadget can be used
+without stall=0 parameter.
+
+This patch should be backported to all kernels since v3.2.
+
+Suggested-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/dwc3/ep0.c    |    4 ++--
+ drivers/usb/dwc3/gadget.c |   16 ++++++++++++----
+ drivers/usb/dwc3/gadget.h |    2 +-
+ 3 files changed, 15 insertions(+), 7 deletions(-)
+
+--- a/drivers/usb/dwc3/ep0.c
++++ b/drivers/usb/dwc3/ep0.c
+@@ -270,7 +270,7 @@ static void dwc3_ep0_stall_and_restart(s
+ 
+       /* stall is always issued on EP0 */
+       dep = dwc->eps[0];
+-      __dwc3_gadget_ep_set_halt(dep, 1);
++      __dwc3_gadget_ep_set_halt(dep, 1, false);
+       dep->flags = DWC3_EP_ENABLED;
+       dwc->delayed_status = false;
+ 
+@@ -480,7 +480,7 @@ static int dwc3_ep0_handle_feature(struc
+                               return -EINVAL;
+                       if (set == 0 && (dep->flags & DWC3_EP_WEDGE))
+                               break;
+-                      ret = __dwc3_gadget_ep_set_halt(dep, set);
++                      ret = __dwc3_gadget_ep_set_halt(dep, set, true);
+                       if (ret)
+                               return -EINVAL;
+                       break;
+--- a/drivers/usb/dwc3/gadget.c
++++ b/drivers/usb/dwc3/gadget.c
+@@ -605,7 +605,7 @@ static int __dwc3_gadget_ep_disable(stru
+ 
+       /* make sure HW endpoint isn't stalled */
+       if (dep->flags & DWC3_EP_STALL)
+-              __dwc3_gadget_ep_set_halt(dep, 0);
++              __dwc3_gadget_ep_set_halt(dep, 0, false);
+ 
+       reg = dwc3_readl(dwc->regs, DWC3_DALEPENA);
+       reg &= ~DWC3_DALEPENA_EP(dep->number);
+@@ -1205,7 +1205,7 @@ out0:
+       return ret;
+ }
+ 
+-int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)
++int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
+ {
+       struct dwc3_gadget_ep_cmd_params        params;
+       struct dwc3                             *dwc = dep->dwc;
+@@ -1214,6 +1214,14 @@ int __dwc3_gadget_ep_set_halt(struct dwc
+       memset(&params, 0x00, sizeof(params));
+ 
+       if (value) {
++              if (!protocol && ((dep->direction && dep->flags & DWC3_EP_BUSY) ||
++                              (!list_empty(&dep->req_queued) ||
++                               !list_empty(&dep->request_list)))) {
++                      dev_dbg(dwc->dev, "%s: pending request, cannot halt\n",
++                                      dep->name);
++                      return -EAGAIN;
++              }
++
+               ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
+                       DWC3_DEPCMD_SETSTALL, &params);
+               if (ret)
+@@ -1253,7 +1261,7 @@ static int dwc3_gadget_ep_set_halt(struc
+               goto out;
+       }
+ 
+-      ret = __dwc3_gadget_ep_set_halt(dep, value);
++      ret = __dwc3_gadget_ep_set_halt(dep, value, false);
+ out:
+       spin_unlock_irqrestore(&dwc->lock, flags);
+ 
+@@ -1273,7 +1281,7 @@ static int dwc3_gadget_ep_set_wedge(stru
+       if (dep->number == 0 || dep->number == 1)
+               return dwc3_gadget_ep0_set_halt(ep, 1);
+       else
+-              return dwc3_gadget_ep_set_halt(ep, 1);
++              return __dwc3_gadget_ep_set_halt(dep, 1, false);
+ }
+ 
+ /* -------------------------------------------------------------------------- */
+--- a/drivers/usb/dwc3/gadget.h
++++ b/drivers/usb/dwc3/gadget.h
+@@ -114,7 +114,7 @@ void dwc3_ep0_out_start(struct dwc3 *dwc
+ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value);
+ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
+               gfp_t gfp_flags);
+-int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value);
++int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol);
+ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
+               unsigned cmd, struct dwc3_gadget_ep_cmd_params *params);
+ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, int cmd, u32 param);

diff --git a/queue-3.10/usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch b/queue-3.10/usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch
new file mode 100644 (file)
index 0000000..5d7ea97
--- /dev/null
+++ b/queue-3.10/usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch
@@ -0,0 +1,44 @@
+From balbi@ti.com  Wed Nov 12 08:39:16 2014
+From: Felipe Balbi <balbi@ti.com>
+Date: Mon, 10 Nov 2014 08:56:40 -0600
+Subject: usb: gadget: function: acm: make f_acm pass USB20CV Chapter9
+To: Greg KH <gregkh@linuxfoundation.org>
+Cc: <stable@vger.kernel.org>, Felipe Balbi <balbi@ti.com>
+Message-ID: <1415631400-23406-1-git-send-email-balbi@ti.com>
+
+From: Felipe Balbi <balbi@ti.com>
+
+[ Upstream commit 52ec49a5e56a27c5b6f8217708783eff39f24c16 ]
+
+During Halt Endpoint Test, our interrupt endpoint
+will be disabled, which will clear out ep->desc
+to NULL. Unless we call config_ep_by_speed() again,
+we will not be able to enable this endpoint which
+will make us fail that test.
+
+Fixes: f9c56cd (usb: gadget: Clear usb_endpoint_descriptor
+       inside the struct usb_ep on disable)
+Signed-off-by: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/gadget/f_acm.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/gadget/f_acm.c
++++ b/drivers/usb/gadget/f_acm.c
+@@ -430,11 +430,12 @@ static int acm_set_alt(struct usb_functi
+               if (acm->notify->driver_data) {
+                       VDBG(cdev, "reset acm control interface %d\n", intf);
+                       usb_ep_disable(acm->notify);
+-              } else {
+-                      VDBG(cdev, "init acm ctrl interface %d\n", intf);
++              }
++
++              if (!acm->notify->desc)
+                       if (config_ep_by_speed(cdev->gadget, f, acm->notify))
+                               return -EINVAL;
+-              }
++
+               usb_ep_enable(acm->notify);
+               acm->notify->driver_data = acm;
+