| From 5802d7629b05b28ee9099a9a743eeac74ca90a8d Mon Sep 17 00:00:00 2001 |
| From: Ricardo Ribalda <ribalda@chromium.org> |
| Date: Wed, 23 Dec 2020 14:35:28 +0100 |
| Subject: [PATCH] FROMLIST: media: uvcvideo: Implement |
| UVC_QUIRK_PRIVACY_DURING_STREAM |
| |
| Some devices can only read the privacy_pin if the device is |
| streaming. |
| |
| This patch implement a quirk for such devices, in order to avoid invalid |
| reads and/or spurious events. |
| |
| Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> |
| (am from https://lore.kernel.org/patchwork/patch/1356318/) |
| (also found at https://lore.kernel.org/r/20201223133528.55014-13-ribalda@chromium.org) |
| |
| BUG=b:167994459, b:173778998 |
| TEST=v4l2-ctl -C privacy |
| |
| Change-Id: Icaaed64f39a02893a58918aea1ea10b2689b7577 |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2804463 |
| Reviewed-by: Sean Paul <seanpaul@chromium.org> |
| Reviewed-by: Tomasz Figa <tfiga@chromium.org> |
| Tested-by: Ricardo Ribalda <ribalda@chromium.org> |
| Commit-Queue: Ricardo Ribalda <ribalda@chromium.org> |
| --- |
| drivers/media/usb/uvc/uvc_driver.c | 55 +++++++++++++++++++++++++++--- |
| drivers/media/usb/uvc/uvc_video.c | 27 +++++++++++++++ |
| drivers/media/usb/uvc/uvcvideo.h | 7 ++++ |
| 3 files changed, 84 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c |
| index 2f4dfdf9abfa..d0f2fcaa7b29 100644 |
| --- a/drivers/media/usb/uvc/uvc_driver.c |
| +++ b/drivers/media/usb/uvc/uvc_driver.c |
| @@ -7,6 +7,7 @@ |
| */ |
| |
| #include <linux/atomic.h> |
| +#include <linux/dmi.h> |
| #include <linux/gpio/consumer.h> |
| #include <linux/kernel.h> |
| #include <linux/list.h> |
| @@ -1468,7 +1469,7 @@ static int uvc_parse_control(struct uvc_device *dev) |
| * Privacy GPIO |
| */ |
| |
| -static void uvc_gpio_event(struct uvc_device *dev) |
| +void uvc_gpio_event(struct uvc_device *dev) |
| { |
| struct uvc_entity *unit = dev->gpio_unit; |
| struct uvc_video_chain *chain; |
| @@ -1477,19 +1478,29 @@ static void uvc_gpio_event(struct uvc_device *dev) |
| if (!unit) |
| return; |
| |
| + mutex_lock(&unit->gpio.event_mutex); |
| + |
| new_val = gpiod_get_value_cansleep(unit->gpio.gpio_privacy); |
| + if (unit->gpio.last_event_val != new_val) { |
| + /* GPIO entities are always on the first chain. */ |
| + chain = list_first_entry(&dev->chains, |
| + struct uvc_video_chain, list); |
| + uvc_ctrl_status_event(chain, unit->controls, &new_val); |
| + } |
| + unit->gpio.last_event_val = new_val; |
| |
| - /* GPIO entities are always on the first chain. */ |
| - chain = list_first_entry(&dev->chains, struct uvc_video_chain, list); |
| - uvc_ctrl_status_event(chain, unit->controls, &new_val); |
| + mutex_unlock(&unit->gpio.event_mutex); |
| } |
| |
| static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *entity, |
| u8 cs, void *data, u16 size) |
| { |
| - if (cs != UVC_CT_PRIVACY_CONTROL || size < 1) |
| + if (cs != UVC_CT_PRIVACY_CONTROL || size < 1 || !dev->gpio_unit) |
| return -EINVAL; |
| |
| + if (!dev->gpio_unit->gpio.is_gpio_ready) |
| + return -EBUSY; |
| + |
| *(u8 *)data = gpiod_get_value_cansleep(entity->gpio.gpio_privacy); |
| |
| return 0; |
| @@ -1509,10 +1520,31 @@ static irqreturn_t uvc_gpio_irq(int irq, void *data) |
| { |
| struct uvc_device *dev = data; |
| |
| + if (!dev->gpio_unit->gpio.is_gpio_ready) |
| + return IRQ_HANDLED; |
| + |
| uvc_gpio_event(dev); |
| return IRQ_HANDLED; |
| } |
| |
| +static const struct dmi_system_id privacy_valid_during_streamon[] = { |
| + { |
| + .ident = "HP Elite c1030 Chromebook", |
| + .matches = { |
| + DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| + DMI_MATCH(DMI_PRODUCT_NAME, "Jinlon"), |
| + }, |
| + }, |
| + { |
| + .ident = "HP Pro c640 Chromebook", |
| + .matches = { |
| + DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| + DMI_MATCH(DMI_PRODUCT_NAME, "Dratini"), |
| + }, |
| + }, |
| + { } /* terminate list */ |
| +}; |
| + |
| static int uvc_gpio_parse(struct uvc_device *dev) |
| { |
| struct uvc_entity *unit; |
| @@ -1537,6 +1569,7 @@ static int uvc_gpio_parse(struct uvc_device *dev) |
| } |
| |
| unit->gpio.gpio_privacy = gpio_privacy; |
| + unit->gpio.last_event_val = -1; |
| unit->gpio.irq = irq; |
| unit->gpio.bControlSize = 1; |
| unit->gpio.bmControls = (u8 *)unit + sizeof(*unit); |
| @@ -1544,6 +1577,18 @@ static int uvc_gpio_parse(struct uvc_device *dev) |
| unit->get_cur = uvc_gpio_get_cur; |
| unit->get_info = uvc_gpio_get_info; |
| strscpy(unit->name, "GPIO", sizeof(unit->name)); |
| + mutex_init(&unit->gpio.event_mutex); |
| + |
| + /* |
| + * Note: This quirk will not match external UVC cameras, |
| + * as they will not have the corresponding ACPI GPIO entity. |
| + */ |
| + if (dmi_check_system(privacy_valid_during_streamon)) { |
| + dev->quirks |= UVC_QUIRK_PRIVACY_DURING_STREAM; |
| + unit->gpio.is_gpio_ready = false; |
| + } else { |
| + unit->gpio.is_gpio_ready = true; |
| + } |
| |
| list_add_tail(&unit->list, &dev->entities); |
| |
| diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c |
| index a777b389a66e..9eb36a74f163 100644 |
| --- a/drivers/media/usb/uvc/uvc_video.c |
| +++ b/drivers/media/usb/uvc/uvc_video.c |
| @@ -2127,6 +2127,29 @@ int uvc_video_init(struct uvc_streaming *stream) |
| return 0; |
| } |
| |
| +static void uvc_gpio_privacy_quirks(struct uvc_streaming *stream, bool enable) |
| +{ |
| + struct uvc_device *dev = stream->dev; |
| + struct uvc_video_chain *first_chain; |
| + |
| + if (!(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)) |
| + return; |
| + |
| + if (!dev->gpio_unit) |
| + return; |
| + |
| + first_chain = list_first_entry(&dev->chains, |
| + struct uvc_video_chain, list); |
| + /* GPIO entities are always on the first chain. */ |
| + if (stream->chain != first_chain) |
| + return; |
| + |
| + dev->gpio_unit->gpio.is_gpio_ready = enable; |
| + |
| + if (enable) |
| + uvc_gpio_event(stream->dev); |
| +} |
| + |
| int uvc_video_start_streaming(struct uvc_streaming *stream) |
| { |
| int ret; |
| @@ -2144,6 +2167,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) |
| if (ret < 0) |
| goto error_video; |
| |
| + uvc_gpio_privacy_quirks(stream, true); |
| + |
| return 0; |
| |
| error_video: |
| @@ -2156,6 +2181,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) |
| |
| void uvc_video_stop_streaming(struct uvc_streaming *stream) |
| { |
| + uvc_gpio_privacy_quirks(stream, false); |
| + |
| uvc_video_stop_transfer(stream, 1); |
| |
| if (stream->intf->num_altsetting > 1) { |
| diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h |
| index 9a3351de6fc9..9f7e0b70fdeb 100644 |
| --- a/drivers/media/usb/uvc/uvcvideo.h |
| +++ b/drivers/media/usb/uvc/uvcvideo.h |
| @@ -209,6 +209,7 @@ |
| #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400 |
| #define UVC_QUIRK_FORCE_Y8 0x00000800 |
| #define UVC_QUIRK_FORCE_BPP 0x00001000 |
| +#define UVC_QUIRK_PRIVACY_DURING_STREAM 0x00002000 |
| |
| /* Format flags */ |
| #define UVC_FMT_FLAG_COMPRESSED 0x00000001 |
| @@ -367,6 +368,9 @@ struct uvc_entity { |
| u8 *bmControls; |
| struct gpio_desc *gpio_privacy; |
| int irq; |
| + struct mutex event_mutex; |
| + int last_event_val; |
| + bool is_gpio_ready; |
| } gpio; |
| }; |
| |
| @@ -835,6 +839,9 @@ extern const struct v4l2_file_operations uvc_fops; |
| int uvc_mc_register_entities(struct uvc_video_chain *chain); |
| void uvc_mc_cleanup_entity(struct uvc_entity *entity); |
| |
| +/* Privacy gpio */ |
| +void uvc_gpio_event(struct uvc_device *dev); |
| + |
| /* Video */ |
| int uvc_video_init(struct uvc_streaming *stream); |
| int uvc_video_suspend(struct uvc_streaming *stream); |
| -- |
| 2.17.1 |
| |