2022-08-08 13:49:42

by Ricardo Ribalda

[permalink] [raw]
Subject: [PATCH] media: uvcvideo: Fix InterfaceProtocol for Quanta camera

The device is using a different InterfaceProtocol than the one set in
the original quirk.

Fixes: 95f03d973478 ("media: uvcvideo: Limit power line control for Quanta cameras")
Signed-off-by: Ricardo Ribalda <[email protected]>
---

This was fixed on the last version of the patchset. Unfortunately I did
checked that it was the version merged :(.

It is too late to land it in this version?


drivers/media/usb/uvc/uvc_driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 9c05776f11d1..6556158a8888 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2740,7 +2740,7 @@ static const struct usb_device_id uvc_ids[] = {
.idProduct = 0x4034,
.bInterfaceClass = USB_CLASS_VIDEO,
.bInterfaceSubClass = 1,
- .bInterfaceProtocol = 0,
+ .bInterfaceProtocol = 1,
.driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
/* LogiLink Wireless Webcam */
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
--
2.37.1.559.g78731f0fdb-goog


2022-08-22 11:30:43

by Ricardo Ribalda

[permalink] [raw]
Subject: Re: [PATCH] media: uvcvideo: Fix InterfaceProtocol for Quanta camera

Hi

Friendly ping on text-mode with the correct account ;)

Regards!

On Mon, 8 Aug 2022 at 15:41, Ricardo Ribalda <[email protected]> wrote:
>
> The device is using a different InterfaceProtocol than the one set in
> the original quirk.
>
> Fixes: 95f03d973478 ("media: uvcvideo: Limit power line control for Quanta cameras")
> Signed-off-by: Ricardo Ribalda <[email protected]>
> ---
>
> This was fixed on the last version of the patchset. Unfortunately I did
> checked that it was the version merged :(.
>
> It is too late to land it in this version?
>
>
> drivers/media/usb/uvc/uvc_driver.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index 9c05776f11d1..6556158a8888 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -2740,7 +2740,7 @@ static const struct usb_device_id uvc_ids[] = {
> .idProduct = 0x4034,
> .bInterfaceClass = USB_CLASS_VIDEO,
> .bInterfaceSubClass = 1,
> - .bInterfaceProtocol = 0,
> + .bInterfaceProtocol = 1,
> .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
> /* LogiLink Wireless Webcam */
> { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
> --
> 2.37.1.559.g78731f0fdb-goog
>


--
Ricardo Ribalda

2022-08-22 13:08:49

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] media: uvcvideo: Fix InterfaceProtocol for Quanta camera

Hi Ricardo,

Thank you for the patch.

On Mon, Aug 08, 2022 at 03:41:06PM +0200, Ricardo Ribalda wrote:
> The device is using a different InterfaceProtocol than the one set in
> the original quirk.
>
> Fixes: 95f03d973478 ("media: uvcvideo: Limit power line control for Quanta cameras")
> Signed-off-by: Ricardo Ribalda <[email protected]>
> ---
>
> This was fixed on the last version of the patchset. Unfortunately I did
> checked that it was the version merged :(.

Oops :-(

> It is too late to land it in this version?

I think it can be considered as a v6.0 fix, yes.

> drivers/media/usb/uvc/uvc_driver.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index 9c05776f11d1..6556158a8888 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -2740,7 +2740,7 @@ static const struct usb_device_id uvc_ids[] = {
> .idProduct = 0x4034,
> .bInterfaceClass = USB_CLASS_VIDEO,
> .bInterfaceSubClass = 1,
> - .bInterfaceProtocol = 0,
> + .bInterfaceProtocol = 1,

Should we use UVC_PC_PROTOCOL_15 here ?

Reviewed-by: Laurent Pinchart <[email protected]>

> .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
> /* LogiLink Wireless Webcam */
> { .match_flags = USB_DEVICE_ID_MATCH_DEVICE

--
Regards,

Laurent Pinchart

2022-08-22 13:13:54

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] media: uvcvideo: Fix InterfaceProtocol for Quanta camera

On Mon, Aug 22, 2022 at 04:02:55PM +0300, Laurent Pinchart wrote:
> Hi Ricardo,
>
> Thank you for the patch.
>
> On Mon, Aug 08, 2022 at 03:41:06PM +0200, Ricardo Ribalda wrote:
> > The device is using a different InterfaceProtocol than the one set in
> > the original quirk.

Also, I would mention that the device implements UVC 1.5:

The Quanta 0408:4034 camera implements UVC 1.5, and thus sets
bInterfaceProtocol to UVC_PC_PROTOCOL_15. Commit 95f03d973478 ("media:
uvcvideo: Limit power line control for Quanta cameras") added a quirk
for the device that incorrectly specified the UVC 1.0 protocol,
rendering the quirk inoperative. Fix it.

As this is a v6.0 fix, would you mind submitting a v2 with these changes
? Mauro could then pick it up directly.

> > Fixes: 95f03d973478 ("media: uvcvideo: Limit power line control for Quanta cameras")
> > Signed-off-by: Ricardo Ribalda <[email protected]>
> > ---
> >
> > This was fixed on the last version of the patchset. Unfortunately I did
> > checked that it was the version merged :(.
>
> Oops :-(
>
> > It is too late to land it in this version?
>
> I think it can be considered as a v6.0 fix, yes.
>
> > drivers/media/usb/uvc/uvc_driver.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> > index 9c05776f11d1..6556158a8888 100644
> > --- a/drivers/media/usb/uvc/uvc_driver.c
> > +++ b/drivers/media/usb/uvc/uvc_driver.c
> > @@ -2740,7 +2740,7 @@ static const struct usb_device_id uvc_ids[] = {
> > .idProduct = 0x4034,
> > .bInterfaceClass = USB_CLASS_VIDEO,
> > .bInterfaceSubClass = 1,
> > - .bInterfaceProtocol = 0,
> > + .bInterfaceProtocol = 1,
>
> Should we use UVC_PC_PROTOCOL_15 here ?
>
> Reviewed-by: Laurent Pinchart <[email protected]>
>
> > .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
> > /* LogiLink Wireless Webcam */
> > { .match_flags = USB_DEVICE_ID_MATCH_DEVICE

--
Regards,

Laurent Pinchart

2022-08-22 14:28:41

by Ricardo Ribalda

[permalink] [raw]
Subject: Re: [PATCH] media: uvcvideo: Fix InterfaceProtocol for Quanta camera

On Mon, 22 Aug 2022 at 15:07, Laurent Pinchart
<[email protected]> wrote:

>
> As this is a v6.0 fix, would you mind submitting a v2 with these changes
> ? Mauro could then pick it up directly.

Done. https://lore.kernel.org/linux-media/[email protected]/T/#u

Thanks :)


--
Ricardo Ribalda