Merge tag 'usb-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

Felipe writes:

usb: patches for v3.20 merge window

Here's the big pull request for Gadgets and PHYs. It's
a total of 217 non-merge commits with pretty much everything
being touched.

The most important bits are a ton of new documentation for
almost all usb gadget functions, a new isp1760 UDC driver,
several improvements to the old net2280 UDC driver, and
some minor tracepoint improvements to dwc3.

Other than that, a big list of minor cleanups, smaller bugfixes
and new features all over the place.

Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/drivers/usb/gadget/function/u_fs.h b/drivers/usb/gadget/function/u_fs.h
index cd128e31f808..60139854e0b1 100644
--- a/drivers/usb/gadget/function/u_fs.h
+++ b/drivers/usb/gadget/function/u_fs.h
@@ -19,6 +19,7 @@
 #include <linux/usb/composite.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
+#include <linux/workqueue.h>
 
 #ifdef VERBOSE_DEBUG
 #ifndef pr_vdebug
@@ -93,6 +94,26 @@ enum ffs_state {
         FFS_ACTIVE,
 
         /*
+         * Function is visible to host, but it's not functional. All
+         * setup requests are stalled and transfers on another endpoints
+         * are refused. All epfiles, except ep0, are deleted so there
+         * is no way to perform any operations on them.
+         *
+         * This state is set after closing all functionfs files, when
+         * mount parameter "no_disconnect=1" has been set. Function will
+         * remain in deactivated state until filesystem is umounted or
+         * ep0 is opened again. In the second case functionfs state will
+         * be reset, and it will be ready for descriptors and strings
+         * writing.
+         *
+         * This is useful only when functionfs is composed to gadget
+         * with another function which can perform some critical
+         * operations, and it's strongly desired to have this operations
+         * completed, even after functionfs files closure.
+         */
+        FFS_DEACTIVATED,
+
+        /*
          * All endpoints have been closed.  This state is also set if
          * we encounter an unrecoverable error.  The only
          * unrecoverable error is situation when after reading strings
@@ -251,6 +272,10 @@ struct ffs_data {
                 kgid_t                          gid;
         }                               file_perms;
 
+        struct eventfd_ctx *ffs_eventfd;
+        bool no_disconnect;
+        struct work_struct reset_work;
+
         /*
          * The endpoint files, filled by ffs_epfiles_create(),
          * destroyed by ffs_epfiles_destroy().