From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v5 09/12] media: uvcvideo: Implement UVC_QUIRK_PRIVACY_DURING_STREAM
Date: Mon, 21 Dec 2020 17:48:16 +0100 [thread overview]
Message-ID: <20201221164819.792019-10-ribalda@chromium.org> (raw)
In-Reply-To: <20201221164819.792019-1-ribalda@chromium.org>
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>
---
drivers/media/usb/uvc/uvc_driver.c | 57 ++++++++++++++++++++++++++++--
drivers/media/usb/uvc/uvc_queue.c | 3 ++
drivers/media/usb/uvc/uvcvideo.h | 4 +++
3 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 72516101fdd0..7af37d4bd60a 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>
@@ -1472,6 +1473,17 @@ static int uvc_parse_control(struct uvc_device *dev)
/* -----------------------------------------------------------------------------
* Privacy GPIO
*/
+static bool uvc_gpio_is_streaming(struct uvc_device *dev)
+{
+ struct uvc_streaming *streaming;
+
+ list_for_each_entry(streaming, &dev->streams, list) {
+ if (uvc_queue_streaming(&streaming->queue))
+ return true;
+ }
+
+ return false;
+}
static u8 uvc_gpio_update_value(struct uvc_device *dev,
@@ -1499,7 +1511,12 @@ static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *entity,
if (cs != UVC_CT_PRIVACY_CONTROL || size < 1)
return -EINVAL;
+ if ((dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM) &&
+ !uvc_gpio_is_streaming(dev))
+ return -EBUSY;
+
*(uint8_t *)data = uvc_gpio_update_value(dev, entity);
+
return 0;
}
@@ -1528,19 +1545,50 @@ static struct uvc_entity *uvc_gpio_find_entity(struct uvc_device *dev)
return NULL;
}
-static irqreturn_t uvc_gpio_irq(int irq, void *data)
+void uvc_privacy_gpio_event(struct uvc_device *dev)
{
- struct uvc_device *dev = data;
struct uvc_entity *unit;
+
unit = uvc_gpio_find_entity(dev);
if (!unit)
- return IRQ_HANDLED;
+ return;
uvc_gpio_update_value(dev, unit);
+}
+
+static irqreturn_t uvc_gpio_irq(int irq, void *data)
+{
+ struct uvc_device *dev = data;
+
+ /* Ignore privacy events during streamoff */
+ if (dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)
+ if (!uvc_gpio_is_streaming(dev))
+ return IRQ_HANDLED;
+
+ uvc_privacy_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;
@@ -1577,6 +1625,9 @@ static int uvc_gpio_parse(struct uvc_device *dev)
list_add_tail(&unit->list, &dev->entities);
+ if (dmi_check_system(privacy_valid_during_streamon))
+ dev->quirks |= UVC_QUIRK_PRIVACY_DURING_STREAM;
+
return 0;
}
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index cd60c6c1749e..e800d491303f 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -337,9 +337,12 @@ int uvc_dequeue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf,
int uvc_queue_streamon(struct uvc_video_queue *queue, enum v4l2_buf_type type)
{
int ret;
+ struct uvc_streaming *stream = uvc_queue_to_stream(queue);
mutex_lock(&queue->mutex);
ret = vb2_streamon(&queue->queue, type);
+ if (stream->dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)
+ uvc_privacy_gpio_event(stream->dev);
mutex_unlock(&queue->mutex);
return ret;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 079a407ebba5..32c1ba246d97 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
@@ -826,6 +827,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_privacy_gpio_event(struct uvc_device *dev);
+
/* Video */
int uvc_video_init(struct uvc_streaming *stream);
int uvc_video_suspend(struct uvc_streaming *stream);
--
2.29.2.684.gfbc64c5ab5-goog
next prev parent reply other threads:[~2020-12-21 18:44 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 16:48 [PATCH v5 00/12]Show privacy_gpio as a v4l2_ctrl Ricardo Ribalda
2020-12-21 16:48 ` [PATCH v5 01/12] media: uvcvideo: Fix race condition handling events Ricardo Ribalda
2020-12-22 8:04 ` Laurent Pinchart
2020-12-21 16:48 ` [PATCH v5 02/12] media: uvcvideo: Allow more that one asyc_ctrl Ricardo Ribalda
2020-12-22 8:07 ` Laurent Pinchart
2020-12-21 16:48 ` [PATCH v5 03/12] media: uvcvideo: Move guid to entity Ricardo Ribalda
2020-12-21 16:48 ` [PATCH v5 04/12] media: uvcvideo: Allow extra entities Ricardo Ribalda
2020-12-21 18:17 ` Ricardo Ribalda
2020-12-21 16:48 ` [PATCH v5 05/12] media: uvcvideo: Allow entities with no pads Ricardo Ribalda
2020-12-21 16:48 ` [PATCH v5 06/12] media: uvcvideo: Allow entity-defined get_info and get_cur Ricardo Ribalda
2020-12-21 16:48 ` [PATCH v5 07/12] media: uvcvideo: Implement UVC_EXT_GPIO_UNIT Ricardo Ribalda
2020-12-22 8:33 ` Laurent Pinchart
2020-12-22 8:37 ` Laurent Pinchart
2020-12-22 18:36 ` Ricardo Ribalda
2020-12-23 7:54 ` Laurent Pinchart
2020-12-21 16:48 ` [PATCH v5 08/12] media: uvcvideo: Add Privacy control based on EXT_GPIO Ricardo Ribalda
2020-12-21 16:48 ` Ricardo Ribalda [this message]
2020-12-22 10:29 ` [PATCH v5 09/12] media: uvcvideo: Implement UVC_QUIRK_PRIVACY_DURING_STREAM Laurent Pinchart
2020-12-22 20:04 ` Ricardo Ribalda
2020-12-23 8:04 ` Laurent Pinchart
2020-12-23 8:31 ` Ricardo Ribalda
2020-12-23 12:55 ` Ricardo Ribalda
2021-04-20 4:54 ` Tomasz Figa
2022-02-04 5:59 ` Tomasz Figa
2020-12-21 16:48 ` [PATCH v5 10/12] media: uvcvideo: Use dev_ printk aliases Ricardo Ribalda
2020-12-21 16:48 ` [PATCH v5 11/12] media: uvcvideo: New macro uvc_trace_cont Ricardo Ribalda
2020-12-21 16:48 ` [PATCH v5 12/12] media: uvcvideo: use dev_dbg() for uvc_trace() Ricardo Ribalda
2020-12-22 8:51 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201221164819.792019-10-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).