Commit 46decc82 authored by Linyu Yuan's avatar Linyu Yuan Committed by Greg Kroah-Hartman
Browse files

usb: gadget: unconditionally allocate hs/ss descriptor in bind operation 



Take f_midi_bind() for example,  when composite layer call it, it will
allocate hs descriptor by calling gadget_is_dualspeed() API to check
gadget max support speed capability, but most other gadget function didn't
do like this.

To follow other function drivers, it is safe to remove the check which
mean support all possible link speed by default in function driver.

Similar change apply to midi2 and uvc.

Also in midi and midi2, as there is no descriptor difference between
super speed and super speed plus, follow other gadget function drivers,
do not allocate descriptor for super speed plus, composite layer will
handle it properly.

Signed-off-by: default avatarLinyu Yuan <quic_linyyuan@quicinc.com>
Link: https://lore.kernel.org/r/20230803091053.9714-5-quic_linyyuan@quicinc.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c5b006f

drivers/usb/gadget/function/f_midi.c

+23 −33
Original line number Diff line number Diff line
@@ -1023,15 +1023,12 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f) 
	if (!f->fs_descriptors)

		goto fail_f_midi;



	if (gadget_is_dualspeed(c->cdev->gadget)) {

	bulk_in_desc.wMaxPacketSize = cpu_to_le16(512);

	bulk_out_desc.wMaxPacketSize = cpu_to_le16(512);

	f->hs_descriptors = usb_copy_descriptors(midi_function);

	if (!f->hs_descriptors)

		goto fail_f_midi;

	}



	if (gadget_is_superspeed(c->cdev->gadget)) {

	bulk_in_desc.wMaxPacketSize = cpu_to_le16(1024);

	bulk_out_desc.wMaxPacketSize = cpu_to_le16(1024);

	i = endpoint_descriptor_index;
@@ -1051,13 +1048,6 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f) 
	if (!f->ss_descriptors)

		goto fail_f_midi;



		if (gadget_is_superspeed_plus(c->cdev->gadget)) {

			f->ssp_descriptors = usb_copy_descriptors(midi_function);

			if (!f->ssp_descriptors)

				goto fail_f_midi;

		}

	}



	kfree(midi_function);



	return 0;

drivers/usb/gadget/function/f_midi2.c

+16 −28
Original line number Diff line number Diff line
@@ -1731,7 +1731,6 @@ static int f_midi2_create_usb_configs(struct f_midi2 *midi2, 
		midi1_out_eps = midi2_midi1_ep_out_descs;

		break;

	case USB_SPEED_SUPER:

	case USB_SPEED_SUPER_PLUS:

		midi2_midi1_ep_out_desc.wMaxPacketSize = cpu_to_le16(1024);

		midi2_midi1_ep_in_desc.wMaxPacketSize = cpu_to_le16(1024);

		for (i = 0; i < midi2->num_eps; i++)
@@ -2001,7 +2000,6 @@ static int f_midi2_bind(struct usb_configuration *c, struct usb_function *f) 
	}

	f_midi2_free_usb_configs(&config);



	if (gadget_is_dualspeed(midi2->gadget)) {

	status = f_midi2_create_usb_configs(midi2, &config, USB_SPEED_HIGH);

	if (status < 0)

		goto fail;
@@ -2011,9 +2009,7 @@ static int f_midi2_bind(struct usb_configuration *c, struct usb_function *f) 
		goto fail;

	}

	f_midi2_free_usb_configs(&config);

	}



	if (gadget_is_superspeed(midi2->gadget)) {

	status = f_midi2_create_usb_configs(midi2, &config, USB_SPEED_SUPER);

	if (status < 0)

		goto fail;
@@ -2022,15 +2018,7 @@ static int f_midi2_bind(struct usb_configuration *c, struct usb_function *f) 
		status = -ENOMEM;

		goto fail;

	}

		if (gadget_is_superspeed_plus(midi2->gadget)) {

			f->ssp_descriptors = usb_copy_descriptors(config.list);

			if (!f->ssp_descriptors) {

				status = -ENOMEM;

				goto fail;

			}

		}

	f_midi2_free_usb_configs(&config);

	}



	mutex_unlock(&f_midi2_desc_mutex);

	return 0;

drivers/usb/gadget/function/f_uvc.c

+12 −14
Original line number Diff line number Diff line
@@ -780,22 +780,20 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) 
		f->fs_descriptors = NULL;

		goto error;

	}

	if (gadget_is_dualspeed(cdev->gadget)) {



	f->hs_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_HIGH);

	if (IS_ERR(f->hs_descriptors)) {

		ret = PTR_ERR(f->hs_descriptors);

		f->hs_descriptors = NULL;

		goto error;

	}

	}

	if (gadget_is_superspeed(c->cdev->gadget)) {



	f->ss_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_SUPER);

	if (IS_ERR(f->ss_descriptors)) {

		ret = PTR_ERR(f->ss_descriptors);

		f->ss_descriptors = NULL;

		goto error;

	}

	}



	/* Preallocate control endpoint request. */

	uvc->control_req = usb_ep_alloc_request(cdev->gadget->ep0, GFP_KERNEL);