From nobody Mon Oct 6 17:02:10 2025 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A3EE2DEA65 for ; Fri, 18 Jul 2025 15:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852557; cv=none; b=hj0t4JRy1aTZsNXve9Ez6wUVTFC9IjWDo/xkE5w07c9MvER6d+VGrCIdkdjDMvtT/Fmoz4Dcb2ipbds9qiOFlA+1dmpyQctgJ4+7uQLrey5YQQxwiH+YVku4op/kKGQPWWtshvrspLN4lXqjwc/wRz72wwF2ir7RhW4q2XZH7Nc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852557; c=relaxed/simple; bh=/8ITQNX87TDjJtwoqKQOHmwkCLN38DugcUW/GK5Cn4E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WdJyyDSqBsvlBzhZ7KIpeeD4Z0ZVLGtYtkEaKSh/Xuj1OwAmrGOsoRGitre7q8oB88wxJUlwDUspAEGMUxAUxZugh6uLmMagJwvKrDSiIIqfs17+TrhmUdbeaPNtENHWQ6oxIXGBw5hljn71WvSGqelafm3HZNGeV0GIvhgp2/c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=K7jTF7MB; arc=none smtp.client-ip=209.85.167.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="K7jTF7MB" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-558f7472d64so2858035e87.0 for ; Fri, 18 Jul 2025 08:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1752852553; x=1753457353; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Z0myKZxZrlimKWecDsKq5/yhMZliT2ThHP1sIZx7oJA=; b=K7jTF7MBj7SzA+da7IU/vax9gdhPLf6wf0USul3+V+rreudPSw5S1oUOKUVvN0Bn7A rmD3KBLvxxQZsWrXFypU94kcNq8d9v7+ULTa51DMMsWjDXOfF3B1tWRA+5H2lG/7s8eB 89X9iFtbO2SmKJ3u84EWM45wfNKnpZo67qwNc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752852553; x=1753457353; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z0myKZxZrlimKWecDsKq5/yhMZliT2ThHP1sIZx7oJA=; b=HwPTc2MZ+h/gUZde2NNmlhTe6XVnLreVn9N0I8O9Ki9bomLHfMyqIegp+v/m664EJP BqKefg3laxJo+vymez+nc2up97Db9lirslCoKDfEDpeGlpVP7BTH1uyTKvnr3qj2Z0eG jhf9PUDWJ0UN8N8Z/DVePBw+c5ejjX62jemC1OEbtJGKBe4wb9aoykuNgb3BjbXC3u77 XYON5s1CLS1DvDR8qxuMKApCAj/RK9dtvrYHIN2cjG+dGDiUDBV6Lddp3OgHGZOJJNWP cxzatj1xloyMdDjIenYnJw0y4HIocyKhGu2ETkIeHuTZIKJtIa7bae6PnU2kKbdhDWKv 1tvA== X-Gm-Message-State: AOJu0Yz82BZUzRh+aRN/D8LP+xCDgOT7t0xsD3huwxs02sbmHya1rcAv f0ph+kTIkiKlhH7C0tFf9nd1ivNn2/H4qkdGFP0JwVeAOqHfW+5POqRAPXzQoPt0eQ== X-Gm-Gg: ASbGnctcZjUxwrn/tO2pwDAjAP1iUZ/lKwfqot/dVXM5ema2W+doS8nV97Gg2DQlDLy Rc49YtYRlsWqPs2BLWyQoiEB1LrVwmFRv/+o2192CLOoEVkeo9667PQNgh/gZYo/ag7MreHS7Vh fI51fk5UGTGBYzddpEd425qFvDOKgg/J2XP3gkGG0JpiwYUzTfNpwU29R3/qNvh4Du0gsrtH4vz J9Tq8K6kfSFqgDzNNr1nD8KOiWEppFZHfjZaJvNrz94RrYJYzD3DfZyX1KrQntjDkgrBtcn7+Q8 C0752kWXqeYmumgoedg/kRoaBVbb1sThEgxkfGcqWcZ93kqHRcF2rC4NPLQSzUUeu3eZL4dsgaz C3Sq+EI1b290uniY6kjl5yYODxuIchd+eBQTbH8V3bW5qMvcM9rkqsF5nygFSHYg+wJDgWHkp2l k+pA== X-Google-Smtp-Source: AGHT+IGci1vQOFQMMl+qEzOSUifBeMVciDHPPF3UMhgKYZbmLXQkHMvTkLZEJPwdCUkuOzwCEuhUrA== X-Received: by 2002:ac2:4bd6:0:b0:551:ecf4:2cd8 with SMTP id 2adb3069b0e04-55a2fe66ba5mr1159536e87.23.1752852553168; Fri, 18 Jul 2025 08:29:13 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-330a91d9d6dsm2268601fa.83.2025.07.18.08.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 08:29:12 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 18 Jul 2025 15:29:10 +0000 Subject: [PATCH v5 1/5] media: uvcvideo: Factor out gpio functions to its own file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250718-uvc-subdev-v5-1-a5869b071b0d@chromium.org> References: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> In-Reply-To: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Hans de Goede , Linus Walleij , Bartosz Golaszewski , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Yunke Cao , linux-gpio@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda , Hans Verkuil , Hans de Goede X-Mailer: b4 0.14.2 This is just a refactor patch, no new functionality is added. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/Makefile | 3 +- drivers/media/usb/uvc/uvc_driver.c | 121 +--------------------------------= --- drivers/media/usb/uvc/uvc_gpio.c | 122 +++++++++++++++++++++++++++++++++= ++++ drivers/media/usb/uvc/uvcvideo.h | 7 +++ 4 files changed, 133 insertions(+), 120 deletions(-) diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile index 4f9eee4f81ab6436a8b90324a688a149b2c3bcd1..85514b6e538fbb8284e574ca147= 00f2d749e1a2e 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 :=3D uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ct= rl.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_gpio.o ifeq ($(CONFIG_MEDIA_CONTROLLER),y) uvcvideo-objs +=3D uvc_entity.o endif diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 775bede0d93d9b3e5391914aa395326d3de6a3b1..56bf741e55ed22052f2f4773244= ef49c08a2fdae 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -8,7 +8,6 @@ =20 #include #include -#include #include #include #include @@ -795,8 +794,8 @@ static const u8 uvc_media_transport_input_guid[16] =3D UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT; static const u8 uvc_processing_guid[16] =3D UVC_GUID_UVC_PROCESSING; =20 -static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, - unsigned int num_pads, unsigned int extra_size) +struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pad= s, + unsigned int extra_size) { struct uvc_entity *entity; unsigned int num_inputs; @@ -1245,122 +1244,6 @@ static int uvc_parse_control(struct uvc_device *dev) return 0; } =20 -/* -----------------------------------------------------------------------= ------ - * Privacy GPIO - */ - -static void uvc_gpio_event(struct uvc_device *dev) -{ - struct uvc_entity *unit =3D dev->gpio_unit; - struct uvc_video_chain *chain; - u8 new_val; - - if (!unit) - return; - - new_val =3D gpiod_get_value_cansleep(unit->gpio.gpio_privacy); - - /* GPIO entities are always on the first chain. */ - chain =3D list_first_entry(&dev->chains, struct uvc_video_chain, list); - uvc_ctrl_status_event(chain, unit->controls, &new_val); -} - -static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *ent= ity, - u8 cs, void *data, u16 size) -{ - if (cs !=3D UVC_CT_PRIVACY_CONTROL || size < 1) - return -EINVAL; - - *(u8 *)data =3D gpiod_get_value_cansleep(entity->gpio.gpio_privacy); - - return 0; -} - -static int uvc_gpio_get_info(struct uvc_device *dev, struct uvc_entity *en= tity, - u8 cs, u8 *caps) -{ - if (cs !=3D UVC_CT_PRIVACY_CONTROL) - return -EINVAL; - - *caps =3D UVC_CONTROL_CAP_GET | UVC_CONTROL_CAP_AUTOUPDATE; - return 0; -} - -static irqreturn_t uvc_gpio_irq(int irq, void *data) -{ - struct uvc_device *dev =3D data; - - uvc_gpio_event(dev); - return IRQ_HANDLED; -} - -static int uvc_gpio_parse(struct uvc_device *dev) -{ - struct uvc_entity *unit; - struct gpio_desc *gpio_privacy; - int irq; - - gpio_privacy =3D devm_gpiod_get_optional(&dev->intf->dev, "privacy", - GPIOD_IN); - if (!gpio_privacy) - return 0; - - if (IS_ERR(gpio_privacy)) - return dev_err_probe(&dev->intf->dev, - PTR_ERR(gpio_privacy), - "Can't get privacy GPIO\n"); - - irq =3D gpiod_to_irq(gpio_privacy); - if (irq < 0) - return dev_err_probe(&dev->intf->dev, irq, - "No IRQ for privacy GPIO\n"); - - unit =3D uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1); - if (!unit) - return -ENOMEM; - - unit->gpio.gpio_privacy =3D gpio_privacy; - unit->gpio.irq =3D irq; - unit->gpio.bControlSize =3D 1; - unit->gpio.bmControls =3D (u8 *)unit + sizeof(*unit); - unit->gpio.bmControls[0] =3D 1; - unit->get_cur =3D uvc_gpio_get_cur; - unit->get_info =3D uvc_gpio_get_info; - strscpy(unit->name, "GPIO", sizeof(unit->name)); - - list_add_tail(&unit->list, &dev->entities); - - dev->gpio_unit =3D unit; - - return 0; -} - -static int uvc_gpio_init_irq(struct uvc_device *dev) -{ - struct uvc_entity *unit =3D dev->gpio_unit; - int ret; - - if (!unit || unit->gpio.irq < 0) - return 0; - - ret =3D request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq, - IRQF_ONESHOT | IRQF_TRIGGER_FALLING | - IRQF_TRIGGER_RISING, - "uvc_privacy_gpio", dev); - - unit->gpio.initialized =3D !ret; - - return ret; -} - -static void uvc_gpio_deinit(struct uvc_device *dev) -{ - if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized) - return; - - free_irq(dev->gpio_unit->gpio.irq, dev); -} - /* ------------------------------------------------------------------------ * UVC device scan */ diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_g= pio.c new file mode 100644 index 0000000000000000000000000000000000000000..45c169eb933815baab3d166abac= e46f269d9241e --- /dev/null +++ b/drivers/media/usb/uvc/uvc_gpio.c @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * uvc_gpio.c -- USB Video Class driver + * + * Copyright 2024 Google LLC + */ + +#include +#include +#include "uvcvideo.h" + +static void uvc_gpio_event(struct uvc_device *dev) +{ + struct uvc_entity *unit =3D dev->gpio_unit; + struct uvc_video_chain *chain; + u8 new_val; + + if (!unit) + return; + + new_val =3D gpiod_get_value_cansleep(unit->gpio.gpio_privacy); + + /* GPIO entities are always on the first chain. */ + chain =3D list_first_entry(&dev->chains, struct uvc_video_chain, list); + uvc_ctrl_status_event(chain, unit->controls, &new_val); +} + +static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *ent= ity, + u8 cs, void *data, u16 size) +{ + if (cs !=3D UVC_CT_PRIVACY_CONTROL || size < 1) + return -EINVAL; + + *(u8 *)data =3D gpiod_get_value_cansleep(entity->gpio.gpio_privacy); + + return 0; +} + +static int uvc_gpio_get_info(struct uvc_device *dev, struct uvc_entity *en= tity, + u8 cs, u8 *caps) +{ + if (cs !=3D UVC_CT_PRIVACY_CONTROL) + return -EINVAL; + + *caps =3D UVC_CONTROL_CAP_GET | UVC_CONTROL_CAP_AUTOUPDATE; + return 0; +} + +static irqreturn_t uvc_gpio_irq(int irq, void *data) +{ + struct uvc_device *dev =3D data; + + uvc_gpio_event(dev); + return IRQ_HANDLED; +} + +int uvc_gpio_parse(struct uvc_device *dev) +{ + struct uvc_entity *unit; + struct gpio_desc *gpio_privacy; + int irq; + + gpio_privacy =3D devm_gpiod_get_optional(&dev->intf->dev, "privacy", + GPIOD_IN); + if (!gpio_privacy) + return 0; + + if (IS_ERR(gpio_privacy)) + return dev_err_probe(&dev->intf->dev, + PTR_ERR(gpio_privacy), + "Can't get privacy GPIO\n"); + + irq =3D gpiod_to_irq(gpio_privacy); + if (irq < 0) + return dev_err_probe(&dev->intf->dev, irq, + "No IRQ for privacy GPIO\n"); + + unit =3D uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1); + if (!unit) + return -ENOMEM; + + unit->gpio.gpio_privacy =3D gpio_privacy; + unit->gpio.irq =3D irq; + unit->gpio.bControlSize =3D 1; + unit->gpio.bmControls =3D (u8 *)unit + sizeof(*unit); + unit->gpio.bmControls[0] =3D 1; + unit->get_cur =3D uvc_gpio_get_cur; + unit->get_info =3D uvc_gpio_get_info; + strscpy(unit->name, "GPIO", sizeof(unit->name)); + + list_add_tail(&unit->list, &dev->entities); + + dev->gpio_unit =3D unit; + + return 0; +} + +int uvc_gpio_init_irq(struct uvc_device *dev) +{ + struct uvc_entity *unit =3D dev->gpio_unit; + int ret; + + if (!unit || unit->gpio.irq < 0) + return 0; + + ret =3D request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq, + IRQF_ONESHOT | IRQF_TRIGGER_FALLING | + IRQF_TRIGGER_RISING, + "uvc_privacy_gpio", dev); + + unit->gpio.initialized =3D !ret; + + return ret; +} + +void uvc_gpio_deinit(struct uvc_device *dev) +{ + if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized) + return; + + free_irq(dev->gpio_unit->gpio.irq, dev); +} diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 757254fc4fe930ae61c9d0425f04d4cd074a617e..63df6fb89ed29c76ed0ded9283a= 2c5e817bf6500 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -688,6 +688,8 @@ do { \ */ =20 struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id); +struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pad= s, + unsigned int extra_size); =20 /* Video buffers queue management. */ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type); @@ -814,4 +816,9 @@ void uvc_debugfs_cleanup_stream(struct uvc_streaming *s= tream); size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf, size_t size); =20 +/* gpio */ +int uvc_gpio_parse(struct uvc_device *dev); +int uvc_gpio_init_irq(struct uvc_device *dev); +void uvc_gpio_deinit(struct uvc_device *dev); + #endif --=20 2.50.0.727.gbf7dc18ff4-goog From nobody Mon Oct 6 17:02:10 2025 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5E902DEA7E for ; Fri, 18 Jul 2025 15:29:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852558; cv=none; b=S84GQTxY2kVaDQAeCdFBXC3tnGUw0HO9dn7h22nTjNMltAO8FQDXb0da6R0rWOpRBegIu0llPtJxpXiGIz4Y+k+U+74sYqTEjTMAX1QcBujSGJUeVlC9Mt7LL9tX9KKDDsW69ZC/yf5UpDzTm1N8RNffEPAtLXZJ8wHW6I6vKVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852558; c=relaxed/simple; bh=vXvUh0/lx8vV9ufWmUh/Vz59CiW2e51IxBQ5UwdiB8g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hIpPhndeVgaVjlr86bF0ItUZ/F5yzxBm9uBSVDPmSapost2a4LVYoic7i0QsH4s3LzDwVLRTtyLRCkF8RPXhMhUR65FTmyjaA5IW27dsCaLdIE4zMKcTuotAU7WVYIROjWGaPKgCUlqI3AwrxYMhJa2xbkDeshhh7wmN8bSyLpw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=UEQ8JVmJ; arc=none smtp.client-ip=209.85.208.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UEQ8JVmJ" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-32f1aaf0d60so22491591fa.1 for ; Fri, 18 Jul 2025 08:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1752852554; x=1753457354; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=8UNTtgLj5d8F+iVA0Rt40rNJLWBH3Yh3XuCxnqOYkd4=; b=UEQ8JVmJagiDb1OcKdl5EEUztD1+NhiGHEiSMJmeiEOmMo3EglB68tDl8OcHqamdiv X8hukCc4/oYzNwB15130xGnDvnHVgYRrd0sNG4PRpXxHZXnIP8gRAQs5KfONy+s+Gh/c 7H1GQ58dg5zvgJkD6N3XUmeVJO8TO/yUSKBHk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752852554; x=1753457354; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8UNTtgLj5d8F+iVA0Rt40rNJLWBH3Yh3XuCxnqOYkd4=; b=XD9MzcsK1s2CR0JCi0DQsAjFc/vjWCQCyiucqoUCW6sLHG1rsoEnGq9m7S0tO31gIC bbQEflgUSWLiGpPq/RTugmj4pvU40azx9n83CIrSL2HQLPU7DAJ/Z/AJ8GA40I/ORyGx 8cCV+/72kjVCt4ym6ZaFFL1RNcOvdls11UzZeQ750OknLnKXiIov/xpMwWa60PsDxPb+ o5URY1p32+QDBJmqEU7uwny23A88X2Qu2DEbBS3hJEkhKorzaKakfxH9J3AuK624OWhL VJv5bSOxp8NAJQUTf8DSsvGJrQIHB3XlfE7+1wmYo6y3Lbwx/GF8GUpiBNBmVJE8rfyW Za5g== X-Gm-Message-State: AOJu0YzgdZxVg9+OlLZv3rKPJeZ/yHkXFjbEenrM8gLKvRht6ND8bZ6m BTp4afuPZUshsx4+CXiv1xjfP6tZxLNuZIJGlr5jlR6mu7dPavIUuN6LzIuOQRDYJw== X-Gm-Gg: ASbGncuT627qQKBoeI2kulX/N1QkuF5cbetXbbXQQFni/UyPlJNGD6UW+ga0gVrcwtX djsySo3EmGC6/ATaDc3ww/GrGgsr2GLo0SHFpAzyFCjO6Myb5Qr6w069hpd/WpWeQwSdvuLDD6i +Ix8nt2tLnzxqdkY1cc15iQAIi0VrNJVpSq2vkmexelgHO5HPMVKKU2ep35yDWNyqn19WZxD/1T qidg50XhPKdnC6VesKbDM66wG19r1ORsM1r8GlhEIXmyI8YV1h+DhGEDDratPhLq7JV9Txcez2e x5j722H6uU8w8QPHTuplWGhyZ0if1hOh+wpjBJVKOL7TuH/elNUp7UhsfbBfu+AsLDr7zYoovUR zN2R+MMwMiEKLeuAeMBZXeCvXZf84d2wOfYUW4uVmH5sguYjhwJFKS9VTpyIFMl5LXZ4CXXMlNu HUog== X-Google-Smtp-Source: AGHT+IFNsaEOVl0URzbGSFqOvOait6YxwkgAbxxzfplQU3FHkjkAop2mcAXuOEtkx0JO/lbdJ5ZvQA== X-Received: by 2002:a2e:a592:0:b0:32f:1c0f:fb7b with SMTP id 38308e7fff4ca-3309a577ef8mr22131451fa.26.1752852553734; Fri, 18 Jul 2025 08:29:13 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-330a91d9d6dsm2268601fa.83.2025.07.18.08.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 08:29:13 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 18 Jul 2025 15:29:11 +0000 Subject: [PATCH v5 2/5] media: uvcvideo: Re-implement privacy GPIO as an input device Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250718-uvc-subdev-v5-2-a5869b071b0d@chromium.org> References: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> In-Reply-To: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Hans de Goede , Linus Walleij , Bartosz Golaszewski , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Yunke Cao , linux-gpio@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda , Hans Verkuil , Hans de Goede X-Mailer: b4 0.14.2 Reimplement privacy GPIO as an input device. This is an attempt to unify how we notify userspace about a camera that is covered. Replace the previous V4L2_CID_PRIVACY control with evdev SW_CAMERA_LENS_COVER. This has some main benefits: - It unifies behaviour with other drivers. - It allows reading the privacy events without powering up the camera. - It allows reading the privacy gpio and the internal gpio control (if present). Although this introduces an ABI change, we have only seen ChromeOS using this feature. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/Kconfig | 2 +- drivers/media/usb/uvc/Makefile | 6 ++-- drivers/media/usb/uvc/uvc_ctrl.c | 20 ----------- drivers/media/usb/uvc/uvc_driver.c | 3 +- drivers/media/usb/uvc/uvc_gpio.c | 72 +++++++++++++---------------------= ---- drivers/media/usb/uvc/uvc_status.c | 13 +++++-- drivers/media/usb/uvc/uvcvideo.h | 15 +++++--- 7 files changed, 51 insertions(+), 80 deletions(-) diff --git a/drivers/media/usb/uvc/Kconfig b/drivers/media/usb/uvc/Kconfig index 579532272fd6d7a8ef65c1a3a892b723f40e584e..cdbba7fd5bee2427d7f908283a6= 648d0a4888e0d 100644 --- a/drivers/media/usb/uvc/Kconfig +++ b/drivers/media/usb/uvc/Kconfig @@ -17,6 +17,6 @@ config USB_VIDEO_CLASS_INPUT_EVDEV depends on USB_VIDEO_CLASS=3DINPUT || INPUT=3Dy help This option makes USB Video Class devices register an input device - to report button events. + to report button events and privacy GPIO. =20 If you are in doubt, say Y. diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile index 85514b6e538fbb8284e574ca14700f2d749e1a2e..b36b124da7a8190760353b22805= e8cd23a7723c2 100644 --- a/drivers/media/usb/uvc/Makefile +++ b/drivers/media/usb/uvc/Makefile @@ -1,8 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 uvcvideo-objs :=3D uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ct= rl.o \ - uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o \ - uvc_gpio.o + uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o ifeq ($(CONFIG_MEDIA_CONTROLLER),y) uvcvideo-objs +=3D uvc_entity.o endif +ifeq ($(CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV),y) +uvcvideo-objs +=3D uvc_gpio.o +endif obj-$(CONFIG_USB_VIDEO_CLASS) +=3D uvcvideo.o diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index efe609d7087752cb2ef516eef0fce12acd13e747..17a9af857308c6311824807f6e3= 438974bc88f55 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -350,14 +350,6 @@ static const struct uvc_control_info uvc_ctrls[] =3D { | UVC_CTRL_FLAG_RESTORE | UVC_CTRL_FLAG_AUTO_UPDATE, }, - { - .entity =3D UVC_GUID_EXT_GPIO_CONTROLLER, - .selector =3D UVC_CT_PRIVACY_CONTROL, - .index =3D 0, - .size =3D 1, - .flags =3D UVC_CTRL_FLAG_GET_CUR - | UVC_CTRL_FLAG_AUTO_UPDATE, - }, /* * UVC_CTRL_FLAG_AUTO_UPDATE is needed because the RoI may get updated * by sensors. @@ -939,15 +931,6 @@ static const struct uvc_control_mapping uvc_ctrl_mappi= ngs[] =3D { .v4l2_type =3D V4L2_CTRL_TYPE_BOOLEAN, .data_type =3D UVC_CTRL_DATA_TYPE_BOOLEAN, }, - { - .id =3D V4L2_CID_PRIVACY, - .entity =3D UVC_GUID_EXT_GPIO_CONTROLLER, - .selector =3D UVC_CT_PRIVACY_CONTROL, - .size =3D 1, - .offset =3D 0, - .v4l2_type =3D V4L2_CTRL_TYPE_BOOLEAN, - .data_type =3D UVC_CTRL_DATA_TYPE_BOOLEAN, - }, { .entity =3D UVC_GUID_UVC_PROCESSING, .selector =3D UVC_PU_POWER_LINE_FREQUENCY_CONTROL, @@ -3252,9 +3235,6 @@ static int uvc_ctrl_init_chain(struct uvc_video_chain= *chain) } else if (UVC_ENTITY_TYPE(entity) =3D=3D UVC_ITT_CAMERA) { bmControls =3D entity->camera.bmControls; bControlSize =3D entity->camera.bControlSize; - } else if (UVC_ENTITY_TYPE(entity) =3D=3D UVC_EXT_GPIO_UNIT) { - bmControls =3D entity->gpio.bmControls; - bControlSize =3D entity->gpio.bControlSize; } =20 /* Remove bogus/blacklisted controls */ diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 56bf741e55ed22052f2f4773244ef49c08a2fdae..89a4ac8a358f508220bca430789= 64bc2a8a6c4a5 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2158,6 +2158,7 @@ static int uvc_probe(struct usb_interface *intf, if (ret < 0) goto error; #endif + /* Save our data pointer in the interface data. */ usb_set_intfdata(intf, dev); =20 @@ -2169,7 +2170,7 @@ static int uvc_probe(struct usb_interface *intf, ret); } =20 - ret =3D uvc_gpio_init_irq(dev); + ret =3D uvc_gpio_init(dev); if (ret < 0) { dev_err(&dev->udev->dev, "Unable to request privacy GPIO IRQ (%d)\n", ret); diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_g= pio.c index 45c169eb933815baab3d166abace46f269d9241e..93727185b9125d5a0ebf7fcede5= ed8983ecddd5f 100644 --- a/drivers/media/usb/uvc/uvc_gpio.c +++ b/drivers/media/usb/uvc/uvc_gpio.c @@ -7,57 +7,29 @@ =20 #include #include +#include #include "uvcvideo.h" =20 -static void uvc_gpio_event(struct uvc_device *dev) -{ - struct uvc_entity *unit =3D dev->gpio_unit; - struct uvc_video_chain *chain; - u8 new_val; - - if (!unit) - return; - - new_val =3D gpiod_get_value_cansleep(unit->gpio.gpio_privacy); - - /* GPIO entities are always on the first chain. */ - chain =3D list_first_entry(&dev->chains, struct uvc_video_chain, list); - uvc_ctrl_status_event(chain, unit->controls, &new_val); -} - -static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *ent= ity, - u8 cs, void *data, u16 size) -{ - if (cs !=3D UVC_CT_PRIVACY_CONTROL || size < 1) - return -EINVAL; - - *(u8 *)data =3D gpiod_get_value_cansleep(entity->gpio.gpio_privacy); - - return 0; -} - -static int uvc_gpio_get_info(struct uvc_device *dev, struct uvc_entity *en= tity, - u8 cs, u8 *caps) -{ - if (cs !=3D UVC_CT_PRIVACY_CONTROL) - return -EINVAL; - - *caps =3D UVC_CONTROL_CAP_GET | UVC_CONTROL_CAP_AUTOUPDATE; - return 0; -} - static irqreturn_t uvc_gpio_irq(int irq, void *data) { struct uvc_device *dev =3D data; + struct uvc_gpio *uvc_gpio =3D &dev->gpio_unit->gpio; + int new_val; + + new_val =3D gpiod_get_value_cansleep(uvc_gpio->gpio_privacy); + if (new_val < 0) + return IRQ_HANDLED; + + input_report_switch(dev->input, SW_CAMERA_LENS_COVER, new_val); + input_sync(dev->input); =20 - uvc_gpio_event(dev); return IRQ_HANDLED; } =20 int uvc_gpio_parse(struct uvc_device *dev) { - struct uvc_entity *unit; struct gpio_desc *gpio_privacy; + struct uvc_entity *unit; int irq; =20 gpio_privacy =3D devm_gpiod_get_optional(&dev->intf->dev, "privacy", @@ -81,13 +53,7 @@ int uvc_gpio_parse(struct uvc_device *dev) =20 unit->gpio.gpio_privacy =3D gpio_privacy; unit->gpio.irq =3D irq; - unit->gpio.bControlSize =3D 1; - unit->gpio.bmControls =3D (u8 *)unit + sizeof(*unit); - unit->gpio.bmControls[0] =3D 1; - unit->get_cur =3D uvc_gpio_get_cur; - unit->get_info =3D uvc_gpio_get_info; strscpy(unit->name, "GPIO", sizeof(unit->name)); - list_add_tail(&unit->list, &dev->entities); =20 dev->gpio_unit =3D unit; @@ -95,22 +61,32 @@ int uvc_gpio_parse(struct uvc_device *dev) return 0; } =20 -int uvc_gpio_init_irq(struct uvc_device *dev) +int uvc_gpio_init(struct uvc_device *dev) { struct uvc_entity *unit =3D dev->gpio_unit; + int init_val; int ret; =20 if (!unit || unit->gpio.irq < 0) return 0; =20 + init_val =3D gpiod_get_value_cansleep(unit->gpio.gpio_privacy); + if (init_val < 0) + return init_val; + ret =3D request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq, IRQF_ONESHOT | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "uvc_privacy_gpio", dev); + if (ret) + return ret; + + input_report_switch(dev->input, SW_CAMERA_LENS_COVER, init_val); + input_sync(dev->input); =20 - unit->gpio.initialized =3D !ret; + unit->gpio.initialized =3D true; =20 - return ret; + return 0; } =20 void uvc_gpio_deinit(struct uvc_device *dev) diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc= _status.c index ee01dce4b7834b05aab95379191c305cf8cec7f7..664ba59af8ecad5511c9dea924b= f037b2aafc0d0 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -44,7 +44,7 @@ static int uvc_input_init(struct uvc_device *dev) struct input_dev *input; int ret; =20 - if (!uvc_input_has_button(dev)) + if (!uvc_input_has_button(dev) && !dev->gpio_unit) return 0; =20 input =3D input_allocate_device(); @@ -59,8 +59,15 @@ static int uvc_input_init(struct uvc_device *dev) usb_to_input_id(dev->udev, &input->id); input->dev.parent =3D &dev->intf->dev; =20 - __set_bit(EV_KEY, input->evbit); - __set_bit(KEY_CAMERA, input->keybit); + if (uvc_input_has_button(dev)) { + __set_bit(EV_KEY, input->evbit); + __set_bit(KEY_CAMERA, input->keybit); + } + + if (dev->gpio_unit) { + __set_bit(EV_SW, input->evbit); + __set_bit(SW_CAMERA_LENS_COVER, input->swbit); + } =20 if ((ret =3D input_register_device(input)) < 0) goto error; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 63df6fb89ed29c76ed0ded9283a2c5e817bf6500..aca857d3f5608550faa5241f3b5= 15bb9837f70ab 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -238,12 +239,10 @@ struct uvc_entity { u8 *bmControlsType; } extension; =20 - struct { - u8 bControlSize; - u8 *bmControls; - struct gpio_desc *gpio_privacy; + struct uvc_gpio { int irq; bool initialized; + struct gpio_desc *gpio_privacy; } gpio; }; =20 @@ -817,8 +816,14 @@ size_t uvc_video_stats_dump(struct uvc_streaming *stre= am, char *buf, size_t size); =20 /* gpio */ +#ifdef CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV int uvc_gpio_parse(struct uvc_device *dev); -int uvc_gpio_init_irq(struct uvc_device *dev); +int uvc_gpio_init(struct uvc_device *dev); void uvc_gpio_deinit(struct uvc_device *dev); +#else +static inline int uvc_gpio_parse(struct uvc_device *dev) {return 0; } +static inline int uvc_gpio_init(struct uvc_device *dev) {return 0; } +static inline void uvc_gpio_deinit(struct uvc_device *dev) {}; +#endif =20 #endif --=20 2.50.0.727.gbf7dc18ff4-goog From nobody Mon Oct 6 17:02:10 2025 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 498342DEA7F for ; Fri, 18 Jul 2025 15:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852558; cv=none; b=gP+Ok0FLOpIXLXiEXzNPmFUP796FaDjdRTXBCqwZMtcHSZGss9Jpg/Qo/2Iurdfh/hWcHYpz62+fy/pbBNwp+MZVxEZhntXOTn3iLkwGoJ7qvcCotStmptfM6+ctutS2sQWrGRaQqvApV0LqyK0btLDg5D3iRGQp5r/xsxVo3gQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852558; c=relaxed/simple; bh=pNWBmdX42Cj+KseLmy2wDdUnAJ44WfaEn1AkZMwCBLg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ai9kAJHUpik7tIM6y65vBNPICyNQ5x6+ICbXkPYCjtr424sA1inwUqFJKEEc2dttDhyVNBuTDIeIBOztlqH61pZO0+wiQ44haE1GT+5OmXpopYLJV70iW79qTGG8205PV6y0XpubYVBni35dBCEId3S4Wg14w+Kd9YH1M5lA7Yw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=gEMvo0fR; arc=none smtp.client-ip=209.85.208.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="gEMvo0fR" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-32b7113ed6bso17714901fa.1 for ; Fri, 18 Jul 2025 08:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1752852554; x=1753457354; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xqRz3QcZGu1A4x3k8lELm1/fHH2/qOSuF/RSy3k5QzI=; b=gEMvo0fRIMhgTETXDuNr85oYQMgl2DY4ybIn/wZFJJFTAtFsIYV1OYoR0yw7ND4cy+ YRZ1wBpehsRSqt1Uo8ZJaR7JrJCUDJG5tvdUt0TiIXfFZ00sf9ibRP21Y3B/gBkJZfEZ JRUoc/ZhD6qe0F9wWMTvXrAEhRklqe8Nyu5L8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752852554; x=1753457354; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xqRz3QcZGu1A4x3k8lELm1/fHH2/qOSuF/RSy3k5QzI=; b=SQId2XmhLtLKcHYLMTAhzE6AYgzfCFQaR7snZ/46MUHklk3wkiJoDYQn6JGbtGyNei qQaTRMKZTJ/nSb9xolL8S3n7eHOmb3jJgun0xHF4mL35g5YR11PtOOUHBKWUG/0OaXLr qY6wkvt55HG+LOyUio+SW7A6mZbzSW2czaPeqA+BHf/7F99CMSY7jeXvvFGJhV0O0vhn OMETLSm39p6WR69DToN+ipt4w2o6GnJ+pWgLhrNHPDm/E93a7o8deaKhFduiWzDrpmUY I9hQvSGVGMrw4ekTRolZ/+Ce3pVejR/XIJBimhYRRjiTl21VcRwocMmk6Jv4/QAbCfiZ u7kg== X-Gm-Message-State: AOJu0Yxc7soHbYeeZYc5SgxIVojMC485kJxGVshQqz8ynZdB49NU6VcI Q2OFYeDdyz47D4ZVdljDQAyTEMRSw7KglnfGq00EIh0TIYt1IzMZDB4VMnks7Qa2dA== X-Gm-Gg: ASbGncvQZuuDlIiDuBDQHfzubVFgq6j2jxpXnQ5YVldBkYEqbqncniBoWZIlERIPgxY JwhBBK46yOlidOGUHl/Nlf9COkf7QWgqQofMMlSLdC0HtMaEcLdcQJzwVOEEuJQ/1tTy/d3YwJM 0/jChD5fpwN6Vr8y+5vEUBh+Tv+vkcxeqbtwda3VPt/2FiAQoMeDwnRcRtFDGFbcYtysjez2p7r 8n4AJaC6HUWLpDDv3WvymkQ+FwPz4hEn6WXRd0QQ1frX54fUvY73l8ypDwh4eeYYmlcnznV3qyQ qad23zX/SfWzxKsAZUph9JUNSvm55DJNR4rk2KNwtkcDMFHaZCAzLPeBabrjBqjTUejSyB++o8T 0pLYxUqIKeYBzC3C8IrF3spd8N6fVWKj8PlkCD21r5wDTkdm/HWlabvkZiIaiAJOjroSY0WZ5Jq snug== X-Google-Smtp-Source: AGHT+IGA7XztOVyOIPvb4xLSiXHvQAev7YDG3YfYcgQpFwjP++W4a2HDWR+o1xYxe5fn/E4j4pB5pg== X-Received: by 2002:a05:651c:40ce:b0:32b:9e00:1237 with SMTP id 38308e7fff4ca-3308f5f87d4mr29011591fa.32.1752852554263; Fri, 18 Jul 2025 08:29:14 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-330a91d9d6dsm2268601fa.83.2025.07.18.08.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 08:29:13 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 18 Jul 2025 15:29:12 +0000 Subject: [PATCH v5 3/5] media: uvcvideo: Introduce UVC_QUIRK_PRIVACY_DURING_STREAM Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250718-uvc-subdev-v5-3-a5869b071b0d@chromium.org> References: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> In-Reply-To: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Hans de Goede , Linus Walleij , Bartosz Golaszewski , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Yunke Cao , linux-gpio@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda , Hans Verkuil , Hans de Goede X-Mailer: b4 0.14.2 Some devices power the GPIO pull-up with the same power-supply as the camera. Avoid reading the GPIO if the device is not streaming. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_gpio.c | 58 +++++++++++++++++++++++++++++++++++= +--- drivers/media/usb/uvc/uvc_video.c | 4 +++ drivers/media/usb/uvc/uvcvideo.h | 4 +++ 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_g= pio.c index 93727185b9125d5a0ebf7fcede5ed8983ecddd5f..f575b848058f48e3b73a6793e59= d25a3eed1c61a 100644 --- a/drivers/media/usb/uvc/uvc_gpio.c +++ b/drivers/media/usb/uvc/uvc_gpio.c @@ -5,6 +5,7 @@ * Copyright 2024 Google LLC */ =20 +#include #include #include #include @@ -16,6 +17,9 @@ static irqreturn_t uvc_gpio_irq(int irq, void *data) struct uvc_gpio *uvc_gpio =3D &dev->gpio_unit->gpio; int new_val; =20 + if (!uvc_gpio->gpio_ready) + return IRQ_HANDLED; + new_val =3D gpiod_get_value_cansleep(uvc_gpio->gpio_privacy); if (new_val < 0) return IRQ_HANDLED; @@ -26,6 +30,24 @@ static irqreturn_t uvc_gpio_irq(int irq, void *data) return IRQ_HANDLED; } =20 +static const struct dmi_system_id privacy_valid_during_streamon[] =3D { + { + .ident =3D "HP Elite c1030 Chromebook", + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "HP"), + DMI_MATCH(DMI_PRODUCT_NAME, "Jinlon"), + }, + }, + { + .ident =3D "HP Pro c640 Chromebook", + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "HP"), + DMI_MATCH(DMI_PRODUCT_NAME, "Dratini"), + }, + }, + { } /* terminate list */ +}; + int uvc_gpio_parse(struct uvc_device *dev) { struct gpio_desc *gpio_privacy; @@ -51,6 +73,15 @@ int uvc_gpio_parse(struct uvc_device *dev) if (!unit) return -ENOMEM; =20 + /* + * 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 |=3D UVC_QUIRK_PRIVACY_DURING_STREAM; + else + unit->gpio.gpio_ready =3D true; + unit->gpio.gpio_privacy =3D gpio_privacy; unit->gpio.irq =3D irq; strscpy(unit->name, "GPIO", sizeof(unit->name)); @@ -61,6 +92,16 @@ int uvc_gpio_parse(struct uvc_device *dev) return 0; } =20 +void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on) +{ + if (!dev->gpio_unit || !(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)) + return; + + dev->gpio_unit->gpio.gpio_ready =3D stream_on; + if (stream_on) + uvc_gpio_irq(0, dev); +} + int uvc_gpio_init(struct uvc_device *dev) { struct uvc_entity *unit =3D dev->gpio_unit; @@ -70,10 +111,6 @@ int uvc_gpio_init(struct uvc_device *dev) if (!unit || unit->gpio.irq < 0) return 0; =20 - init_val =3D gpiod_get_value_cansleep(unit->gpio.gpio_privacy); - if (init_val < 0) - return init_val; - ret =3D request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq, IRQF_ONESHOT | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, @@ -81,6 +118,19 @@ int uvc_gpio_init(struct uvc_device *dev) if (ret) return ret; =20 + if ((dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)) { + uvc_gpio_quirk(dev, false); + init_val =3D false; + } else { + unit->gpio.gpio_ready =3D true; + + init_val =3D gpiod_get_value_cansleep(unit->gpio.gpio_privacy); + if (init_val < 0) { + free_irq(unit->gpio.irq, dev); + return init_val; + } + } + input_report_switch(dev->input, SW_CAMERA_LENS_COVER, init_val); input_sync(dev->input); =20 diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index 2e377e7b9e81599aca19b800a171cc16a09c1e8a..516cf9bccc25ce2b7c82a3f9782= 6e77287bdd1af 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -2356,6 +2356,8 @@ int uvc_video_start_streaming(struct uvc_streaming *s= tream) if (ret < 0) goto error_video; =20 + uvc_gpio_quirk(stream->dev, true); + return 0; =20 error_video: @@ -2368,6 +2370,8 @@ int uvc_video_start_streaming(struct uvc_streaming *s= tream) =20 void uvc_video_stop_streaming(struct uvc_streaming *stream) { + uvc_gpio_quirk(stream->dev, false); + uvc_video_stop_transfer(stream, 1); =20 if (stream->intf->num_altsetting > 1) { diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index aca857d3f5608550faa5241f3b515bb9837f70ab..827ea2eb676c81cabb8051485b6= e6813e9c6dca8 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -79,6 +79,7 @@ #define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000 #define UVC_QUIRK_MJPEG_NO_EOF 0x00020000 #define UVC_QUIRK_MSXU_META 0x00040000 +#define UVC_QUIRK_PRIVACY_DURING_STREAM 0x00080000 =20 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 @@ -242,6 +243,7 @@ struct uvc_entity { struct uvc_gpio { int irq; bool initialized; + bool gpio_ready; struct gpio_desc *gpio_privacy; } gpio; }; @@ -820,10 +822,12 @@ size_t uvc_video_stats_dump(struct uvc_streaming *str= eam, char *buf, int uvc_gpio_parse(struct uvc_device *dev); int uvc_gpio_init(struct uvc_device *dev); void uvc_gpio_deinit(struct uvc_device *dev); +void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on); #else static inline int uvc_gpio_parse(struct uvc_device *dev) {return 0; } static inline int uvc_gpio_init(struct uvc_device *dev) {return 0; } static inline void uvc_gpio_deinit(struct uvc_device *dev) {}; +static inline void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on) = {}; #endif =20 #endif --=20 2.50.0.727.gbf7dc18ff4-goog From nobody Mon Oct 6 17:02:10 2025 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B429E2DEA8D for ; Fri, 18 Jul 2025 15:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852559; cv=none; b=nMC4HskKK2OsnNYC0HG5XDvnU2wvyJ+v6yrybWgVvMxp7nm/TRDxNRcXJtKRLfRwKMjkzohTxSxcKI6uvnN5icEWQfREC5dpyoolwbUHvMBFuvw1WtWy6VI5Thm2DCPN0YTo5FhubCImEpnjQdCifX66UVgb6DODeR+05TWZ70E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852559; c=relaxed/simple; bh=jswtptbP7BU30DkQJa9LKXhBgvdihRwmLkqJGTFd6vk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qv90ntl1dFkGmYrUVIlb17FD7ABjmfSLPam/3T505+DjWC7klTkz9dyR2QlauSLenvFmbdd8IFkU9Z7GVg3Q05f8t6mQD6Mp9xpl7+EcInEQ7j7Y13fhvSKXNBmjEPIMWpZiHE1F8LFkKgFISlqm/Sg9cf52toFMmVTuD2XrTDw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=MRCajQuy; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="MRCajQuy" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-32ce1b2188dso19271581fa.3 for ; Fri, 18 Jul 2025 08:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1752852555; x=1753457355; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=8aDpTgnQPPvRmQrHT77aLOY5jY2VFuPA/ovdljmguB4=; b=MRCajQuyXxTQc7Nr8SJekfjPTNsuqXhItwoflKGGOigxcFu5X42z0x8rSF/UNDUaP/ 1p4dKaDdjFuxJ+c27Qyp9Em0ulx5/WJ3hJkmD/mqqMnpbAqk3eahCBu2FT8863tO0TvX s7UIbY+pYJK19d0WSEzZZkcNpPOqWbMH3H1GY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752852555; x=1753457355; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8aDpTgnQPPvRmQrHT77aLOY5jY2VFuPA/ovdljmguB4=; b=S8Gv0TEJsEwd5CTlXHj/aTGswKdYe5769wLpbHzdoGCA4Di9Cv1wZEgYIeMHAvT4qK ry6waEV9RrpFDIbmr0Qepjfp9PYcRW7NC4idC0tY13YpmjivXuj1TJtJpNB0opIofYTB d0S9jZfeTu9FtLq2HAr44jumznH3Lo+716Q1kuXkAgHE92jFQ2+2AQE1G1uHZzCkLA1S OnBVYK6Fnr8yw2pgQCa+NRY3xgUQDrHga91dV5BxouEjytzSBuiSEZ6IDhRWESkw9ZEt vN1X0dV7J241LbDQW89cy2QkTvIX9sP8m+x/zesHIJPowuZyBDJo8TklQhhVum1pH4uT C1Cg== X-Gm-Message-State: AOJu0Yxi0dKF/kQ9AFb2qTZ7h26v3DX76gKbZsNrBo/DDqOL2LvN2s93 eJ8qXK4NtWaS+m6CidV3fbR6K3MJ2rS9GMqkwCI2oeMTuRXdoSxLUvhsMSxO5UAATQ== X-Gm-Gg: ASbGncu/z2xSbSgHo3ktX1ntuLccVdnUSmy4m5TxEz0lwWPiS0N/hlwiSMKbr7RBluk D7cCSl0nf5ERtNgwwvgatfYQlHNRWH1mHASMguqE116saF/SewaV2PYkkND0i92WYkoxSyMGXzZ tDZdS+c7jvoNImZl0Hf/hjEDh8V2r9Wc1uAQWaKqK2NrpciFE0DaFti/hdsrjsNE3gQt1XHccKA P7KAu3q9w3ORppSBQJpYduNjbGFMOHzTHnil2MQNUr2ma0+pxnZdX4OmC8//2klNW7d4V+lRSB0 HiYe4k2cLW7cAaNsvYefvJc8kkluiKx3m5ffqlj+oP3A+YFe4E2TDswke4YtvrjRDCkZWAOoBfo 8avS0JykzjUi0fYFA/pkI1tRWfnP5lLt+AaScAHQGn2PiQm0d9B47CVHAoIb/YAD47WW4Ujrzbt RawKkLSH5v/UB0 X-Google-Smtp-Source: AGHT+IH0fb8dYdBwEnxw/wvuoV9A2tmNmLlLkqb1iZQSIYHHpJCcEfC1vgh7mpiRVMnNAFT2fJEXvQ== X-Received: by 2002:a05:651c:2c7:b0:32a:86ea:a1f2 with SMTP id 38308e7fff4ca-3309a578a3emr16245931fa.22.1752852554678; Fri, 18 Jul 2025 08:29:14 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-330a91d9d6dsm2268601fa.83.2025.07.18.08.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 08:29:14 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 18 Jul 2025 15:29:13 +0000 Subject: [PATCH v5 4/5] media: uvcvideo: Make gpio_unit entity-less Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250718-uvc-subdev-v5-4-a5869b071b0d@chromium.org> References: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> In-Reply-To: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Hans de Goede , Linus Walleij , Bartosz Golaszewski , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Yunke Cao , linux-gpio@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda , Hans Verkuil , Hans de Goede X-Mailer: b4 0.14.2 Now that we do not need to export a control there is no need to create an entity. Move the uvc_gpio structure to uvc_device. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 7 ------- drivers/media/usb/uvc/uvc_gpio.c | 39 +++++++++++++++-------------------= ---- drivers/media/usb/uvc/uvc_status.c | 4 ++-- drivers/media/usb/uvc/uvcvideo.h | 2 +- 4 files changed, 18 insertions(+), 34 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 89a4ac8a358f508220bca43078964bc2a8a6c4a5..b79d276732bc80ef175ffdbaa73= b6395585ff07b 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1755,13 +1755,6 @@ static int uvc_scan_device(struct uvc_device *dev) return -ENODEV; } =20 - /* Add GPIO entity to the first chain. */ - if (dev->gpio_unit) { - chain =3D list_first_entry(&dev->chains, - struct uvc_video_chain, list); - list_add_tail(&dev->gpio_unit->chain, &chain->entities); - } - return 0; } =20 diff --git a/drivers/media/usb/uvc/uvc_gpio.c b/drivers/media/usb/uvc/uvc_g= pio.c index f575b848058f48e3b73a6793e59d25a3eed1c61a..5da67c260f02dff7bbe2eb3849e= 8dfc939ad1d82 100644 --- a/drivers/media/usb/uvc/uvc_gpio.c +++ b/drivers/media/usb/uvc/uvc_gpio.c @@ -14,7 +14,7 @@ static irqreturn_t uvc_gpio_irq(int irq, void *data) { struct uvc_device *dev =3D data; - struct uvc_gpio *uvc_gpio =3D &dev->gpio_unit->gpio; + struct uvc_gpio *uvc_gpio =3D &dev->gpio_unit; int new_val; =20 if (!uvc_gpio->gpio_ready) @@ -51,7 +51,6 @@ static const struct dmi_system_id privacy_valid_during_st= reamon[] =3D { int uvc_gpio_parse(struct uvc_device *dev) { struct gpio_desc *gpio_privacy; - struct uvc_entity *unit; int irq; =20 gpio_privacy =3D devm_gpiod_get_optional(&dev->intf->dev, "privacy", @@ -69,10 +68,6 @@ int uvc_gpio_parse(struct uvc_device *dev) return dev_err_probe(&dev->intf->dev, irq, "No IRQ for privacy GPIO\n"); =20 - unit =3D uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1); - if (!unit) - return -ENOMEM; - /* * Note: This quirk will not match external UVC cameras, * as they will not have the corresponding ACPI GPIO entity. @@ -80,38 +75,33 @@ int uvc_gpio_parse(struct uvc_device *dev) if (dmi_check_system(privacy_valid_during_streamon)) dev->quirks |=3D UVC_QUIRK_PRIVACY_DURING_STREAM; else - unit->gpio.gpio_ready =3D true; - - unit->gpio.gpio_privacy =3D gpio_privacy; - unit->gpio.irq =3D irq; - strscpy(unit->name, "GPIO", sizeof(unit->name)); - list_add_tail(&unit->list, &dev->entities); + dev->gpio_unit.gpio_ready =3D true; =20 - dev->gpio_unit =3D unit; + dev->gpio_unit.gpio_privacy =3D gpio_privacy; + dev->gpio_unit.irq =3D irq; =20 return 0; } =20 void uvc_gpio_quirk(struct uvc_device *dev, bool stream_on) { - if (!dev->gpio_unit || !(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)) + if (!(dev->quirks & UVC_QUIRK_PRIVACY_DURING_STREAM)) return; =20 - dev->gpio_unit->gpio.gpio_ready =3D stream_on; + dev->gpio_unit.gpio_ready =3D stream_on; if (stream_on) uvc_gpio_irq(0, dev); } =20 int uvc_gpio_init(struct uvc_device *dev) { - struct uvc_entity *unit =3D dev->gpio_unit; int init_val; int ret; =20 - if (!unit || unit->gpio.irq < 0) + if (!dev->gpio_unit.gpio_privacy) return 0; =20 - ret =3D request_threaded_irq(unit->gpio.irq, NULL, uvc_gpio_irq, + ret =3D request_threaded_irq(dev->gpio_unit.irq, NULL, uvc_gpio_irq, IRQF_ONESHOT | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "uvc_privacy_gpio", dev); @@ -122,11 +112,12 @@ int uvc_gpio_init(struct uvc_device *dev) uvc_gpio_quirk(dev, false); init_val =3D false; } else { - unit->gpio.gpio_ready =3D true; + dev->gpio_unit.gpio_ready =3D true; =20 - init_val =3D gpiod_get_value_cansleep(unit->gpio.gpio_privacy); + init_val =3D + gpiod_get_value_cansleep(dev->gpio_unit.gpio_privacy); if (init_val < 0) { - free_irq(unit->gpio.irq, dev); + free_irq(dev->gpio_unit.irq, dev); return init_val; } } @@ -134,15 +125,15 @@ int uvc_gpio_init(struct uvc_device *dev) input_report_switch(dev->input, SW_CAMERA_LENS_COVER, init_val); input_sync(dev->input); =20 - unit->gpio.initialized =3D true; + dev->gpio_unit.initialized =3D true; =20 return 0; } =20 void uvc_gpio_deinit(struct uvc_device *dev) { - if (!dev->gpio_unit || !dev->gpio_unit->gpio.initialized) + if (!dev->gpio_unit.initialized) return; =20 - free_irq(dev->gpio_unit->gpio.irq, dev); + free_irq(dev->gpio_unit.irq, dev); } diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc= _status.c index 664ba59af8ecad5511c9dea924bf037b2aafc0d0..dbffed828761202c62c003b9200= fd9916b16a969 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -44,7 +44,7 @@ static int uvc_input_init(struct uvc_device *dev) struct input_dev *input; int ret; =20 - if (!uvc_input_has_button(dev) && !dev->gpio_unit) + if (!uvc_input_has_button(dev) && !dev->gpio_unit.gpio_privacy) return 0; =20 input =3D input_allocate_device(); @@ -64,7 +64,7 @@ static int uvc_input_init(struct uvc_device *dev) __set_bit(KEY_CAMERA, input->keybit); } =20 - if (dev->gpio_unit) { + if (dev->gpio_unit.gpio_privacy) { __set_bit(EV_SW, input->evbit); __set_bit(SW_CAMERA_LENS_COVER, input->swbit); } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 827ea2eb676c81cabb8051485b6e6813e9c6dca8..c098f30b07797281576d7ff533c= de25309be8b61 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -628,7 +628,7 @@ struct uvc_device { const void *data; } async_ctrl; =20 - struct uvc_entity *gpio_unit; + struct uvc_gpio gpio_unit; }; =20 struct uvc_fh { --=20 2.50.0.727.gbf7dc18ff4-goog From nobody Mon Oct 6 17:02:10 2025 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 638A22E0402 for ; Fri, 18 Jul 2025 15:29:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852561; cv=none; b=neKeg+NzIO2xOZ4lZfZJlMjM0jz50D+LFs1pA4UMGo+QS4pJWFrh6pDukc0KX6A9sAwxnn71r/AdjFom56iYMbeQizcUtsQAhKcTpQJIha2lHvImZ9jWw0B5nWgfb4ypwCYcwzCmHX1L5xofyupWOktMotsSEi5LxMQ1pX43Wro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852561; c=relaxed/simple; bh=SILD7FqXDKzPN+v5mJfgmM2lCLPnFDjcKYYpG/ct3s0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UMnjFLSVty+Uv/L4sZgu2l27qVZcN91W1iOiH0Z6ebVERGWNQ/UKcGdRRxF0ZnB0YPgslMHX0wHBj5hYeHffzcS6o+tEjK20SHGEefB0MkP68MsaIT/Ja5f1rKZ9x6HWvwpwhes6O9k9szJrsjSCLNTx/YcPJtdnrrQy58/YM2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=dQEKioxu; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="dQEKioxu" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-553b5165cf5so2642644e87.0 for ; Fri, 18 Jul 2025 08:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1752852555; x=1753457355; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VW6jrFQzXbLcjEcOPYhLhert2s0KBo9YRnvAtQmafP0=; b=dQEKioxuMUhEVjxMKVd1pE1pf6VdIUG+LptdSUJX2R9XvqQgtRoAk43/8eYaUsrzU/ 0wYiBYvDQDPo0pI9Qy7xkEtH8Sthbqe3mUDcda040WmzjrSQ0jJ4jweJXJ6xJAQ8lzrP qo4yYrfeBvnD82w5MK1xQQtqcR5vbPYe68Hj8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752852555; x=1753457355; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VW6jrFQzXbLcjEcOPYhLhert2s0KBo9YRnvAtQmafP0=; b=P5BnhggdVRllRMRZcYvEmE7JG9/2X5YW6amCzxJKEOFR1Dov7K0hkQWNyQ8mMCQXFt dpiwfsfmu79YsUNtB7rdZFdee32QQaAGr1aDBAQtUNLY7jGCV4shfjrQZHW7tSvDsnZt eV8WVWEovDQ9uUUO1ahwq8L1bPeD+ASW2lwJlAEkUWR0ZY6Ch7HTZ+sY9buu1EgL2X8S GBTEXzgquDL0h+bsKW1+PHtzfnDzGQXffzY8uAUjv3NLX/Iz+5CRrkDJXOT6gRom5DrZ rjCNP64px7ZHt4n6A7LCatsuWrCWJe6uSDfBYwnZn+EMUIRX+hGjTTtqG184UlmTTFEA pLPA== X-Gm-Message-State: AOJu0YzW92zt+Eb/fj3KKso8IlBiY983vtNahyqoyKj2nTGrDtUJpbb9 5vnjWyqw++9JzjDOe9C7FmX6foi88UzOszl/m++td5RKDLDt4qjUbZvGFZxuLXHkrg== X-Gm-Gg: ASbGncu/RSR2kIyMlmlTgxAGGaPQoENzcrZhUrI20oocmRRbhZ49xyvuyfOEFwpSCfv OlS2A6GjKOvSouEdfOigOENCwrzz/AWGnagzXgmXXDqsnInba4MPf9/VhtErB0eVZO0ArAHKDrH tMdv/GfIC7oOYA0bVXtF7o9KV1f4XG4d65V8gc9PrnBhoUaUDb1jOMCGBfRZRr0BDrk7t3NkJST rZwdLxaCyb1FtVpoT6jezHjybxhDCXb/LodEuNVEw5Cy0p6NIkyLaraJaiLvaLogoAh+kJp8HU+ x4/WVihfnKxbjsaW96L3Fv5dk5BWBX4R2g18jDPla2x5AyfK1YGt9MFyJlDpzbxPNVv5YCIvhYq e1w6c7VRM/nFSyvZEmZ8drOlT+TWimqO9XKqXNnH2sJ63wtnNN4D0QsF5MmTu1qsUfrNaXtvN5u qIPA== X-Google-Smtp-Source: AGHT+IFzEZudqyc1gvkTsADJ1J0J6zl9peQTdQgm9si/Z20OV6QzPGlTr3dUVncj75ikKEgrskz53A== X-Received: by 2002:a05:651c:2149:b0:32b:2fba:8b90 with SMTP id 38308e7fff4ca-3308e37166fmr22654361fa.14.1752852555208; Fri, 18 Jul 2025 08:29:15 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-330a91d9d6dsm2268601fa.83.2025.07.18.08.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 08:29:14 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 18 Jul 2025 15:29:14 +0000 Subject: [PATCH v5 5/5] media: uvcvideo: Remove UVC_EXT_GPIO entity Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250718-uvc-subdev-v5-5-a5869b071b0d@chromium.org> References: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> In-Reply-To: <20250718-uvc-subdev-v5-0-a5869b071b0d@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Hans de Goede , Linus Walleij , Bartosz Golaszewski , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Yunke Cao , linux-gpio@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda , Hans Verkuil , Hans de Goede X-Mailer: b4 0.14.2 The only implementation of this entity was the external privacy gpio, which now does not require to emulate an entity. Remove all the dead code. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 4 ---- drivers/media/usb/uvc/uvc_entity.c | 1 - drivers/media/usb/uvc/uvcvideo.h | 20 +++++++------------- include/linux/usb/uvc.h | 3 --- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index b79d276732bc80ef175ffdbaa73b6395585ff07b..d19b5a200971654161267dc755a= ec2a06b5fdc9e 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -789,7 +789,6 @@ static int uvc_parse_streaming(struct uvc_device *dev, } =20 static const u8 uvc_camera_guid[16] =3D UVC_GUID_UVC_CAMERA; -static const u8 uvc_gpio_guid[16] =3D UVC_GUID_EXT_GPIO_CONTROLLER; static const u8 uvc_media_transport_input_guid[16] =3D UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT; static const u8 uvc_processing_guid[16] =3D UVC_GUID_UVC_PROCESSING; @@ -821,9 +820,6 @@ struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, u= nsigned int num_pads, * is initialized by the caller. */ switch (type) { - case UVC_EXT_GPIO_UNIT: - memcpy(entity->guid, uvc_gpio_guid, 16); - break; case UVC_ITT_CAMERA: memcpy(entity->guid, uvc_camera_guid, 16); break; diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc= _entity.c index cc68dd24eb42dce5b2846ca52a8dfa499c8aed96..94e0119746e4689a45960955a35= be93a25bc16c4 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c @@ -105,7 +105,6 @@ static int uvc_mc_init_entity(struct uvc_video_chain *c= hain, case UVC_OTT_DISPLAY: case UVC_OTT_MEDIA_TRANSPORT_OUTPUT: case UVC_EXTERNAL_VENDOR_SPECIFIC: - case UVC_EXT_GPIO_UNIT: default: function =3D MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; break; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index c098f30b07797281576d7ff533cde25309be8b61..b4eaca187d61b2e9f8a4af6ac6a= c071145b48df2 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -39,9 +39,6 @@ (UVC_ENTITY_IS_TERM(entity) && \ ((entity)->type & 0x8000) =3D=3D UVC_TERM_OUTPUT) =20 -#define UVC_EXT_GPIO_UNIT 0x7ffe -#define UVC_EXT_GPIO_UNIT_ID 0x100 - /* ------------------------------------------------------------------------ * Driver specific constants. */ @@ -189,8 +186,7 @@ struct uvc_entity { =20 /* * Entities exposed by the UVC device use IDs 0-255, extra entities - * implemented by the driver (such as the GPIO entity) use IDs 256 and - * up. + * implemented by the driver use IDs 256 and up. */ u16 id; u16 type; @@ -239,13 +235,6 @@ struct uvc_entity { u8 *bmControls; u8 *bmControlsType; } extension; - - struct uvc_gpio { - int irq; - bool initialized; - bool gpio_ready; - struct gpio_desc *gpio_privacy; - } gpio; }; =20 u8 bNrInPins; @@ -628,7 +617,12 @@ struct uvc_device { const void *data; } async_ctrl; =20 - struct uvc_gpio gpio_unit; + struct uvc_gpio { + int irq; + bool initialized; + bool gpio_ready; + struct gpio_desc *gpio_privacy; + } gpio_unit; }; =20 struct uvc_fh { diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h index ee19e9f915b8370c333c426dc1ee4202c7b75c5b..6858675ce70dc0a872edd475316= 82bc415f83bd9 100644 --- a/include/linux/usb/uvc.h +++ b/include/linux/usb/uvc.h @@ -26,9 +26,6 @@ #define UVC_GUID_UVC_SELECTOR \ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02} -#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_MSXU_1_5 \ {0xdc, 0x95, 0x3f, 0x0f, 0x32, 0x26, 0x4e, 0x4c, \ 0x92, 0xc9, 0xa0, 0x47, 0x82, 0xf4, 0x3b, 0xc8} --=20 2.50.0.727.gbf7dc18ff4-goog