usb: gadget: OS String support

This is a porting patch from linux kernel: 19824d5eeece
("usb: gadget: OS String support"), original commit log
see below:

"There is a custom (non-USB IF) extension to the USB standard:

http://msdn.microsoft.com/library/windows/hardware/gg463182

They grant permission to use the specification - there is
"Microsoft OS Descriptor Specification License Agreement"
under the link mentioned above, and its Section 2 "Grant
of License", letter (b) reads:

"Patent license. Microsoft hereby grants to You a nonexclusive,
royalty-free, nontransferable, worldwide license under Microsoft鈥檚
patents embodied solely within the Specification and that are owned
or licensable by Microsoft to make, use, import, offer to sell,
sell and distribute directly or indirectly to Your Licensees Your
Implementation. You may sublicense this patent license to Your
Licensees under the same terms and conditions."

The said extension is maintained by Microsoft for Microsoft.

Yet it is fairly common for various devices to use it, and a
popular proprietary operating system expects devices to provide
"OS descriptors", so Linux-based USB gadgets whishing to be able
to talk to a variety of operating systems should be able to provide
the "OS descriptors".

This patch adds optional support for gadgets whishing to expose
the so called "OS String" under index 0xEE of language 0.
The contents of the string is generated based on the qw_sign
array and b_vendor_code.

Interested gadgets need to set the cdev->use_os_string flag,
fill cdev->qw_sign with appropriate values and fill cdev->b_vendor_code
with a value of their choice.

This patch does not however implement responding to any vendor-specific
USB requests."

Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 91ed7fcec5af57e5506923a8601bbb2e6f2080f6..63855af52e92568db91bb3e9c8abdfdb21147250 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -25,6 +25,22 @@ static inline void le16_add_cpu_packed(__le16_packed *var, u16 val)
        var->val = cpu_to_le16(le16_to_cpu(var->val) + val);
 }
 
+/**
+ * struct usb_os_string - represents OS String to be reported by a gadget
+ * @bLength: total length of the entire descritor, always 0x12
+ * @bDescriptorType: USB_DT_STRING
+ * @qwSignature: the OS String proper
+ * @bMS_VendorCode: code used by the host for subsequent requests
+ * @bPad: not used, must be zero
+ */
+struct usb_os_string {
+       __u8    bLength;
+       __u8    bDescriptorType;
+       __u8    qwSignature[OS_STRING_QW_SIGN_LEN];
+       __u8    bMS_VendorCode;
+       __u8    bPad;
+} __packed;
+
 /**
  * usb_add_function() - add a function to a configuration
  * @config: the configuration
@@ -577,6 +593,16 @@ static int get_string(struct usb_composite_dev *cdev,
                return s->bLength;
        }
 
+       if (cdev->use_os_string && language == 0 && id == OS_STRING_IDX) {
+               struct usb_os_string *b = buf;
+               b->bLength = sizeof(*b);
+               b->bDescriptorType = USB_DT_STRING;
+               memcpy(&b->qwSignature, cdev->qw_sign, sizeof(b->qwSignature));
+               b->bMS_VendorCode = cdev->b_vendor_code;
+               b->bPad = 0;
+               return sizeof(*b);
+       }
+
        /*
         * Otherwise, look up and return a specified string.  String IDs
         * are device-scoped, so we look up each string table we're told

diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index a49a66f2f82c7e377bf7c2144d1255fef4cc5afb..d4f2a49869e5dff60b5612d1f94c166e9950db6f 100644 (file)
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -284,6 +284,8 @@ struct usb_composite_driver {
 extern int usb_composite_register(struct usb_composite_driver *);
 extern void usb_composite_unregister(struct usb_composite_driver *);
 
+#define OS_STRING_QW_SIGN_LEN          14
+#define OS_STRING_IDX                  0xEE
 
 /**
  * struct usb_composite_device - represents one composite usb gadget
@@ -291,6 +293,9 @@ extern void usb_composite_unregister(struct usb_composite_driver *);
  * @req: used for control responses; buffer is pre-allocated
  * @bufsiz: size of buffer pre-allocated in @req
  * @config: the currently active configuration
+ * @qw_sign: qwSignature part of the OS string
+ * @b_vendor_code: bMS_VendorCode part of the OS string
+ * @use_os_string: false by default, interested gadgets set it
  *
  * One of these devices is allocated and initialized before the
  * associated device driver's bind() is called.
@@ -324,6 +329,11 @@ struct usb_composite_dev {
 
        struct usb_configuration        *config;
 
+       /* OS String is a custom (yet popular) extension to the USB standard. */
+       u8                              qw_sign[OS_STRING_QW_SIGN_LEN];
+       u8                              b_vendor_code;
+       unsigned int                    use_os_string:1;
+
        /* private: */
        /* internals */
        unsigned int                    suspended:1;