Commit ed9cbda6 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: gadget: remove usb_gadget_controller_number() 



The bcdDevice field is defined as
|Device release number in binary-coded decimal
in the USB 2.0 specification. We use this field to distinguish the UDCs
from each other. In theory this could be used on the host side to apply
certain quirks if the "special" UDC in combination with this gadget is
used. This hasn't been done as far as I am aware. In practice it would
be better to fix the UDC driver before shipping since a later release
might not need this quirk anymore.

There are some driver in tree (on the host side) which use the bcdDevice
field to figure out special workarounds for a given firmware revision.
This seems to make sense. Therefore this patch converts all gadgets
(except a few) to use the kernel version instead a random 2 or 3 plus
the UDC number. The few that don't report kernel's version are:
- webcam
  This one reports always a version 0x10 so allow it to do so in future.
- nokia
  This one reports always 0x211. The comment says that this gadget works
  only if the UDC supports altsettings so I added a check for this.
- serial
  This one reports 0x2400 + UDC number. Since the gadget version is 2.4
  this could make sense. Therefore bcdDevice is 0x2400 here.

I also remove various gadget_is_<name> macros which are unused. The
remaining few macros should be moved to feature / bug bitfield.

Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 9c6d196d

drivers/usb/gadget/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG 
obj-$(CONFIG_USB_GADGET)	+= udc-core.o

obj-$(CONFIG_USB_LIBCOMPOSITE)	+= libcomposite.o

libcomposite-y			:= usbstring.o config.o epautoconf.o

libcomposite-y			+= gadget_chips.o composite.o

libcomposite-y			+= composite.o

obj-$(CONFIG_USB_DUMMY_HCD)	+= dummy_hcd.o

obj-$(CONFIG_USB_NET2272)	+= net2272.o

obj-$(CONFIG_USB_NET2280)	+= net2280.o

drivers/usb/gadget/acm_ms.c

+0 −13
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ static struct usb_configuration acm_ms_config_driver = { 


static int __init acm_ms_bind(struct usb_composite_dev *cdev)

{

	int			gcnum;

	struct usb_gadget	*gadget = cdev->gadget;

	int			status;

	void			*retp;
@@ -165,18 +164,6 @@ static int __init acm_ms_bind(struct usb_composite_dev *cdev) 
		goto fail0;

	}



	/* set bcdDevice */

	gcnum = usb_gadget_controller_number(gadget);

	if (gcnum >= 0) {

		device_desc.bcdDevice = cpu_to_le16(0x0300 | gcnum);

	} else {

		WARNING(cdev, "controller '%s' not recognized; trying %s\n",

				gadget->name,

				acm_ms_config_driver.label);

		device_desc.bcdDevice =

			cpu_to_le16(0x0300 | 0x0099);

	}



	/*

	 * Allocate string descriptor numbers ... note that string

	 * contents can be overridden by the composite_dev glue.

drivers/usb/gadget/audio.c

+0 −12
Original line number Diff line number Diff line
@@ -135,20 +135,8 @@ static struct usb_configuration audio_config_driver = { 


static int __init audio_bind(struct usb_composite_dev *cdev)

{

	int			gcnum;

	int			status;



	gcnum = usb_gadget_controller_number(cdev->gadget);

	if (gcnum >= 0)

		device_desc.bcdDevice = cpu_to_le16(0x0300 | gcnum);

	else {

		ERROR(cdev, "controller '%s' not recognized; trying %s\n",

			cdev->gadget->name,

			audio_config_driver.label);

		device_desc.bcdDevice =

			__constant_cpu_to_le16(0x0300 | 0x0099);

	}



	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail;

drivers/usb/gadget/cdc2.c

+0 −16
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ static struct usb_configuration cdc_config_driver = { 


static int __init cdc_bind(struct usb_composite_dev *cdev)

{

	int			gcnum;

	struct usb_gadget	*gadget = cdev->gadget;

	int			status;
@@ -163,21 +162,6 @@ static int __init cdc_bind(struct usb_composite_dev *cdev) 
	if (status < 0)

		goto fail0;



	gcnum = usb_gadget_controller_number(gadget);

	if (gcnum >= 0)

		device_desc.bcdDevice = cpu_to_le16(0x0300 | gcnum);

	else {

		/* We assume that can_support_ecm() tells the truth;

		 * but if the controller isn't recognized at all then

		 * that assumption is a bit more likely to be wrong.

		 */

		WARNING(cdev, "controller '%s' not recognized; trying %s\n",

				gadget->name,

				cdc_config_driver.label);

		device_desc.bcdDevice =

			cpu_to_le16(0x0300 | 0x0099);

	}



	/* Allocate string descriptor numbers ... note that string

	 * contents can be overridden by the composite_dev glue.

	 */

drivers/usb/gadget/composite.c

+2 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,8 @@ static void update_unchanged_dev_desc(struct usb_device_descriptor *new, 
		new->idProduct = idProduct;

	if (bcdDevice)

		new->bcdDevice = bcdDevice;

	else

		new->bcdDevice = cpu_to_le16(get_default_bcdDevice());

	if (iSerialNumber)

		new->iSerialNumber = iSerialNumber;

	if (iManufacturer)

CRA Git | Maintained and supported by SUSTech CRA and CCSE