518c3f98e5
commit 72ee48ee8925446eaeda8e4ef3f2eb16b4a93d2a upstream. Currently, the UVC function is activated when open on the corresponding v4l2 device is called. On another open the activation of the function fails since the deactivation counter in `usb_function_activate` equals 0. However the error is not returned to userspace since the open of the v4l2 device is successful. On a close the function is deactivated (since deactivation counter still equals 0) and the video is disabled in `uvc_v4l2_release`, although the UVC application potentially is streaming. Move activation of UVC function to subscription on UVC_EVENT_SETUP because there we can guarantee for a userspace application utilizing UVC. Block subscription on UVC_EVENT_SETUP while another application already is subscribed to it, indicated by `bool func_connected` in `struct uvc_device`. Extend the `struct uvc_file_handle` with member `bool is_uvc_app_handle` to tag it as the handle used by the userspace UVC application. With this a process is able to check capabilities of the v4l2 device without deactivating the function for the actual UVC application. Reviewed-By: Michael Tretter <m.tretter@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Thomas Haemmerle <thomas.haemmerle@wolfvision.net> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Acked-by: Felipe Balbi <balbi@kernel.org> Link: https://lore.kernel.org/r/20211003201355.24081-1-m.grzeschik@pengutronix.de Cc: Dan Vacura <W36195@motorola.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
168 lines
4.1 KiB
C
168 lines
4.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* uvc_gadget.h -- USB Video Class Gadget driver
|
|
*
|
|
* Copyright (C) 2009-2010
|
|
* Laurent Pinchart (laurent.pinchart@ideasonboard.com)
|
|
*/
|
|
|
|
#ifndef _UVC_GADGET_H_
|
|
#define _UVC_GADGET_H_
|
|
|
|
#include <linux/list.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/usb/composite.h>
|
|
#include <linux/videodev2.h>
|
|
|
|
#include <media/v4l2-device.h>
|
|
#include <media/v4l2-dev.h>
|
|
#include <media/v4l2-fh.h>
|
|
|
|
#include "uvc_queue.h"
|
|
|
|
struct usb_ep;
|
|
struct usb_request;
|
|
struct uvc_descriptor_header;
|
|
struct uvc_device;
|
|
|
|
/* ------------------------------------------------------------------------
|
|
* Debugging, printing and logging
|
|
*/
|
|
|
|
#define UVC_TRACE_PROBE (1 << 0)
|
|
#define UVC_TRACE_DESCR (1 << 1)
|
|
#define UVC_TRACE_CONTROL (1 << 2)
|
|
#define UVC_TRACE_FORMAT (1 << 3)
|
|
#define UVC_TRACE_CAPTURE (1 << 4)
|
|
#define UVC_TRACE_CALLS (1 << 5)
|
|
#define UVC_TRACE_IOCTL (1 << 6)
|
|
#define UVC_TRACE_FRAME (1 << 7)
|
|
#define UVC_TRACE_SUSPEND (1 << 8)
|
|
#define UVC_TRACE_STATUS (1 << 9)
|
|
|
|
#define UVC_WARN_MINMAX 0
|
|
#define UVC_WARN_PROBE_DEF 1
|
|
|
|
extern unsigned int uvc_gadget_trace_param;
|
|
|
|
#define uvc_trace(flag, msg...) \
|
|
do { \
|
|
if (uvc_gadget_trace_param & flag) \
|
|
printk(KERN_DEBUG "uvcvideo: " msg); \
|
|
} while (0)
|
|
|
|
#define uvcg_dbg(f, fmt, args...) \
|
|
dev_dbg(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
|
|
#define uvcg_info(f, fmt, args...) \
|
|
dev_info(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
|
|
#define uvcg_warn(f, fmt, args...) \
|
|
dev_warn(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
|
|
#define uvcg_err(f, fmt, args...) \
|
|
dev_err(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
|
|
|
|
/* ------------------------------------------------------------------------
|
|
* Driver specific constants
|
|
*/
|
|
|
|
#define UVC_NUM_REQUESTS 4
|
|
#define UVC_MAX_REQUEST_SIZE 64
|
|
#define UVC_MAX_EVENTS 4
|
|
|
|
/* ------------------------------------------------------------------------
|
|
* Structures
|
|
*/
|
|
|
|
struct uvc_video {
|
|
struct uvc_device *uvc;
|
|
struct usb_ep *ep;
|
|
|
|
struct work_struct pump;
|
|
|
|
/* Frame parameters */
|
|
u8 bpp;
|
|
u32 fcc;
|
|
unsigned int width;
|
|
unsigned int height;
|
|
unsigned int imagesize;
|
|
struct mutex mutex; /* protects frame parameters */
|
|
|
|
/* Requests */
|
|
unsigned int req_size;
|
|
struct usb_request *req[UVC_NUM_REQUESTS];
|
|
__u8 *req_buffer[UVC_NUM_REQUESTS];
|
|
struct list_head req_free;
|
|
spinlock_t req_lock;
|
|
|
|
void (*encode) (struct usb_request *req, struct uvc_video *video,
|
|
struct uvc_buffer *buf);
|
|
|
|
/* Context data used by the completion handler */
|
|
__u32 payload_size;
|
|
__u32 max_payload_size;
|
|
|
|
struct uvc_video_queue queue;
|
|
unsigned int fid;
|
|
};
|
|
|
|
enum uvc_state {
|
|
UVC_STATE_DISCONNECTED,
|
|
UVC_STATE_CONNECTED,
|
|
UVC_STATE_STREAMING,
|
|
};
|
|
|
|
struct uvc_device {
|
|
struct video_device vdev;
|
|
struct v4l2_device v4l2_dev;
|
|
enum uvc_state state;
|
|
struct usb_function func;
|
|
struct uvc_video video;
|
|
bool func_connected;
|
|
|
|
/* Descriptors */
|
|
struct {
|
|
const struct uvc_descriptor_header * const *fs_control;
|
|
const struct uvc_descriptor_header * const *ss_control;
|
|
const struct uvc_descriptor_header * const *fs_streaming;
|
|
const struct uvc_descriptor_header * const *hs_streaming;
|
|
const struct uvc_descriptor_header * const *ss_streaming;
|
|
} desc;
|
|
|
|
unsigned int control_intf;
|
|
struct usb_ep *control_ep;
|
|
struct usb_request *control_req;
|
|
void *control_buf;
|
|
|
|
unsigned int streaming_intf;
|
|
|
|
/* Events */
|
|
unsigned int event_length;
|
|
unsigned int event_setup_out : 1;
|
|
};
|
|
|
|
static inline struct uvc_device *to_uvc(struct usb_function *f)
|
|
{
|
|
return container_of(f, struct uvc_device, func);
|
|
}
|
|
|
|
struct uvc_file_handle {
|
|
struct v4l2_fh vfh;
|
|
struct uvc_video *device;
|
|
bool is_uvc_app_handle;
|
|
};
|
|
|
|
#define to_uvc_file_handle(handle) \
|
|
container_of(handle, struct uvc_file_handle, vfh)
|
|
|
|
/* ------------------------------------------------------------------------
|
|
* Functions
|
|
*/
|
|
|
|
extern void uvc_function_setup_continue(struct uvc_device *uvc);
|
|
extern void uvc_endpoint_stream(struct uvc_device *dev);
|
|
|
|
extern void uvc_function_connect(struct uvc_device *uvc);
|
|
extern void uvc_function_disconnect(struct uvc_device *uvc);
|
|
|
|
#endif /* _UVC_GADGET_H_ */
|