mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

usb: gadget: uvc: Copy XU descriptors during .bind() 

Now that extension unit support is available through configfs we need
to copy the descriptors for the XUs during uvc_function_bind() so that
they're exposed to the usb subsystem.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Link: https://lore.kernel.org/r/20230206161802.892954-5-dan.scally@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daniel Scally 2023-02-06 16:17:55 +00:00 committed by Greg Kroah-Hartman
parent 0525210c98
commit a728945269
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/usb/gadget/function/f_uvc.c
View File

@ -478,6 +478,25 @@ uvc_register_video(struct uvc_device *uvc)
} \
} while (0)
#define UVC_COPY_XU_DESCRIPTOR(mem, dst, desc) \
do { \
*(dst)++ = mem; \
memcpy(mem, desc, 22); /* bLength to bNrInPins */ \
mem += 22; \
\
memcpy(mem, (desc)->baSourceID, (desc)->bNrInPins); \
mem += (desc)->bNrInPins; \
\
memcpy(mem, &(desc)->bControlSize, 1); \
mem++; \
\
memcpy(mem, (desc)->bmControls, (desc)->bControlSize); \
mem += (desc)->bControlSize; \
\
memcpy(mem, &(desc)->iExtension, 1); \
mem++; \
} while (0)
static struct usb_descriptor_header **
uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
{
@ -489,6 +508,7 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
const struct usb_descriptor_header * const *src;
struct usb_descriptor_header **dst;
struct usb_descriptor_header **hdr;
struct uvcg_extension *xu;
unsigned int control_size;
unsigned int streaming_size;
unsigned int n_desc;
@ -556,6 +576,13 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
bytes += (*src)->bLength;
n_desc++;
}
list_for_each_entry(xu, uvc->desc.extension_units, list) {
control_size += xu->desc.bLength;
bytes += xu->desc.bLength;
n_desc++;
}
for (src = (const struct usb_descriptor_header **)uvc_streaming_cls;
*src; ++src) {
streaming_size += (*src)->bLength;
@ -582,6 +609,10 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
uvc_control_header = mem;
UVC_COPY_DESCRIPTORS(mem, dst,
(const struct usb_descriptor_header **)uvc_control_desc);
list_for_each_entry(xu, uvc->desc.extension_units, list)
UVC_COPY_XU_DESCRIPTOR(mem, dst, &xu->desc);
uvc_control_header->wTotalLength = cpu_to_le16(control_size);
uvc_control_header->bInCollection = 1;
uvc_control_header->baInterfaceNr[0] = uvc->streaming_intf;
@ -1025,6 +1056,8 @@ static struct usb_function *uvc_alloc(struct usb_function_instance *fi)
return ERR_PTR(-EBUSY);
}
uvc->desc.extension_units = &opts->extension_units;
++opts->refcnt;
mutex_unlock(&opts->lock);

1
drivers/usb/gadget/function/uvc.h
View File

@ -143,6 +143,7 @@ struct uvc_device {
const struct uvc_descriptor_header * const *fs_streaming;
const struct uvc_descriptor_header * const *hs_streaming;
const struct uvc_descriptor_header * const *ss_streaming;
struct list_head *extension_units;
} desc;
unsigned int control_intf;