| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250926-uvc-orientation-v3-8-6dc2fa5b4220@chromium.org>
Date: Fri, 26 Sep 2025 13:11:32 +0000
From: Ricardo Ribalda <ribalda@...omium.org>
To: Hans de Goede <hansg@...nel.org>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Sakari Ailus <sakari.ailus@...ux.intel.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Linus Walleij <linus.walleij@...aro.org>,
Bartosz Golaszewski <brgl@...ev.pl>,
"Rafael J. Wysocki" <rafael@...nel.org>, Len Brown <lenb@...nel.org>,
Robert Moore <robert.moore@...el.com>, Hans Verkuil <hverkuil@...nel.org>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-usb@...r.kernel.org, devicetree@...r.kernel.org,
linux-gpio@...r.kernel.org, linux-acpi@...r.kernel.org,
acpica-devel@...ts.linux.dev, Ricardo Ribalda <ribalda@...omium.org>
Subject: [PATCH v3 08/12] media: uvcvideo: Add support for
V4L2_CID_CAMERA_ORIENTATION
Fetch the orientation from the fwnode and map it into a control.
The uvc driver does not use the media controller, so we need to create a
software entity, like we previously did with the external gpio.
We do not re-purpose the external gpio entity because its is planned to
remove it.
We need to make uvc_alloc_entity non static.
Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
---
drivers/media/usb/uvc/Kconfig | 1 +
drivers/media/usb/uvc/Makefile | 3 +-
drivers/media/usb/uvc/uvc_ctrl.c | 21 ++++++++++
drivers/media/usb/uvc/uvc_driver.c | 22 +++++++----
drivers/media/usb/uvc/uvc_entity.c | 1 +
drivers/media/usb/uvc/uvc_swentity.c | 76 ++++++++++++++++++++++++++++++++++++
drivers/media/usb/uvc/uvcvideo.h | 17 ++++++++
include/linux/usb/uvc.h | 3 ++
8 files changed, 135 insertions(+), 9 deletions(-)
diff --git a/drivers/media/usb/uvc/Kconfig b/drivers/media/usb/uvc/Kconfig
index 579532272fd6d7a8ef65c1a3a892b723f40e584e..65f9cf81c8f434c50910db0ae94788af182eb4c4 100644
--- a/drivers/media/usb/uvc/Kconfig
+++ b/drivers/media/usb/uvc/Kconfig
@@ -4,6 +4,7 @@ config USB_VIDEO_CLASS
depends on VIDEO_DEV
select VIDEOBUF2_VMALLOC
select UVC_COMMON
+ select V4L2_FWNODE
help
Support for the USB Video Class (UVC). Currently only video
input devices, such as webcams, are supported.
diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile
index 4f9eee4f81ab6436a8b90324a688a149b2c3bcd1..b4398177c4bb0a9bd49dfd4ca7f2e933b4a1d7df 100644
--- a/drivers/media/usb/uvc/Makefile
+++ b/drivers/media/usb/uvc/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
- uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o
+ uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o \
+ uvc_swentity.o
ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
uvcvideo-objs += uvc_entity.o
endif
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index a869257e9b7c07eaa7d725d107bd1cb57d3c7377..aa9de84de9236540c46ee78fb8458873d503786e 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -385,6 +385,13 @@ static const struct uvc_control_info uvc_ctrls[] = {
| UVC_CTRL_FLAG_GET_RANGE
| UVC_CTRL_FLAG_RESTORE,
},
+ {
+ .entity = UVC_GUID_SWENTITY,
+ .selector = 0,
+ .index = 0,
+ .size = 1,
+ .flags = UVC_CTRL_FLAG_GET_CUR,
+ },
};
static const u32 uvc_control_classes[] = {
@@ -1009,6 +1016,17 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = {
.menu_mask = BIT(V4L2_COLORFX_VIVID) |
BIT(V4L2_COLORFX_NONE),
},
+ {
+ .id = V4L2_CID_CAMERA_ORIENTATION,
+ .entity = UVC_GUID_SWENTITY,
+ .selector = 0,
+ .size = 8,
+ .offset = 0,
+ .v4l2_type = V4L2_CTRL_TYPE_MENU,
+ .data_type = UVC_CTRL_DATA_TYPE_ENUM,
+ .menu_mask = GENMASK(V4L2_CAMERA_ORIENTATION_EXTERNAL,
+ V4L2_CAMERA_ORIENTATION_FRONT),
+ },
};
/* ------------------------------------------------------------------------
@@ -3281,6 +3299,9 @@ static int uvc_ctrl_init_chain(struct uvc_video_chain *chain)
} else if (UVC_ENTITY_TYPE(entity) == UVC_EXT_GPIO_UNIT) {
bmControls = entity->gpio.bmControls;
bControlSize = entity->gpio.bControlSize;
+ } else if (UVC_ENTITY_TYPE(entity) == UVC_SWENTITY_UNIT) {
+ bmControls = entity->swentity.bmControls;
+ bControlSize = entity->swentity.bControlSize;
}
/* Remove bogus/blacklisted controls */
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index fa61f1d0ea2c3d52c560b2f0834e52ca75c4227e..91edc7703b1987d8dfd552999edbdbf1b4653f3f 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -794,9 +794,9 @@ static const u8 uvc_media_transport_input_guid[16] =
UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT;
static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING;
-static struct uvc_entity *uvc_alloc_new_entity(struct uvc_device *dev, u16 type,
- u16 id, unsigned int num_pads,
- unsigned int extra_size)
+struct uvc_entity *uvc_alloc_new_entity(struct uvc_device *dev, u16 type,
+ u16 id, unsigned int num_pads,
+ unsigned int extra_size)
{
struct uvc_entity *entity;
unsigned int num_inputs;
@@ -1887,12 +1887,14 @@ static int uvc_scan_device(struct uvc_device *dev)
return -ENODEV;
}
- /* Add GPIO entity to the first chain. */
- if (dev->gpio_unit) {
- chain = list_first_entry(&dev->chains,
- struct uvc_video_chain, list);
+ /* Add virtual entities to the first chain. */
+ chain = list_first_entry(&dev->chains, struct uvc_video_chain, list);
+
+ if (dev->gpio_unit)
list_add_tail(&dev->gpio_unit->chain, &chain->entities);
- }
+
+ if (dev->swentity_unit)
+ list_add_tail(&dev->swentity_unit->chain, &chain->entities);
return 0;
}
@@ -2244,6 +2246,10 @@ static int uvc_probe(struct usb_interface *intf,
if (ret < 0)
goto error;
+ ret = uvc_swentity_init(dev);
+ if (ret < 0)
+ goto error;
+
dev_info(&dev->intf->dev, "Found UVC %u.%02x device %s (%04x:%04x)\n",
dev->uvc_version >> 8, dev->uvc_version & 0xff,
udev->product ? udev->product : "<unnamed>",
diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c
index ee1007add243036f68b7014ca621813e461fa73d..d5125fdd829a7e11f7083762531f811069e0e43f 100644
--- a/drivers/media/usb/uvc/uvc_entity.c
+++ b/drivers/media/usb/uvc/uvc_entity.c
@@ -86,6 +86,7 @@ static int uvc_mc_init_entity(struct uvc_video_chain *chain,
case UVC_VC_PROCESSING_UNIT:
case UVC_VC_EXTENSION_UNIT:
case UVC_EXT_GPIO_UNIT:
+ case UVC_SWENTITY_UNIT:
/* For lack of a better option. */
function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;
break;
diff --git a/drivers/media/usb/uvc/uvc_swentity.c b/drivers/media/usb/uvc/uvc_swentity.c
new file mode 100644
index 0000000000000000000000000000000000000000..eefc5d08e370515181f74590f2f38189770b01b2
--- /dev/null
+++ b/drivers/media/usb/uvc/uvc_swentity.c
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * uvc_swentity.c -- USB Video Class driver
+ *
+ * Copyright 2025 Google LLC
+ */
+
+#include <linux/kernel.h>
+#include <linux/usb/uvc.h>
+
+#include <media/v4l2-fwnode.h>
+
+#include "uvcvideo.h"
+
+static int uvc_swentity_get_cur(struct uvc_device *dev, struct uvc_entity *entity,
+ u8 cs, void *data, u16 size)
+{
+ if (size < 1)
+ return -EINVAL;
+
+ switch (entity->swentity.props.orientation) {
+ case V4L2_FWNODE_ORIENTATION_FRONT:
+ *(u8 *)data = V4L2_CAMERA_ORIENTATION_FRONT;
+ break;
+ case V4L2_FWNODE_ORIENTATION_BACK:
+ *(u8 *)data = V4L2_CAMERA_ORIENTATION_BACK;
+ break;
+ default:
+ *(u8 *)data = V4L2_CAMERA_ORIENTATION_EXTERNAL;
+ }
+
+ return 0;
+}
+
+static int uvc_swentity_get_info(struct uvc_device *dev,
+ struct uvc_entity *entity, u8 cs, u8 *caps)
+{
+ *caps = UVC_CONTROL_CAP_GET;
+ return 0;
+}
+
+int uvc_swentity_init(struct uvc_device *dev)
+{
+ static const u8 uvc_swentity_guid[] = UVC_GUID_SWENTITY;
+ struct v4l2_fwnode_device_properties props;
+ struct uvc_entity *unit;
+ int ret;
+
+ ret = v4l2_fwnode_device_parse(&dev->udev->dev, &props);
+ if (ret)
+ return dev_err_probe(&dev->intf->dev, ret,
+ "Can't parse fwnode\n");
+
+ if (props.orientation == V4L2_FWNODE_PROPERTY_UNSET)
+ return 0;
+
+ unit = uvc_alloc_new_entity(dev, UVC_SWENTITY_UNIT,
+ UVC_SWENTITY_UNIT_ID, 0, 1);
+ if (!unit)
+ return -ENOMEM;
+
+ memcpy(unit->guid, uvc_swentity_guid, sizeof(unit->guid));
+ unit->swentity.props = props;
+ unit->swentity.bControlSize = 1;
+ unit->swentity.bmControls = (u8 *)unit + sizeof(*unit);
+ unit->swentity.bmControls[0] = 1;
+ unit->get_cur = uvc_swentity_get_cur;
+ unit->get_info = uvc_swentity_get_info;
+ strscpy(unit->name, "SWENTITY", sizeof(unit->name));
+
+ list_add_tail(&unit->list, &dev->entities);
+
+ dev->swentity_unit = unit;
+
+ return 0;
+}
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 24292efbe47d3cd440252afb85ecbc826e2eedc1..04ca5dcce11d902dbfdf32f2a962159ba7940a39 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -18,6 +18,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-event.h>
#include <media/v4l2-fh.h>
+#include <media/v4l2-fwnode.h>
#include <media/videobuf2-v4l2.h>
/* --------------------------------------------------------------------------
@@ -38,6 +39,9 @@
(UVC_ENTITY_IS_TERM(entity) && \
((entity)->type & 0x8000) == UVC_TERM_OUTPUT)
+#define UVC_SWENTITY_UNIT 0x7ffd
+#define UVC_SWENTITY_UNIT_ID 0x101
+
#define UVC_EXT_GPIO_UNIT 0x7ffe
#define UVC_EXT_GPIO_UNIT_ID 0x100
@@ -247,6 +251,12 @@ struct uvc_entity {
int irq;
bool initialized;
} gpio;
+
+ struct {
+ u8 bControlSize;
+ u8 *bmControls;
+ struct v4l2_fwnode_device_properties props;
+ } swentity;
};
u8 bNrInPins;
@@ -623,6 +633,7 @@ struct uvc_device {
} async_ctrl;
struct uvc_entity *gpio_unit;
+ struct uvc_entity *swentity_unit;
};
struct uvc_fh {
@@ -688,6 +699,9 @@ do { \
*/
struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id);
+struct uvc_entity *uvc_alloc_new_entity(struct uvc_device *dev, u16 type,
+ u16 id, unsigned int num_pads,
+ unsigned int extra_size);
/* Video buffers queue management. */
int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type);
@@ -813,4 +827,7 @@ void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream);
size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,
size_t size);
+/* swentity */
+int uvc_swentity_init(struct uvc_device *dev);
+
#endif
diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h
index 22e0dab0809e296e089940620ae0e8838e109701..654182c2d22cdd9c72709247c1c8cabf9f5b19ee 100644
--- a/include/linux/usb/uvc.h
+++ b/include/linux/usb/uvc.h
@@ -29,6 +29,9 @@
#define UVC_GUID_EXT_GPIO_CONTROLLER \
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03}
+#define UVC_GUID_SWENTITY \
+ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04}
#define UVC_GUID_CHROMEOS_XU \
{0x24, 0xe9, 0xd7, 0x74, 0xc9, 0x49, 0x45, 0x4a, \
0x98, 0xa3, 0xc8, 0x07, 0x7e, 0x05, 0x1c, 0xa3}
--
2.51.0.536.g15c5d4f767-goog
Powered by blists - more mailing lists