media: uvc: simplify uvc_enpoint_max_bpi
Subsystems (2)
PATCH 1/2 media: uvc: simplify uvc_enpoint_max_bpi
The case USB_SPEED_WIRELESS and the default one were doing the same.
Also, make always use of usb_endpoint_maxp_mult, as it should have a sane value, even for LOW speed and WIRELESS.
--- drivers/media/usb/uvc/uvc_video.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/media/usb/uvc/uvc_video.c +1 -8
@@ -1760,21 +1760,14 @@ static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep) {u16 psize; -u16 mult;switch (dev->speed) {case USB_SPEED_SUPER :case USB_SPEED_SUPER_PLUS :return le16_to_cpu (ep->ss_ep_comp.wBytesPerInterval); -case USB_SPEED_HIGH : - psize =usb_endpoint_maxp (&ep->desc); - mult =usb_endpoint_maxp_mult (&ep->desc); -return psize * mult; -case USB_SPEED_WIRELESS : - psize =usb_endpoint_maxp (&ep->desc); -return psize;default : psize =usb_endpoint_maxp (&ep->desc); + psize *=usb_endpoint_maxp_mult (&ep->desc);return psize; } }
Signature · 1 line
2.35.1.1094.g7c7d902a7c-goog
PATCH 2/2 media: uvc: Undup use uvv-endpoint_max_bpi code
Replace manual decoding of psize in uvc_parse_streaming(), with the code from uvc_endpoint_max_bpi(). It also handles usb3 devices.
--- drivers/media/usb/uvc/uvc_driver.c | 4 +--- drivers/media/usb/uvc/uvc_video.c | 3 +-- drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/media/usb/uvc/uvc_driver.c +1 -3
@@ -1009,9 +1009,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, streaming->header.bEndpointAddress);if (ep ==NULL )continue ; - - psize =le16_to_cpu (ep->desc.wMaxPacketSize); - psize = (psize &0x07ff ) * (1 + ((psize >>11 ) &3 )); + psize =uvc_endpoint_max_bpi (dev->udev, ep);if (psize > streaming->maxpsize) streaming->maxpsize = psize; }
drivers/media/usb/uvc/uvc_video.c +1 -2
@@ -1756,8 +1756,7 @@ static void uvc_video_stop_transfer(struct uvc_streaming *stream,/* * Compute the maximum number of bytes per interval for an endpoint. */ -static unsigned int uvc_endpoint_max_bpi (struct usb_device *dev, -struct usb_host_endpoint *ep) +u16 uvc_endpoint_max_bpi (struct usb_device *dev,struct usb_host_endpoint *ep) {u16 psize;
drivers/media/usb/uvc/uvcvideo.h +1 -0
@@ -911,6 +911,7 @@ void uvc_simplify_fraction(u32 *numerator, u32 *denominator,u32 uvc_fraction_to_interval (u32 numerator,u32 denominator);struct usb_host_endpoint *uvc_find_endpoint (struct usb_host_interface *alts,u8 epaddr); +u16 uvc_endpoint_max_bpi (struct usb_device *dev,struct usb_host_endpoint *ep);/* Quirks support */ void uvc_video_decode_isight(struct uvc_urb *uvc_urb,
Signature · 1 line
2.35.1.1094.g7c7d902a7c-goog
Re: [PATCH 2/2] media: uvc: Undup use uvv-endpoint_max_bpi code
Hi Ricardo,
Thank you for the patch.
And here the subject line should mention uvc_endpoint_max_bpi() :-) While at it, I'll replace "uvc" with "uvcvideo".
Quoted 2 lines · Ricardo Ribalda
Replace manual decoding of psize in
uvc_parse_streaming(), with the code fromuvc_endpoint_max_bpi(). It also handles usb3 devices.
Quoted 48 lines
Signed-off-by Ricardo Ribalda <[email protected]>--- drivers/media/usb/uvc/uvc_driver.c | 4 +--- drivers/media/usb/uvc/uvc_video.c | 3 +-- drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 3 insertions(+), 5 deletions(-)drivers/media/usb/uvc/uvc_driver.c +1
-3@@ -1009,9 +1009,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, streaming->header.bEndpointAddress);if (ep ==NULL )continue ; - - psize =le16_to_cpu (ep->desc.wMaxPacketSize); - psize = (psize &0x07ff ) * (1 + ((psize >>11 ) &3 )); + psize =uvc_endpoint_max_bpi (dev->udev, ep);if (psize > streaming->maxpsize) streaming->maxpsize = psize; }drivers/media/usb/uvc/uvc_video.c +1
-2@@ -1756,8 +1756,7 @@ static void uvc_video_stop_transfer(struct uvc_streaming *stream,/* * Compute the maximum number of bytes per interval for an endpoint. */ -static unsigned int uvc_endpoint_max_bpi (struct usb_device *dev, -struct usb_host_endpoint *ep) +u16 uvc_endpoint_max_bpi (struct usb_device *dev,struct usb_host_endpoint *ep) {u16 psize;drivers/media/usb/uvc/uvcvideo.h +1
-0@@ -911,6 +911,7 @@ void uvc_simplify_fraction(u32 *numerator, u32 *denominator,u32 uvc_fraction_to_interval (u32 numerator,u32 denominator);struct usb_host_endpoint *uvc_find_endpoint (struct usb_host_interface *alts,u8 epaddr); +u16 uvc_endpoint_max_bpi (struct usb_device *dev,struct usb_host_endpoint *ep);/* Quirks support */ void uvc_video_decode_isight(struct uvc_urb *uvc_urb,
Signature · 3 lines
Regards, Laurent Pinchart
Hi Ricardo,
Thank you for the patch.
I think you meant uvc_endpoint_max_bpi() in the subject line.
Quoted 4 lines · Ricardo Ribalda
The case
USB_SPEED_WIRELESSand the default one were doing the same.Also, make always use of
usb_endpoint_maxp_mult, as it should have a sane value, even for LOW speed and WIRELESS.
I always fear regressions with this kind of patch, but I have no reason to think there's a specific issue, so
Quoted 32 lines
Signed-off-by Ricardo Ribalda <[email protected]>--- drivers/media/usb/uvc/uvc_video.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)drivers/media/usb/uvc/uvc_video.c +1
-8@@ -1760,21 +1760,14 @@ static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep) {u16 psize; -u16 mult;switch (dev->speed) {case USB_SPEED_SUPER :case USB_SPEED_SUPER_PLUS :return le16_to_cpu (ep->ss_ep_comp.wBytesPerInterval); -case USB_SPEED_HIGH : - psize =usb_endpoint_maxp (&ep->desc); - mult =usb_endpoint_maxp_mult (&ep->desc); -return psize * mult; -case USB_SPEED_WIRELESS : - psize =usb_endpoint_maxp (&ep->desc); -return psize;default : psize =usb_endpoint_maxp (&ep->desc); + psize *=usb_endpoint_maxp_mult (&ep->desc);return psize; } }
Signature · 3 lines
Regards, Laurent Pinchart