This commit adds iSerialNumber to all gadgets that use the Mass
Storage Function. It appears that Windows has problems when
it is not set.
Not to copy the same code all over again, a fsg_string_serial_fill()
macro has been added to the storage_common.c file which is now also
used in the File Storage Gadget.
Signed-off-by: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Reported-by: Dries Van Puymbroeck <Dries.VanPuymbroeck@xxxxxxxxxx>
Tested-by: Dries Van Puymbroeck <Dries.VanPuymbroeck@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
---
Dries Van Puymbroeck reported problems with Windows when serial was
not set. This patch fikes this. As a bug fix, it should get into
the stable.
This particular patch does not apply to the .33.5 nor .34 kernels so
I've also prepered another patch for those versions.
drivers/usb/gadget/file_storage.c | 10 +------
drivers/usb/gadget/mass_storage.c | 47 +++++++++++++++-------------------
drivers/usb/gadget/multi.c | 9 ++++++
drivers/usb/gadget/storage_common.c | 12 +++++++++
4 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 7993267..16decb8 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3447,15 +3447,7 @@ static int __ref fsg_bind(struct usb_gadget *gadget)
init_utsname()->sysname, init_utsname()->release,
gadget->name);
- /* On a real device, serial[] would be loaded from permanent
- * storage. We just encode it from the driver version string. */
- for (i = 0; i < sizeof fsg_string_serial - 2; i += 2) {
- unsigned char c = DRIVER_VERSION[i / 2];
-
- if (!c)
- break;
- sprintf(&fsg_string_serial[i], "%02X", c);
- }
+ fsg_string_serial_fill(fsg_string_serial, DRIVER_VERSION);
fsg->thread_task = kthread_create(fsg_main_thread, fsg,
"file-storage-gadget");
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index 585f255..584d2ed 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -45,7 +45,7 @@
/*-------------------------------------------------------------------------*/
#define DRIVER_DESC "Mass Storage Gadget"
-#define DRIVER_VERSION "2009/09/11"
+#define DRIVER_VERSION "2010/07/01"
/*-------------------------------------------------------------------------*/
@@ -72,21 +72,16 @@ static struct usb_device_descriptor msg_device_desc = {
.bcdUSB = cpu_to_le16(0x0200),
.bDeviceClass = USB_CLASS_PER_INTERFACE,
- /* Vendor and product id can be overridden by module parameters. */
.idVendor = cpu_to_le16(FSG_VENDOR_ID),
.idProduct = cpu_to_le16(FSG_PRODUCT_ID),
- /* .bcdDevice = f(hardware) */
- /* .iManufacturer = DYNAMIC */
- /* .iProduct = DYNAMIC */
- /* NO SERIAL NUMBER */
- .bNumConfigurations = 1,
};
static struct usb_otg_descriptor otg_descriptor = {
.bLength = sizeof otg_descriptor,
.bDescriptorType = USB_DT_OTG,
- /* REVISIT SRP-only hardware is possible, although
+ /*
+ * REVISIT SRP-only hardware is possible, although
* it would not be called "OTG" ...
*/
.bmAttributes = USB_OTG_SRP | USB_OTG_HNP,
@@ -100,16 +95,21 @@ static const struct usb_descriptor_header *otg_desc[] = {
/* string IDs are assigned dynamically */
-#define STRING_MANUFACTURER_IDX 0
-#define STRING_PRODUCT_IDX 1
-#define STRING_CONFIGURATION_IDX 2
+enum {
+ STRING_MANUFACTURER_IDX,
+ STRING_PRODUCT_IDX,
+ STRING_CONFIGURATION_IDX,
+ STRING_SERIAL_IDX
+};
static char manufacturer[50];
+static char serial[13];
static struct usb_string strings_dev[] = {
[STRING_MANUFACTURER_IDX].s = manufacturer,
[STRING_PRODUCT_IDX].s = DRIVER_DESC,
[STRING_CONFIGURATION_IDX].s = "Self Powered",
+ [STRING_SERIAL_IDX].s = serial,
{ } /* end of list */
};
@@ -173,7 +173,6 @@ static struct usb_configuration msg_config_driver = {
.label = "Linux File-Backed Storage",
.bind = msg_do_config,
.bConfigurationValue = 1,
- /* .iConfiguration = DYNAMIC */
.bmAttributes = USB_CONFIG_ATT_SELFPOWER,
};
@@ -187,25 +186,21 @@ static int __ref msg_bind(struct usb_composite_dev *cdev)
struct usb_gadget *gadget = cdev->gadget;
int status;
- /* Allocate string descriptor numbers ... note that string
- * contents can be overridden by the composite_dev glue.
- */
-
- /* device descriptor strings: manufacturer, product */
+ /* Take care of strings */
snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
init_utsname()->sysname, init_utsname()->release,
gadget->name);
- status = usb_string_id(cdev);
- if (status < 0)
- return status;
- strings_dev[STRING_MANUFACTURER_IDX].id = status;
- msg_device_desc.iManufacturer = status;
- status = usb_string_id(cdev);
+ fsg_string_serial_fill(serial, DRIVER_VERSION);
+
+ status = usb_string_ids_tab(cdev, strings_dev);
if (status < 0)
return status;
- strings_dev[STRING_PRODUCT_IDX].id = status;
- msg_device_desc.iProduct = status;
+
+ msg_device_desc.iManufacturer =
+ strings_dev[STRING_MANUFACTURER_IDX].id;
+ msg_device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;
+ msg_device_desc.iSerialNumber = strings_dev[STRING_SERIAL_IDX].id;
status = usb_string_id(cdev);
if (status < 0)
@@ -213,7 +208,7 @@ static int __ref msg_bind(struct usb_composite_dev *cdev)
strings_dev[STRING_CONFIGURATION_IDX].id = status;
msg_config_driver.iConfiguration = status;
- /* register our second configuration */
+ /* Register our second configuration */
status = usb_add_config(cdev, &msg_config_driver);
if (status < 0)
return status;
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 795d762..c8e83ff 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -36,6 +36,7 @@
#define DRIVER_DESC "Multifunction Composite Gadget"
+#define DRIVER_VERSION "2010/07/01"
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("Michal Nazarewicz");
@@ -123,6 +124,7 @@ static const struct usb_descriptor_header *otg_desc[] = {
enum {
MULTI_STRING_MANUFACTURER_IDX,
MULTI_STRING_PRODUCT_IDX,
+ MULTI_STRING_SERIAL_IDX,
#ifdef CONFIG_USB_G_MULTI_RNDIS
MULTI_STRING_RNDIS_CONFIG_IDX,
#endif
@@ -132,10 +134,13 @@ enum {
};
static char manufacturer[50];
+static char serial[13];
+
static struct usb_string strings_dev[] = {
[MULTI_STRING_MANUFACTURER_IDX].s = manufacturer,
[MULTI_STRING_PRODUCT_IDX].s = DRIVER_DESC,
+ [MULTI_STRING_SERIAL_IDX].s = serial,
#ifdef CONFIG_USB_G_MULTI_RNDIS
[MULTI_STRING_RNDIS_CONFIG_IDX].s = "Multifunction with RNDIS",
#endif
@@ -319,6 +324,8 @@ static int __ref multi_bind(struct usb_composite_dev *cdev)
init_utsname()->sysname, init_utsname()->release,
gadget->name);
+ fsg_string_serial_fill(serial, DRIVER_VERSION);
+
status = usb_string_ids_tab(cdev, strings_dev);
if (unlikely(status < 0))
goto fail2;
@@ -327,6 +334,8 @@ static int __ref multi_bind(struct usb_composite_dev *cdev)
strings_dev[MULTI_STRING_MANUFACTURER_IDX].id;
device_desc.iProduct =
strings_dev[MULTI_STRING_PRODUCT_IDX].id;
+ device_desc.iSerialNumber =
+ strings_dev[MULTI_STRING_SERIAL_IDX].id;
/* register configurations */
status = rndis_config_register(cdev);
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 557b119..a808879 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -559,6 +559,18 @@ static struct usb_gadget_strings fsg_stringtab = {
};
+#define fsg_string_serial_fill_n(serial, n, version) do { \
+ unsigned char *c = version; \
+ unsigned i = ((n) + 1) / 2; \
+ char *s = serial; \
+ for (; *c && --i; s += 2, ++c) \
+ sprintf(s, "%02X", *c); \
+ } while (0)
+
+#define fsg_string_serial_fill(serial, version) \
+ fsg_string_serial_fill_n(serial, ARRAY_SIZE(serial), version)
+
+
/*-------------------------------------------------------------------------*/
/*
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
