Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: uvcvideo: Quirk for autosuspend in Logitech B910 and C910

Logitech B910 and C910 firmware are unable to recover from a USB
autosuspend. When it resumes, the device is in a state where it only
produces invalid frames. Eg:

$ echo 0xFFFF > /sys/module/uvcvideo/parameters/trace # enable verbose log
$ yavta -c1 -n1 --file='frame#.jpg' --format MJPEG --size=1920x1080 /dev/video1
[350438.435219] uvcvideo: uvc_v4l2_open
[350438.529794] uvcvideo: Resuming interface 2
[350438.529801] uvcvideo: Resuming interface 3
[350438.529991] uvcvideo: Trying format 0x47504a4d (MJPG): 1920x1080.
[350438.529996] uvcvideo: Using default frame interval 33333.3 us (30.0 fps).
[350438.551496] uvcvideo: uvc_v4l2_mmap
[350438.555890] uvcvideo: Device requested 3060 B/frame bandwidth.
[350438.555896] uvcvideo: Selecting alternate setting 11 (3060 B/frame bandwidth).
[350438.556362] uvcvideo: Allocated 5 URB buffers of 32x3060 bytes each.
[350439.316468] uvcvideo: Marking buffer as bad (error bit set).
[350439.316475] uvcvideo: Frame complete (EOF found).
[350439.316477] uvcvideo: EOF in empty payload.
[350439.316484] uvcvideo: frame 1 stats: 149/261/417 packets, 1/149/417 pts (early initial), 416/417 scr, last pts/stc/sof 2976325734/2978107243/249
[350439.384510] uvcvideo: Marking buffer as bad (error bit set).
[350439.384516] uvcvideo: Frame complete (EOF found).
[350439.384518] uvcvideo: EOF in empty payload.
[350439.384525] uvcvideo: frame 2 stats: 265/379/533 packets, 1/265/533 pts (early initial), 532/533 scr, last pts/stc/sof 2979524454/2981305193/316
[350439.448472] uvcvideo: Marking buffer as bad (error bit set).
[350439.448478] uvcvideo: Frame complete (EOF found).
[350439.448480] uvcvideo: EOF in empty payload.
[350439.448487] uvcvideo: frame 3 stats: 265/377/533 packets, 1/265/533 pts (early initial), 532/533 scr, last pts/stc/sof 2982723174/2984503144/382
...(loop)...

The devices can leave this invalid state if the alternate setting of
the streaming interface is toggled.

This patch adds a quirk for this device so it can be autosuspended
properly.

lsusb -v:
Bus 001 Device 049: ID 046d:0821 Logitech, Inc. HD Webcam C910
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 239 Miscellaneous Device
bDeviceSubClass 2
bDeviceProtocol 1 Interface Association
bMaxPacketSize0 64
idVendor 0x046d Logitech, Inc.
idProduct 0x0821 HD Webcam C910
bcdDevice 0.10
iManufacturer 0
iProduct 0
iSerial 1 390022B0
bNumConfigurations 1

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

authored by

Ricardo Ribalda and committed by
Laurent Pinchart
136effa7 619d9b71

+30
+18
drivers/media/usb/uvc/uvc_driver.c
··· 2474 2474 .bInterfaceSubClass = 1, 2475 2475 .bInterfaceProtocol = 0, 2476 2476 .driver_info = (kernel_ulong_t)&uvc_quirk_probe_minmax }, 2477 + /* Logitech, Webcam C910 */ 2478 + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE 2479 + | USB_DEVICE_ID_MATCH_INT_INFO, 2480 + .idVendor = 0x046d, 2481 + .idProduct = 0x0821, 2482 + .bInterfaceClass = USB_CLASS_VIDEO, 2483 + .bInterfaceSubClass = 1, 2484 + .bInterfaceProtocol = 0, 2485 + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, 2486 + /* Logitech, Webcam B910 */ 2487 + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE 2488 + | USB_DEVICE_ID_MATCH_INT_INFO, 2489 + .idVendor = 0x046d, 2490 + .idProduct = 0x0823, 2491 + .bInterfaceClass = USB_CLASS_VIDEO, 2492 + .bInterfaceSubClass = 1, 2493 + .bInterfaceProtocol = 0, 2494 + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, 2477 2495 /* Logitech Quickcam Fusion */ 2478 2496 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE 2479 2497 | USB_DEVICE_ID_MATCH_INT_INFO,
+11
drivers/media/usb/uvc/uvc_video.c
··· 1969 1969 "Selecting alternate setting %u (%u B/frame bandwidth)\n", 1970 1970 altsetting, best_psize); 1971 1971 1972 + /* 1973 + * Some devices, namely the Logitech C910 and B910, are unable 1974 + * to recover from a USB autosuspend, unless the alternate 1975 + * setting of the streaming interface is toggled. 1976 + */ 1977 + if (stream->dev->quirks & UVC_QUIRK_WAKE_AUTOSUSPEND) { 1978 + usb_set_interface(stream->dev->udev, intfnum, 1979 + altsetting); 1980 + usb_set_interface(stream->dev->udev, intfnum, 0); 1981 + } 1982 + 1972 1983 ret = usb_set_interface(stream->dev->udev, intfnum, altsetting); 1973 1984 if (ret < 0) 1974 1985 return ret;
+1
drivers/media/usb/uvc/uvcvideo.h
··· 72 72 #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400 73 73 #define UVC_QUIRK_FORCE_Y8 0x00000800 74 74 #define UVC_QUIRK_FORCE_BPP 0x00001000 75 + #define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000 75 76 76 77 /* Format flags */ 77 78 #define UVC_FMT_FLAG_COMPRESSED 0x00000001