From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 B31051FFC5C for ; Thu, 3 Apr 2025 19:16:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707789; cv=none; b=hy2VMODyr7eHkePm0kADyyYGMtpIwItJgXXzPH4CbfinsqGMLr08jItr3ELKHiKcyHqxgZynpkeiE7LDy3/y1C+EAg4RVrdZzb9BhiQXvJN/jqZkLbnNUk+G7O+4IjyzSWGGXVmroqo/QrfTO/dHFb2zbCWiAok7D5xKdBziikA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707789; c=relaxed/simple; bh=uYdW8UWkO7Lkj0/PLTSMCHmI2BhYM1Fy016gz/jcaNo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Z915P9ZolECIeKhtHvB3NIA7y081g4Yuzg6rM8bLsDDQJmIXkHSmfZVWRrAuOIjjwl3EIrekhuYKqt9B8fRt/6dTXwrphyh1I8S6rnhWjwYYohH8RkbTZKR11NrgLvdaPkLzDBctZdpxilbV+kCf/51v0xzg5mqIuAj4x22q9tI= 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=hsA8ykcF; arc=none smtp.client-ip=209.85.167.43 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="hsA8ykcF" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-549946c5346so1464039e87.2 for ; Thu, 03 Apr 2025 12:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707785; x=1744312585; 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=IFGb4OSmEELjX3L+UUTsl617UgttQGz/GrFW7lOnFds=; b=hsA8ykcFMc2t6vy9DIiQOxfpKQ+jowvmwUZKpp9Wx/5Nh/ejujC792sJeY/bUgMZRb ydQ/8xMVBA1Wpa49DoIJ+3RNSYbny+tjii1aklXIq2qDg+IKSBHYfTfTxG0IZYEv5D/K Cbjbw+Q9xFOLDRO0/Nrfm9IgaIaDgrZ7p9rRQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707785; x=1744312585; 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=IFGb4OSmEELjX3L+UUTsl617UgttQGz/GrFW7lOnFds=; b=oTM0f1iOhVv8t6NGj3dwlReVqIB31hB7kf9Z/TcoY1iiZE5yUZJc27TT68H9UoaOlA bdt/xhXAVbX1Xrkt+P1naQZuwBwz6VLi4tYOgiUGWoz16PJZirSKusfP1OmqXR7afH3e qsUvb0OOA8hisZeP//mlBfjOA2FuzMR82IXHTOdu7N6GGg9/6zIJ76locwAtFV59yaoV Y+nKR9A4s3BEIEchL8iVnIlfC1yjKZ3Ai0izY40k1BHqElwgtLb1SbE/skLWYhORE4uK 8gAynF+z5oveRIJfZTwjKQZrT+0jW5n/XgY7712LvhR5Qy08fi6NhtrlUhRDFr4rd9jC 04aA== X-Forwarded-Encrypted: i=1; AJvYcCWll+n9K2mKyYGOmnFCXwv0FFLKlvV2lzdI4Gj3rz8l1CSeqbB50bVvYTBPKwo3XzZvD8ondHPo9YBJiQM=@vger.kernel.org X-Gm-Message-State: AOJu0YzmHm64EB2MKgVAsto7q3y0XL9wulB+Ja4vp1Yv1t4Plu13w98A RFBRSpik8GFqCurID6tIYV0D00Oa5MkqVzpdnxiA1wiosZZclIK88xoMwIHPoQ== X-Gm-Gg: ASbGnctIGZzYxrsxvbxxmW2RGq+lqjRH5GW0UwWpLIqKn4eagbxA0eNkPi4KM8oxI02 lyf8WMy6fIgpau93Dgz32Nj3JttwMmc9i9IF4VinE2CKMASTDsyKFNasZGnUsLKHk/ikp+0532v 7Nz7GSh3oGcQnBV+7pA7tiXOo4uyHO6CHkcQvmqv9nLaO/j+71frdEKmibMHd/VLfRkGF1oySai JlNgE4ydoibtA1BqfntY9lQCg+RXKth37g493kkFn4yiT3oDber1kdlQ1RRNCB5CJFJeXR3an3s LhPr7gilR/toPafPGuA5ZhDjAh6EuJ6FZe11Mtg4iKR6rPPHDX+eMiM7/vDuaz0zYIy5w2s6HgY tLyLho7pu0uJuwkdvSxfo3kZt X-Google-Smtp-Source: AGHT+IHlTjBkC/TNKA88/1+phuhgnK0El1kOI/FDaapJX6tSIZfWFhb6k+73fZ8xYXGiKrRLbFD6xg== X-Received: by 2002:a05:6512:15a8:b0:54b:117c:8ef3 with SMTP id 2adb3069b0e04-54c22800e8dmr78511e87.54.1743707784704; Thu, 03 Apr 2025 12:16:24 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:24 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:12 +0000 Subject: [PATCH 1/8] media: uvcvideo: Fix deferred probing error 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: <20250403-uvc-orientation-v1-1-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org, Douglas Anderson X-Mailer: b4 0.14.2 uvc_gpio_parse() can return -EPROBE_DEFER when the GPIOs it depends on have not yet been probed. This return code should be propagated to the caller of uvc_probe() to ensure that probing is retried when the required GPIOs become available. Currently, this error code is incorrectly converted to -ENODEV, causing some internal cameras to be ignored. This commit fixes this issue by propagating the -EPROBE_DEFER error. Cc: stable@vger.kernel.org Fixes: 2886477ff987 ("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT") Reviewed-by: Douglas Anderson Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 107e0fafd80f54ec98c9657e5d58d17a6ed8c02f..25e9aea81196e0eddba6de74951= a46a97ae0bdb8 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2232,13 +2232,16 @@ static int uvc_probe(struct usb_interface *intf, #endif =20 /* Parse the Video Class control descriptor. */ - if (uvc_parse_control(dev) < 0) { + ret =3D uvc_parse_control(dev); + if (ret < 0) { + ret =3D -ENODEV; uvc_dbg(dev, PROBE, "Unable to parse UVC descriptors\n"); goto error; } =20 /* Parse the associated GPIOs. */ - if (uvc_gpio_parse(dev) < 0) { + ret =3D uvc_gpio_parse(dev); + if (ret < 0) { uvc_dbg(dev, PROBE, "Unable to parse UVC GPIOs\n"); goto error; } @@ -2264,24 +2267,32 @@ static int uvc_probe(struct usb_interface *intf, } =20 /* Register the V4L2 device. */ - if (v4l2_device_register(&intf->dev, &dev->vdev) < 0) + ret =3D v4l2_device_register(&intf->dev, &dev->vdev); + if (ret < 0) goto error; =20 /* Scan the device for video chains. */ - if (uvc_scan_device(dev) < 0) + if (uvc_scan_device(dev) < 0) { + ret =3D -ENODEV; goto error; + } =20 /* Initialize controls. */ - if (uvc_ctrl_init_device(dev) < 0) + if (uvc_ctrl_init_device(dev) < 0) { + ret =3D -ENODEV; goto error; + } =20 /* Register video device nodes. */ - if (uvc_register_chains(dev) < 0) + if (uvc_register_chains(dev) < 0) { + ret =3D -ENODEV; goto error; + } =20 #ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device node */ - if (media_device_register(&dev->mdev) < 0) + ret =3D media_device_register(&dev->mdev); + if (ret < 0) goto error; #endif /* Save our data pointer in the interface data. */ @@ -2315,7 +2326,7 @@ static int uvc_probe(struct usb_interface *intf, error: uvc_unregister_video(dev); kref_put(&dev->ref, uvc_delete); - return -ENODEV; + return ret; } =20 static void uvc_disconnect(struct usb_interface *intf) --=20 2.49.0.504.g3bcea36a83-goog From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 427E71FFC70 for ; Thu, 3 Apr 2025 19:16:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707790; cv=none; b=j3rSALl2jF8GS3JO+gmV0S0mKVlYkS3iFLXMN1KijswLQz7HWmz+3Wl89RnTZL8uy4aaxclwRWFFfWIlP2sZhcId//JnirpUxhcf2ULvBiy5mC2yjP/AiBk7NklTshHc1wpJQOMyk2lwT+rJbRddzSpk0XgdGIY6Hh3u5CzUI5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707790; c=relaxed/simple; bh=Wk0eWcuzWua/Qg5JYIHzxP7iyJmxxh8gGdGpfJV3+s8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IUN+GfgL9NLE02uSpW/wJXxnvVj6w6tbaYrP56lYw54H3Fu9T6uyirVQHPlcVVRlsfpwoNHPBq/YWeEFpb5qQau8na1lmrRDQrvTm4PGPK65BqPj9HqIXT8zw8EEexYqlvpBhyY/Gs2kpXnkbZs/CszfMniAUogSLWMyJK3NXJA= 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=DWgwO9MS; arc=none smtp.client-ip=209.85.167.44 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="DWgwO9MS" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-54996d30bfbso1168040e87.2 for ; Thu, 03 Apr 2025 12:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707785; x=1744312585; 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=uYoADrO9YZr1hNVt8FHHeiiSHUxZ6kaNBXaVFMruk+4=; b=DWgwO9MSWkKsNzZMC1zNRqXdDRAAWPff8lY2AmYm3PblwLKcMXt/NkDHDtHVm4x83n 2A8V8L1ZBAsC4gzccm/aotFQlP7sJJmD5BKMNUz60qx08wz8QJRy62Y/gKgNbjzN7yQ/ vmv10DmO5RqtS4diElpgm3KGnqAL2qIoFbVDI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707785; x=1744312585; 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=uYoADrO9YZr1hNVt8FHHeiiSHUxZ6kaNBXaVFMruk+4=; b=t1LWi4To4G3KR/vBZ9BLlxZNGQachz6K874K40XEkbZx9cGMQNl8l3HRCEL3ZlqSQv wbvSvWnyEKLb+k6rums+HodTHtt65p5oQijf2KVug3bU2kW6tiImCKt37k93x1juAZ1x jxeNqoFI1LKXU42oEVC21bK3CAWXgvhijEiX9eB4kL/2L0UNAe1gpvUVGxizBsTDcKlR VnEml3LtkW0TBcO5DTmggq8bXjEsi2/WAs/7Jsj9B8wBLZvCZSdFdYH+vXB/bhA0vT/t YOaDtN8P3PoM9rVPvkViFVzI+L0Obj3dgPPNQA5xp5gaih3EHtdR2fTklQKtz7Hf4vns 2syQ== X-Forwarded-Encrypted: i=1; AJvYcCWLXSLQRKCCcDZleznF3b4nXD3MiEBEAP7wj62AfWCuQ8dJJbqKkrdBpU0MPjScMuTE98RYZ1MkttxvKZk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywy/MfPbYLfTXv+QWOX0GpBkC2fm6rcPPXlugF3F03wbfz02hNm tMOsLcxV/8Eo87VVrO/q5oHOtSR9EUvlfWu/TADinIPDhA0nf3ss2DXAZO4qFS3KbDPqfEqSyV8 = X-Gm-Gg: ASbGnct6drzaKSJvvooipmyzMIPks0fitMSSXXQwcrKWEzbd292A8+aybLGOCQQNTF9 CQjvYKTtNrwLbtR+tQGtFjNhjePBy1xeuAbFxM06ZRTYYpRtMFTmhdsorSC05lrmhL9q96U8CEN smQPIMqwmc5DSlmoMwh16T1mInpH/Jl9ZHWnDCPJIHwLDP0LARovjVYhItvpgYyShUQYlzQy6bY c96qAKpF3FeusFxuonioh6JsXFpdMU8SU184xs227I2tROHSMRzgiTX5UTD80Wj97bxwiPLBuab voEEZBm10aZy+JwGzn8pfYa0zv0ZWXepWgOdrS1IY4tSM7ztAzPltLzay5exKfswdRtPJYsiPKh wRwvPQMR0NVlr2kKiLBk2HSA7bXijxFRxQSc= X-Google-Smtp-Source: AGHT+IEGoLkshPtfD44DKnSZEUYb7gfzSjncS4T82uGZM/B3/E2lVpGdvLMrx6Bl5sLRu/jazB7Lrg== X-Received: by 2002:a05:6512:3048:b0:542:213f:78fd with SMTP id 2adb3069b0e04-54c227f589amr79715e87.40.1743707785277; Thu, 03 Apr 2025 12:16:25 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:24 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:13 +0000 Subject: [PATCH 2/8] media: uvcvideo: Use dev_err_probe for devm_gpiod_get_optional 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: <20250403-uvc-orientation-v1-2-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda , Doug Anderson , Douglas Anderson X-Mailer: b4 0.14.2 Use the dev_err_probe() helper for devm_gpiod_get_optional(), like we do with gpiod_to_irq() That eventually calls device_set_deferred_probe_reason() which can be helpful for tracking down problems. Now that all the error paths in uvc_gpio_parse have dev_err_probe, we can remove the error message in uvc_probe. Suggested-by: Doug Anderson Reviewed-by: Douglas Anderson Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 25e9aea81196e0eddba6de74951a46a97ae0bdb8..da24a655ab68cc0957762f2b673= 87677c22224d1 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1299,8 +1299,13 @@ static int uvc_gpio_parse(struct uvc_device *dev) =20 gpio_privacy =3D devm_gpiod_get_optional(&dev->intf->dev, "privacy", GPIOD_IN); - if (IS_ERR_OR_NULL(gpio_privacy)) - return PTR_ERR_OR_ZERO(gpio_privacy); + 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"); =20 irq =3D gpiod_to_irq(gpio_privacy); if (irq < 0) @@ -2241,10 +2246,8 @@ static int uvc_probe(struct usb_interface *intf, =20 /* Parse the associated GPIOs. */ ret =3D uvc_gpio_parse(dev); - if (ret < 0) { - uvc_dbg(dev, PROBE, "Unable to parse UVC GPIOs\n"); + if (ret < 0) goto error; - } =20 dev_info(&dev->udev->dev, "Found UVC %u.%02x device %s (%04x:%04x)\n", dev->uvc_version >> 8, dev->uvc_version & 0xff, --=20 2.49.0.504.g3bcea36a83-goog From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 E196820011F for ; Thu, 3 Apr 2025 19:16:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707791; cv=none; b=MiofDgYMM8rX0yIn0cuAddLP4K+GBfV7wDa5TtO5i5EPqOAuFedjP1guSZd4dCQMWV3XSOZoJhWz3FLkQeCjL1YAKl+u9EWGArrRfUbB3tsNG1YyZVt/pflUD27K4xMJvq8MQJNLPGvo6I14t2x6k65zOB5g5RFGJat+kVKIJlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707791; c=relaxed/simple; bh=bGaAiPeWPDujMReJfDlyeCQH1PMh/OahseP2Qm+tEqI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BVeH3SFoprjRfQuibdyitjPwnkl65/9CIMOH8g7ogdnalYS47nsIt+IHoZyZggxnLu+P2x4xjTi9e88OjqjG5EOpLO8/UFL4CDIJ2IfoDRquAwt1zYSiKQ5xtsWohSER3KKVXYrLSmWZlOwDWeC1Xn65E0JP31siG8pFyYMCTcE= 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=CkE1vVcq; arc=none smtp.client-ip=209.85.167.45 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="CkE1vVcq" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-54acc0cd458so1565111e87.0 for ; Thu, 03 Apr 2025 12:16:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707786; x=1744312586; 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=yEqJQbM1Mf4t3pD37/T8xo0WrUZj8tqnA7nqQpopQiI=; b=CkE1vVcqmJ0VCZcMDdAuIgZ55E3XcNguuTEqB8SAxg3SuSdWoLcHrL4zjrsWbCPNnN 1BBOMSPCKJ9UItHXgbun4sj1cUVQaTnSnY7joVOQWFTtgs+XyFKZWrSRGFtDwVSBjkgY 2LujMk+EasSKezzcYqwIH5ZnlYiz5vehVx0qo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707786; x=1744312586; 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=yEqJQbM1Mf4t3pD37/T8xo0WrUZj8tqnA7nqQpopQiI=; b=TS+zjCcl1mynQMSkh1euQ+HAgs3+bpb/EBH6VmcHrvFTeaUKlCgUFcwm7qDUcg6Wac D11kgC4O2XK6vNcYlRaX4bBz8HAyYM7KyT6hliM8qXXZAomz3MTm2DDX3HnGfGxOm5lf a/ax4XfvI9mY2+V23BH5orzStTCjhG/sNUZFVVx50/DftNSg6jBgspuBxfvpNtpnAAZV AJd8W0dlVPLQW18KJfdMSrrgk1cs/ciXcEj33NSET2jVGYYE+5Fd9PpyCSIJsVRevhet k+DdzafWrkMHL1c1j5vMr8yxjkhgBJfWBo3Sx6BxAUnu5zHoIFZkanx811gxOX64HA7G B58g== X-Forwarded-Encrypted: i=1; AJvYcCW+Qu5fZ/OW1utFNQaygLgWV9Wj34M7MNQ7I1MDQg5Si7s18/8YrX57PQKXyVdvrlW5v/Gnp87zzET2KZo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw48VDfWKrHDfG/iEE+PDq0uofP6tsm7lVIYi/G6848zXT+RYe6 MSdjhZzvq+pI4wh6+KKvq3AUT6qpTZ37lXXynjVK3CPhrv5mcvRxsCrkbGInTw== X-Gm-Gg: ASbGncvg5DxG5RMXM+31+UE/rxO4Ltdckjr1Kf3NyhYeVzZoQf5J0+o18H3w+alhyiH ebPy8/R8dIi9L3KQx5+CNaPwIN5tQ+BAb4yyjp3JRtOlWuY0csaf2/oVqmVq52kNnn8cghWMHiB WnHhAi40fbnf3JenXqYXNW8nv5RAyyGpaeYqdWe5nTHDEPMfAJyvIo6va5eKeOIFXFcBNy8aqAJ YazyauHCbIL9VSAaHvfyffqs6fNKf/bK53YRPwVCD9T1zHekmzTg7tULiKWUH2BXusJfzoBLBs0 lFz4QrTm5zavrxDd9OGKaccj+tZHJH3DYIi0J+WKkbgmmjrE5rBFDPxqK/bh/E/owy4vqSvco7i NLxTLUS7RNkyYpqwoQyFdsqSR X-Google-Smtp-Source: AGHT+IEtxSrTjJbJCoji6jyspDiVzgskf1D1Wes/27FHcNtXF4JkR2nUjJNmG5ErLGGAKBQY96uhEw== X-Received: by 2002:a05:6512:3c9c:b0:545:2c2c:5802 with SMTP id 2adb3069b0e04-54c227fec79mr118358e87.48.1743707785840; Thu, 03 Apr 2025 12:16:25 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:25 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:14 +0000 Subject: [PATCH 3/8] media: v4l: fwnode: Support acpi devices for v4l2_fwnode_device_parse 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: <20250403-uvc-orientation-v1-3-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 This patch modifies v4l2_fwnode_device_parse() to support ACPI devices. We initially add support only for orientation via the ACPI _PLD method. Signed-off-by: Ricardo Ribalda --- drivers/media/v4l2-core/v4l2-fwnode.c | 58 +++++++++++++++++++++++++++++++= ---- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-cor= e/v4l2-fwnode.c index cb153ce42c45d69600a3ec4e59a5584d7e791a2a..81563c36b6436bb61e1c96f2a5e= de3fa9d64dab3 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -15,6 +15,7 @@ * Author: Guennadi Liakhovetski */ #include +#include #include #include #include @@ -807,16 +808,47 @@ int v4l2_fwnode_connector_add_link(struct fwnode_hand= le *fwnode, } EXPORT_SYMBOL_GPL(v4l2_fwnode_connector_add_link); =20 -int v4l2_fwnode_device_parse(struct device *dev, - struct v4l2_fwnode_device_properties *props) +static int v4l2_fwnode_device_parse_acpi(struct device *dev, + struct v4l2_fwnode_device_properties *props) +{ + struct acpi_pld_info *pld; + int ret =3D 0; + + if (!acpi_get_physical_device_location(ACPI_HANDLE(dev), &pld)) { + dev_dbg(dev, "acpi _PLD call failed\n"); + return 0; + } + + switch (pld->panel) { + case ACPI_PLD_PANEL_FRONT: + props->orientation =3D V4L2_FWNODE_ORIENTATION_FRONT; + break; + case ACPI_PLD_PANEL_BACK: + props->orientation =3D V4L2_FWNODE_ORIENTATION_BACK; + break; + case ACPI_PLD_PANEL_TOP: + case ACPI_PLD_PANEL_LEFT: + case ACPI_PLD_PANEL_RIGHT: + case ACPI_PLD_PANEL_UNKNOWN: + props->orientation =3D V4L2_FWNODE_ORIENTATION_EXTERNAL; + break; + default: + dev_dbg(dev, "Unknown _PLD panel val %d\n", pld->panel); + ret =3D -EINVAL; + break; + } + + ACPI_FREE(pld); + return ret; +} + +static int v4l2_fwnode_device_parse_dt(struct device *dev, + struct v4l2_fwnode_device_properties *props) { struct fwnode_handle *fwnode =3D dev_fwnode(dev); u32 val; int ret; =20 - memset(props, 0, sizeof(*props)); - - props->orientation =3D V4L2_FWNODE_PROPERTY_UNSET; ret =3D fwnode_property_read_u32(fwnode, "orientation", &val); if (!ret) { switch (val) { @@ -833,7 +865,6 @@ int v4l2_fwnode_device_parse(struct device *dev, dev_dbg(dev, "device orientation: %u\n", val); } =20 - props->rotation =3D V4L2_FWNODE_PROPERTY_UNSET; ret =3D fwnode_property_read_u32(fwnode, "rotation", &val); if (!ret) { if (val >=3D 360) { @@ -847,6 +878,21 @@ int v4l2_fwnode_device_parse(struct device *dev, =20 return 0; } + +int v4l2_fwnode_device_parse(struct device *dev, + struct v4l2_fwnode_device_properties *props) +{ + struct fwnode_handle *fwnode =3D dev_fwnode(dev); + + memset(props, 0, sizeof(*props)); + + props->orientation =3D V4L2_FWNODE_PROPERTY_UNSET; + props->rotation =3D V4L2_FWNODE_PROPERTY_UNSET; + + if (is_acpi_device_node(fwnode)) + return v4l2_fwnode_device_parse_acpi(dev, props); + return v4l2_fwnode_device_parse_dt(dev, props); +} EXPORT_SYMBOL_GPL(v4l2_fwnode_device_parse); =20 /* --=20 2.49.0.504.g3bcea36a83-goog From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 09319200B8B for ; Thu, 3 Apr 2025 19:16:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707791; cv=none; b=AKppidr48kaFr4kY3roE6/ArYKgPXbEWb+cupgbsJ5fbF/kMI3Q0uBwfNHcAZYpjwOQ9qu+EyNWz5wiBV+XQPVZe/QSMNtrjwYiUk72j3W94ubnBwecRfI3zF7YojJdBdEHR9ZqpmCQ76Cj0+LHbqyUOJLLMAlrtIJq47vy7qhE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707791; c=relaxed/simple; bh=FkbqQupMpzx0wszT8hmcVx+KkNGgx/ddD0tHr201vd4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MQJ0H628V98Owiavd8w4Y2ktHYCUkJYvsBoYRGlSrd3pumk+PreQn2MVOdbeHJ43owjo6Lxgh+Le5sHBq80NHLK2b5f0UjMDb5+JTR2ZiAzaqSLZ7QPgDK8YY54SRtmfZ6SPeccFUVb4EO3TMG54hyx7DCadA73f3b/tZgnQWe4= 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=DUVN8BoL; arc=none smtp.client-ip=209.85.167.43 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="DUVN8BoL" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-54b09cb06b0so1364529e87.1 for ; Thu, 03 Apr 2025 12:16:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707787; x=1744312587; 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=3Ka+lvT2WWas4h5SU2dyS9iOFUZ7NSTxVoiGdeZqTAM=; b=DUVN8BoLDufoqp6l9PgZ5nVu3y253dfDUXL3m5TFpnDjZ3dSFN7nP4iUbleHFalBTX w80OnXcSo1FFVsDLrQyDbl3Y6f4h0474jHBY6XzRh0KXF6j0X5k8ZJFiX3qeTgf3IxeK +IrnGEhZH2B3yyG51KNx2kjMbPi8IodSCNHto= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707787; x=1744312587; 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=3Ka+lvT2WWas4h5SU2dyS9iOFUZ7NSTxVoiGdeZqTAM=; b=DGpZaA6WdTL7/2jMd+hAjj4u2WMajTa7VIUHXwJKFs1RJztRn9A781cAfmoukaGlr9 mjmMgVGNmAeeDGO2ov5Ds6YFYeR5QkBM/qmJ9JMH7EQT/s/4jyUyBjrSumvAjYy0KwsI 0tz9YDhu5i3qi/U7n2dTQxEo96f4w60MYeSGbEb9wJ8nefeTKNaAbOKZyzRwB7tMPTOi R+b3d0jwtV6oLfbMB2wGRYOnvvRB1Lhg/UQvCG0h38Sp9W5hSisEoL+cd//xz6ZA4Ddb j2LrTujFmlJ3vHJSTItKcdIpkVYsItVVy9muZ4oAFCYqCTUGNtzWmw3ZulGNr0AmK5nn s1eg== X-Forwarded-Encrypted: i=1; AJvYcCWWu3ZhEwUgrJHG3e+u2bWUGRBpGZ6gn3hAFhJDI8Hnbpeh9HslFGTbEz+lOtYzEUJhNSIW2FroCPJI1CY=@vger.kernel.org X-Gm-Message-State: AOJu0YxNjLQn2WVMt8Jsf9PJiOXNYt6wmrGERFPZmBSUI3idSS6fq+ZU mL4ApTfYr3/RQrrxGXuqlUl4yiuN5SQxXETbeSjeejUtxMjjobTk4esftmUJCQ== X-Gm-Gg: ASbGncuQNWH16D1/FmTHGkXJiT3IdeG1albrVcXeSmmZoi51QR3ICknmJEFUWv+Lhqu 9o0cnNbxOa9Ny07TgMr7l/HFec1zzvIY5Enf4jAzO9Si/QenNg0dImZznPTp/W1EYnspnC4CPSP +8ZzLbtq+afC4y64/Lih7+ULMYAxvCloQVGac5zmzfyFCa3mEcnstecvgiNpPE3osSiQ5qIF1Wy ttzvlZJCJUXuMIZYZS++d9mdOSCuFur5/oS/eS8HoVGYJxLUun+1YKYvAhCowC69m5FAh+e8Ly0 xXPgzS5ZO5JLEnqhNpnScxkbC+Y0svdEl7PPPqKUz9DFulef0n3okqdqyGqtmhzIHWOMrZ+C5yC cRDu3suc6EFwmYn1nULpuPKna X-Google-Smtp-Source: AGHT+IEoqeMaCo7VWkarYWDP+GRzyBsI/lGXquNjw+btFYnKJTWgwFNKTpnH5nMpaFghhD3kro9NkQ== X-Received: by 2002:a05:6512:3a87:b0:549:31e4:9ea with SMTP id 2adb3069b0e04-54c2282454fmr77746e87.52.1743707786957; Thu, 03 Apr 2025 12:16:26 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:26 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:15 +0000 Subject: [PATCH 4/8] media: ipu-bridge: Use v4l2_fwnode_device_parse helper 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: <20250403-uvc-orientation-v1-4-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 v4l2_fwnode_device_parse now supports acpi devices as well. Use the helper instead of re-implement the logic. Signed-off-by: Ricardo Ribalda --- drivers/media/pci/intel/ipu-bridge.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel= /ipu-bridge.c index 1cb7458556004d2073688bb0d11defd01f2f61b7..79e6998d37dfde50bd4b44584c8= 864178527d951 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -251,36 +251,16 @@ static u32 ipu_bridge_parse_rotation(struct acpi_devi= ce *adev, =20 static enum v4l2_fwnode_orientation ipu_bridge_parse_orientation(struct ac= pi_device *adev) { - enum v4l2_fwnode_orientation orientation; - struct acpi_pld_info *pld =3D NULL; + struct v4l2_fwnode_device_properties props; + int ret; =20 - if (!acpi_get_physical_device_location(ACPI_PTR(adev->handle), &pld)) { - dev_warn(ADEV_DEV(adev), "_PLD call failed, using default orientation\n"= ); + ret =3D v4l2_fwnode_device_parse(ADEV_DEV(adev), &props); + if (!ret || props.rotation =3D=3D V4L2_FWNODE_PROPERTY_UNSET) { + dev_warn(ADEV_DEV(adev), "Using default orientation\n"); return V4L2_FWNODE_ORIENTATION_EXTERNAL; } =20 - switch (pld->panel) { - case ACPI_PLD_PANEL_FRONT: - orientation =3D V4L2_FWNODE_ORIENTATION_FRONT; - break; - case ACPI_PLD_PANEL_BACK: - orientation =3D V4L2_FWNODE_ORIENTATION_BACK; - break; - case ACPI_PLD_PANEL_TOP: - case ACPI_PLD_PANEL_LEFT: - case ACPI_PLD_PANEL_RIGHT: - case ACPI_PLD_PANEL_UNKNOWN: - orientation =3D V4L2_FWNODE_ORIENTATION_EXTERNAL; - break; - default: - dev_warn(ADEV_DEV(adev), "Unknown _PLD panel val %d\n", - pld->panel); - orientation =3D V4L2_FWNODE_ORIENTATION_EXTERNAL; - break; - } - - ACPI_FREE(pld); - return orientation; + return props.rotation; } =20 int ipu_bridge_parse_ssdb(struct acpi_device *adev, struct ipu_sensor *sen= sor) --=20 2.49.0.504.g3bcea36a83-goog From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 67D8B200B99 for ; Thu, 3 Apr 2025 19:16:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707793; cv=none; b=l2G++nZ8wx1TNMoAU5/idmj1sFfY+Lj1yNRYHkg6mrCowMc0voL5fvI9tx6HuOmGLUOrK7AKYQyJHBSXI5rIGTE0K4ikMITXGrJus/xvCeZL/w8wWyp8YiosSa1zLBhRshREyGY519Tip+HO4zjaJNCfdXzxAGnPUoyuK0ZmI/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707793; c=relaxed/simple; bh=rQ2v20Ddln+4BwZ1YiM0h0pDo1Qau2cCuH+bpTFZT9w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WxTi+ql8NmyIm3qMJbELhI4C976Lf9D64VpsT03uOjK2ZtuUN6zpOhqK+gpC8tINZ0lRMdnfeuDC06HNR9lCZAJFdG9To8EOtDWCNdLXQljKwnySnLIKeatCNQ7wcyDYsO5gfT9rBrEocf8rHL14utCsIhb/eH9o29RUV9AR8+4= 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=dA+tqKgx; arc=none smtp.client-ip=209.85.167.51 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="dA+tqKgx" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-54298ec925bso1981526e87.3 for ; Thu, 03 Apr 2025 12:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707788; x=1744312588; 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=XTsIlDstX0o+Mbqya+IkMyfr6mBLbjzx0t4rQvZShfQ=; b=dA+tqKgxMEyaBrWTZ+T7TXv+rs/eoD44/x4t7aWao13O3Gd7wAUFM4j25zZwpfUHFu ZQXUUs0mPlvA5pz1LwM3Ua+rHXzFoZH4XJ2e1gHhsQ7izxa1P3QgR3MdVLokoebMRP0f vCvsIUMwhvQWEHM5tPZl/sRAGTwB51FeYmlvY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707788; x=1744312588; 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=XTsIlDstX0o+Mbqya+IkMyfr6mBLbjzx0t4rQvZShfQ=; b=nN4H6qhN4ILLRMCC7BaLxZoAvOUUvskPIz2UnfektFvycsSc23TzvFSp8k1eOUC0gO hxjEmGgYBG9cdsFspQ1veCM7opG3SfS9LmIuzYt3G1eTgXB6vcK9PMZSENNLbsHe64Gd kNeSC4mBRyD/kWGSY+9PlyVWJS2jlkMDGdrScKt/tHISs4fRiTHeuf1zJD+fx5D4aUdK bGwxx54/voUsvtAurX4QwGWiYc+e9LU8n3S7jU9085HAb9UOW0hrD7FchXlo2RPIvBUs etx6lbo83Lq0OTOsiHFiLI/ffquY5HOqr6AxTSJUoiZLmpp3ZQKl7wt5EkP1QhRGMclZ mRfQ== X-Forwarded-Encrypted: i=1; AJvYcCUucOjQLPVVoV7x8gm1TMY7sGfnAJ1K6hoWmjBW7LogJb7hKSMrzwqcfi71tvhQiHzzAzcpl4Km0gR2aJA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4O7Zer871Fwx3w01E6JRH3UK8aeFVgbe0wFX6aMZpi687FTXL L+Ft80KezCr5X55WoD4+KI0jfem20v7O7o21p/xUSM0m2EGg8lkUFJdSNvI22Q== X-Gm-Gg: ASbGncvBQuJoHrUKXYmlDb5F85cfWGeDKEVi4s3y1UHI2UaiVlh3XSYBrM1Z3ag/bqE TdK7c5ySGjDiKToZsnfykG42420AQKVPTp7dwe9+N+bw9GvJs/4LywEsX7t7SwVHwXOy22eykEP SS0OF4X12XbCVbA7ohUqt6uVTRyQpWKM+LWXwhdEvJMV80gt0X76+AbT3ykN9Rr6nc20RK2QdQ7 UslHXksPF7y32dQ8C9ZstoUo5SgHsiYxIY6O3fbeGWKxFB6xMcufDawi5LTECaXgYv4clgxmppU UUeZW1wvUTbrsJim04Ve88knhY+5529NC7iTCL0KMo3qa7xy8XBcX9ar+l/Q8mZPxpVlpTqwuF4 cyRl9M+pw0vQMc1rAP7Qsz1S8 X-Google-Smtp-Source: AGHT+IHCXI3V2p507FEESs4oxanJZZsNHxyB6fAQHEoPMaOLxvmQtP8ckbT8u/hI65VR8pFcvY0x2A== X-Received: by 2002:a05:6512:2253:b0:549:7c13:e88f with SMTP id 2adb3069b0e04-54c22795803mr113406e87.30.1743707787714; Thu, 03 Apr 2025 12:16:27 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:27 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:16 +0000 Subject: [PATCH 5/8] dt-bindings: usb: usb-device: Add orientation 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: <20250403-uvc-orientation-v1-5-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 For some devices, such as cameras, the OS needs to know where they are mounted. ACPI has a property for this purpose, which is parsed by acpi_get_physical_device_location(): https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/06_Device_Configuration/Devic= e_Configuration.html#pld-physical-location-of-device In DT we have similar property for video-interface-devices called orientation: Documentation/devicetree/bindings/media/video-interface-devices.yaml Add a new property orientation for usb-devices that matches the already existing orientation property of video-interface-devices. Signed-off-by: Ricardo Ribalda --- Documentation/devicetree/bindings/usb/usb-device.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/usb-device.yaml b/Docume= ntation/devicetree/bindings/usb/usb-device.yaml index da890ee60ce6e71a11910c565b6f805470782e4f..bbcda28ec7d5695307efa797f57= 180044afda77f 100644 --- a/Documentation/devicetree/bindings/usb/usb-device.yaml +++ b/Documentation/devicetree/bindings/usb/usb-device.yaml @@ -42,6 +42,10 @@ properties: port to which this device is attached. The range is 1-255. maxItems: 1 =20 + orientation: + description: If present, specifies the orientation of the usb device. + $ref: /schemas/media/video-interface-devices.yaml#/properties/orientat= ion + "#address-cells": description: should be 1 for hub nodes with device nodes, should be 2 for device nodes with interface nodes. @@ -101,6 +105,7 @@ examples: device@2 { compatible =3D "usb123,4567"; reg =3D <2>; + orientation =3D <0>; }; =20 device@3 { --=20 2.49.0.504.g3bcea36a83-goog From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 D797D2010E8 for ; Thu, 3 Apr 2025 19:16:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707794; cv=none; b=hgx4tMsQdOfhNDIgvPfGuLWRk4T0Xucriht+aWL34GtWyQLCJaSA1DJJCXt4EVptExIPqFHns2uGKRpa1sFTjtsfrFBuQQZC6L/WooZVxqo3nANPrnyTaRhDJenx80l2QyJQFVX+bI7WRwhMdTJPfXXqLjtf3gegwUFC6sg4yO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707794; c=relaxed/simple; bh=noGsjNpbTJQGuzk0L9zxxVJfrWP8YJVEzJ14lhD15kg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Za18ezQCu/UoT91qiIYuIpmL8FloEgsNaLMWJxktPQDPHkpRFY96qM9wULnLpy2A1dSPFyIHo/2l5WcUwsM6ywssKPy3yr7LXZLAMNDsiPoF7hk5YG7JuhgRJqizQeqbHNaEV9RdmtDsUK0sCJ0HDyuvtW6QolTQN6uK4BCb/x8= 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=AyQdd6ro; arc=none smtp.client-ip=209.85.167.48 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="AyQdd6ro" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-54b1095625dso1445535e87.0 for ; Thu, 03 Apr 2025 12:16:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707788; x=1744312588; 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=eqeUSTXiNE7V9Doas/xI2vrhYng5skkX+gfjPxjj7HE=; b=AyQdd6roVYCDOCPgTqtwgu/LYNxPkPhJAZsmHL6lg/UKgtDHrX3KMVEzm0vJoxyToJ +ITS9sq07VvgbBkm3ketv+ReYDLajsui8X4sfOKtkF07jLDt8Jejz+TQOzJne4jonqSh pjJupBgX/EZHZkoejrXHXbo2uCmtYZVKadlXk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707788; x=1744312588; 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=eqeUSTXiNE7V9Doas/xI2vrhYng5skkX+gfjPxjj7HE=; b=nStONYLrzeZo2H08RKTMTi4SogQfmsaB/YB7O+F4BPeiql4aUyjSpKdUSyl2ITiSKk i9Amia15Qnyi+6ANyD9lrG6jdgkhlIVcdbTFclPriKshh23qggb2CWyICxjQeiJadTb0 dTqshDY2h69xxjUCvY+TI2VcOqnfYtBLHRS6DGHQDIgGSZKsm40+h8GofQty8diOhe3t YrKse3OwT8FKkZITG7H/M1csyCsrjW/PNmX18HOryLGkoVhrZSRd5Xe45LoGE/cvUXyK PsoreXnVZrMgXl9vieZoFJXr6GXRGWJBrHAuZ4z9R63ZEv+3tBLdpwWxC+HI1IgM/PVC R69w== X-Forwarded-Encrypted: i=1; AJvYcCXV4ShIuPl+xff9DDqCdppgFxADEV5U9VC4pEaAtVxnH6lG1fIqx72aHDq5WptW28QGKTwPTsVfIDXd31k=@vger.kernel.org X-Gm-Message-State: AOJu0Yxm9lpKMyxbatcVGlC3vglig1uIOoXHvqipHoMpb51pJ5Wg9VC0 GLmia6OXa3p23gNeIZjRCpMSdcJNZgH/ZvAV/9hnmrCZr9NOlKi4ucoN+2YUHg== X-Gm-Gg: ASbGncu4XqE4fGsHvGqGySBRcEEJlSaS7bD/i7xXYYSDyaF0uowtK1FjAB7lFC3o2Xj J14TGmT9tFgUkXL2+vCoHgIRyh2Zh9CLr5o0nII7y0UZHfGw4LMcp3hn2FMqQzGLH1Ud/SWTAhv IanEEShKN5sdY+TfzKqPTV+qq7Tjrw5Lsg7/NEYyDM4dhOrgEXdToRdS/ZIqkbabVD0Ayjv4O/X JgbtkISGh7zE8mFxkMWlEcoIJFqpe5y1mjzmnbeS+1Oe40HYSvFDzwrOgvTqSvfLZ8AGjoZlUII U5Ydvm0QmN7PRSlKnwmFB6o4qq2xY4CYiAJDnSHzlPAp32rVJU/jv00YplwZmdmyvKQaeqs6B1k rFDsuKmMl/7c1FQT6eD5IKoq52Mm/J8xn/Iw= X-Google-Smtp-Source: AGHT+IEnp8VUB3M+G2jjQvzNOduVN4Gua0CvZ+Ge32/rY/9kjO4ZMwa0dgaHAma4urzs7NV5dGUWbw== X-Received: by 2002:a05:6512:108e:b0:549:91db:c14b with SMTP id 2adb3069b0e04-54c227708ecmr108305e87.8.1743707788502; Thu, 03 Apr 2025 12:16:28 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:27 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:17 +0000 Subject: [PATCH 6/8] 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: <20250403-uvc-orientation-v1-6-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda 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 | 123 +++++++++++++++++++++++++++++++++= ++++ drivers/media/usb/uvc/uvcvideo.h | 6 ++ 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 da24a655ab68cc0957762f2b67387677c22224d1..b52e1ff401e24f69b867b5e975c= da4260463e760 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 @@ -792,8 +791,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; @@ -1242,122 +1241,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..30e3e6dd22cbc9cfee420dde7f7= f64dbdce499b9 --- /dev/null +++ b/drivers/media/usb/uvc/uvc_gpio.c @@ -0,0 +1,123 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * uvc_gpio.c -- USB Video Class driver + * + * Copyright 2025 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 b4ee701835fc016474d2cd2a0b67b2aa915c1c60..aef96b96499ce09ffa286c51793= 482afd9832097 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -683,6 +683,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); @@ -829,4 +831,8 @@ 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.49.0.504.g3bcea36a83-goog From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 10426202C33 for ; Thu, 3 Apr 2025 19:16:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707795; cv=none; b=cZjosuGxhg8dwJ+HCUyk8gUUtVe8J30Sd6BeRoWItI/EwphyvEiTIYUM/IkBlY5yqD1cRmeBbSybS9oFlidkyd9jIOHD646fv5AiwUUR64RmL0w5fTNlzDIKqBLqy4HZ0oiP96RhivMxrqBq/b7UZpm4bUWdCEqKX4La9Ss2sTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707795; c=relaxed/simple; bh=XJEMprlCEsKfWYhy5LoPnYnpm2JF0ywPCss0Gv2wgfw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y68FG1Dcvhh1b+NTTq1SlEjKFTdVh0CPKJT2M2LBcItEB+mahTqtRJvdOfJM3RNU88BlzNOK2iSOGzLfrUrfMNECMLtoAyOery76rZ+sW4MqyXJIqy2UZArYdjTJ+hNPAKYten3UfGiziij5CNJjoS8TXhn0wO6rjisILNScV8E= 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=Zec3XZj0; arc=none smtp.client-ip=209.85.167.45 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="Zec3XZj0" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-549967c72bcso1445964e87.3 for ; Thu, 03 Apr 2025 12:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707790; x=1744312590; 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=ktHQdoTvKewbftgZa2kS1uVSmUgEOG8hJ1cjDiKOz20=; b=Zec3XZj0EqGAttJQvFMhIroaiSKZImGGT1aFHzFWv6CpioaQom3O6gli82EvI9cUHm VqQ3G4Ss0VBw9TA2J8mLmKQf2iF7VKShIzFueOdz35utsXcCz86iG5uGAI595P/ryT9O /4+QlstkDtcntVVWbXb3dv+lypERJgvyuS2cY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707790; x=1744312590; 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=ktHQdoTvKewbftgZa2kS1uVSmUgEOG8hJ1cjDiKOz20=; b=izg1i5XKbBXhNlbfKerSN+FxT1xuw3PUsGpOIMrScDdzBlOQ8pjUpYS6c9DKBEg3p5 7HLhOPOY1QJmSbu5ncnzHBIXkSnIw0UXbEsXW0viEKu0GKUTcwnPa70mUGueLq7libys RXK0hui0YjCBJ/ejMO6D4zUMwJe2nIay550U7EyIDUAqmGuaDRa74JP8pFUmcq9Whoxn QUjdEXA94xO6E6eCBiUu/xN7a+H63/3CZKpEstGMps6NkeTZuDfK+8ulqw3TVqhBYnn+ w2apS5I4Jbv78MNxDbFG9BdylRmsACnoVgse0nK970MwENxsoj/r7EijPR4oAk1OKWK7 Uh2Q== X-Forwarded-Encrypted: i=1; AJvYcCXa50yTuKsixyOcZ0nymYBg6/D7kTf8krV07N6B1DLLiWKawJ8OHVgr9ynAxxmbv9VTJ4VPbNLnQI5qqrQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxfTBFJGm4jTo2M07yn4XSc+1QVdi9ofOEO4poI/ENPKBRhL1Zf /FDhh/8QdwzKnU5/XZZV9bSCTqNX5TTa518Eb+izEE9jS4umDAX3eZxK/H2rDQ== X-Gm-Gg: ASbGncvypmt7ZJhPgsdOB3756hJngMEhmT+DIheQnSdoW9m1YJbGnl+dz6p1VxDjYoY 5/hvgFWWA7sdI6a5/Nz5Xadv/sC3EXr9tQRlda6kDzEOQbOpTNkQ1YwWNJIhADphHFkdT8X6vsV 6o7LxhuXbQsMMuusXKWNC3jMx/nQICX9aCNwI6s6S1bfrWeMikYcPg5jgyVksWhXrhO+04UcN8r POtODmtMGzTAP55FbPJi5hfD1+R0NAq9M6/4KviyrJ/eKxt1jS2gDHeIgA2LFtv/wVqDJJVzfej HT85zpmCNtYCGwVXUrPn3B4nvREFcdvlBxUtFMRN6hOMM6FszYuCznW/C5Ujq6yZmfc91+87jGS kSn185zuQpE9nwHm1+FtLfosoArX/QivcCKQ= X-Google-Smtp-Source: AGHT+IGVmGTZb50MVDuSzioZRE+RjuIhc164Y+aVsClKCW9Z3Yiby6JXeaNfKhHGp2ARsGmyfYIwxw== X-Received: by 2002:a05:6512:a94:b0:545:22ec:8b6c with SMTP id 2adb3069b0e04-54c2280a275mr116502e87.35.1743707789796; Thu, 03 Apr 2025 12:16:29 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:28 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:18 +0000 Subject: [PATCH 7/8] media: uvcvideo: Add support for V4L2_CID_CAMERA_ORIENTATION 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: <20250403-uvc-orientation-v1-7-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 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 virtual entity, like we previously did with the external gpio. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/Makefile | 2 +- drivers/media/usb/uvc/uvc_ctrl.c | 21 +++++++++++ drivers/media/usb/uvc/uvc_driver.c | 14 ++++++-- drivers/media/usb/uvc/uvc_entity.c | 1 + drivers/media/usb/uvc/uvc_fwnode.c | 73 ++++++++++++++++++++++++++++++++++= ++++ drivers/media/usb/uvc/uvcvideo.h | 15 ++++++++ include/linux/usb/uvc.h | 3 ++ 7 files changed, 125 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile index 85514b6e538fbb8284e574ca14700f2d749e1a2e..2a5b76aab756c21011d966f3ce0= 410ff6b8e5b19 100644 --- a/drivers/media/usb/uvc/Makefile +++ b/drivers/media/usb/uvc/Makefile @@ -1,7 +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_gpio.o + uvc_gpio.o uvc_fwnode.o ifeq ($(CONFIG_MEDIA_CONTROLLER),y) uvcvideo-objs +=3D uvc_entity.o endif diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index cbf19aa1d82374a08cf79b6a6787fa348b83523a..df84bf292dcab6b833fbd3c70ec= cbe9e567ee567 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -376,6 +376,13 @@ static const struct uvc_control_info uvc_ctrls[] =3D { | UVC_CTRL_FLAG_GET_DEF | UVC_CTRL_FLAG_AUTO_UPDATE, }, + { + .entity =3D UVC_GUID_FWNODE, + .selector =3D 0, + .index =3D 0, + .size =3D 1, + .flags =3D UVC_CTRL_FLAG_GET_CUR, + }, }; =20 static const u32 uvc_control_classes[] =3D { @@ -975,6 +982,17 @@ static const struct uvc_control_mapping uvc_ctrl_mappi= ngs[] =3D { .data_type =3D UVC_CTRL_DATA_TYPE_BITMASK, .name =3D "Region of Interest Auto Ctrls", }, + { + .id =3D V4L2_CID_CAMERA_ORIENTATION, + .entity =3D UVC_GUID_FWNODE, + .selector =3D 0, + .size =3D 8, + .offset =3D 0, + .v4l2_type =3D V4L2_CTRL_TYPE_MENU, + .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, + .menu_mask =3D GENMASK(V4L2_CAMERA_ORIENTATION_EXTERNAL, + V4L2_CAMERA_ORIENTATION_FRONT), + }, }; =20 /* ------------------------------------------------------------------------ @@ -3170,6 +3188,9 @@ static int uvc_ctrl_init_chain(struct uvc_video_chain= *chain) } else if (UVC_ENTITY_TYPE(entity) =3D=3D UVC_EXT_GPIO_UNIT) { bmControls =3D entity->gpio.bmControls; bControlSize =3D entity->gpio.bControlSize; + } else if (UVC_ENTITY_TYPE(entity) =3D=3D UVC_FWNODE_UNIT) { + bmControls =3D entity->fwnode.bmControls; + bControlSize =3D entity->fwnode.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 b52e1ff401e24f69b867b5e975cda4260463e760..9a8e5d94b3eba09e1ee1be20bad= 5b016b6def915 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1752,11 +1752,15 @@ static int uvc_scan_device(struct uvc_device *dev) return -1; } =20 - /* Add GPIO entity to the first chain. */ - if (dev->gpio_unit) { + /* Add virtual entities to the first chain. */ + if (dev->gpio_unit || dev->fwnode_unit) { chain =3D list_first_entry(&dev->chains, struct uvc_video_chain, list); - list_add_tail(&dev->gpio_unit->chain, &chain->entities); + if (dev->gpio_unit) + list_add_tail(&dev->gpio_unit->chain, &chain->entities); + if (dev->fwnode_unit) + list_add_tail(&dev->fwnode_unit->chain, + &chain->entities); } =20 return 0; @@ -2132,6 +2136,10 @@ static int uvc_probe(struct usb_interface *intf, if (ret < 0) goto error; =20 + ret =3D uvc_fwnode_parse(dev); + if (ret < 0) + goto error; + dev_info(&dev->udev->dev, "Found UVC %u.%02x device %s (%04x:%04x)\n", dev->uvc_version >> 8, dev->uvc_version & 0xff, udev->product ? udev->product : "", diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc= _entity.c index cc68dd24eb42dce5b2846ca52a8dfa499c8aed96..01eeba2f049e9ebb25e091340a1= 33656acbf28ca 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c @@ -106,6 +106,7 @@ static int uvc_mc_init_entity(struct uvc_video_chain *c= hain, case UVC_OTT_MEDIA_TRANSPORT_OUTPUT: case UVC_EXTERNAL_VENDOR_SPECIFIC: case UVC_EXT_GPIO_UNIT: + case UVC_FWNODE_UNIT: default: function =3D MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; break; diff --git a/drivers/media/usb/uvc/uvc_fwnode.c b/drivers/media/usb/uvc/uvc= _fwnode.c new file mode 100644 index 0000000000000000000000000000000000000000..20f7b8847551acfd44cbf09bcbf= 653d89985561f --- /dev/null +++ b/drivers/media/usb/uvc/uvc_fwnode.c @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * uvc_fwnode.c -- USB Video Class driver + * + * Copyright 2025 Google LLC + */ + +#include +#include +#include +#include "uvcvideo.h" + +static int uvc_fwnode_get_cur(struct uvc_device *dev, struct uvc_entity *e= ntity, + u8 cs, void *data, u16 size) +{ + if (size < 1) + return -EINVAL; + + switch (entity->fwnode.props.orientation) { + case V4L2_FWNODE_ORIENTATION_FRONT: + *(u8 *)data =3D V4L2_CAMERA_ORIENTATION_FRONT; + break; + case V4L2_FWNODE_ORIENTATION_BACK: + *(u8 *)data =3D V4L2_CAMERA_ORIENTATION_BACK; + break; + default: + *(u8 *)data =3D V4L2_CAMERA_ORIENTATION_EXTERNAL; + } + + return 0; +} + +static int uvc_fwnode_get_info(struct uvc_device *dev, + struct uvc_entity *entity, u8 cs, u8 *caps) +{ + *caps =3D UVC_CONTROL_CAP_GET; + return 0; +} + +int uvc_fwnode_parse(struct uvc_device *dev) +{ + static const u8 uvc_fwnode_guid[] =3D UVC_GUID_FWNODE; + struct v4l2_fwnode_device_properties props; + struct uvc_entity *unit; + int ret; + + ret =3D 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 =3D=3D V4L2_FWNODE_PROPERTY_UNSET) + return 0; + + unit =3D uvc_alloc_entity(UVC_FWNODE_UNIT, UVC_FWNODE_UNIT_ID, 0, 1); + if (!unit) + return -ENOMEM; + + memcpy(unit->guid, uvc_fwnode_guid, sizeof(unit->guid)); + unit->fwnode.props =3D props; + unit->fwnode.bControlSize =3D 1; + unit->fwnode.bmControls =3D (u8 *)unit + sizeof(*unit); + unit->fwnode.bmControls[0] =3D 1; + unit->get_cur =3D uvc_fwnode_get_cur; + unit->get_info =3D uvc_fwnode_get_info; + strscpy(unit->name, "FWNODE", sizeof(unit->name)); + + list_add_tail(&unit->list, &dev->entities); + + dev->fwnode_unit =3D unit; + + return 0; +} diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index aef96b96499ce09ffa286c51793482afd9832097..c52ab99bf8d21ab37270d27ffc0= 40fd115b3f5ba 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -19,6 +19,7 @@ #include #include #include +#include =20 /* -----------------------------------------------------------------------= --- * UVC constants @@ -41,6 +42,9 @@ #define UVC_EXT_GPIO_UNIT 0x7ffe #define UVC_EXT_GPIO_UNIT_ID 0x100 =20 +#define UVC_FWNODE_UNIT 0x7ffd +#define UVC_FWNODE_UNIT_ID 0x101 + /* ------------------------------------------------------------------------ * Driver specific constants. */ @@ -242,6 +246,12 @@ struct uvc_entity { int irq; bool initialized; } gpio; + + struct { + u8 bControlSize; + u8 *bmControls; + struct v4l2_fwnode_device_properties props; + } fwnode; }; =20 u8 bNrInPins; @@ -617,6 +627,7 @@ struct uvc_device { } async_ctrl; =20 struct uvc_entity *gpio_unit; + struct uvc_entity *fwnode_unit; }; =20 enum uvc_handle_state { @@ -835,4 +846,8 @@ size_t uvc_video_stats_dump(struct uvc_streaming *strea= m, char *buf, 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); + +/* fwnode */ +int uvc_fwnode_parse(struct uvc_device *dev); + #endif diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h index bce95153e5a65613a710d7316fc17cf5462b5bce..d818839b0442988d94ab44935e1= ce855b0adf4a1 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_FWNODE \ + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04} =20 #define UVC_GUID_FORMAT_MJPEG \ { 'M', 'J', 'P', 'G', 0x00, 0x00, 0x10, 0x00, \ --=20 2.49.0.504.g3bcea36a83-goog From nobody Sun Feb 8 21:33:10 2026 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 0282B2040B9 for ; Thu, 3 Apr 2025 19:16:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707795; cv=none; b=dZA6y/8eNH6+fonJ9qMxuG0x5lH0wmyv/Cm4K/DoIyfATg0UTaR5cC/dUuG46QzlgpIdW8VBXa8Kpnrl+Mp+5XsfZpz59E0aDFiz0Dqi8Qjd2d8kq5sXvWx2oUic47hCdVHzekZokPMom1kGSc5l+l/mDeLpHQ+oqpZ+jqNYVTI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707795; c=relaxed/simple; bh=oIe/uWD/FQDzr1edh1CzgOk8NT19Av3Ax0Mu4QeYt0c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WhfXIpPx3Ve6EHRwyrAAZ9KHeUQJoj9FCzGpbMsssYFLzzJ5CAlWNXo/LETILnwSywXWaFKK29p3U+hDbwgufpMOZ6NzrT1Tq2SGABuPF+wcrFr9VDe5o/smPlD1fWasW5WaqiqurOvMR+FMW62EWZmGFFgGzmc5rZjDzaSQmeU= 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=KzcRrt6T; arc=none smtp.client-ip=209.85.167.47 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="KzcRrt6T" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5499659e669so1342448e87.3 for ; Thu, 03 Apr 2025 12:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743707791; x=1744312591; 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=dorrjSo0orF//5lS6H31AEnatOUG0VehlrElNg21OPo=; b=KzcRrt6Tn4J4roTiElDsx6nBuxoqkw131eiq8KEj5G9YyO2hMWnVUXimaETLD+go38 8zmQjuyZ12i+Tow/1AKE/p/tPZLMpoTgwhacOV4EVTpyXKUGH/TLmrKD1uP866iZ9/xn nH+JVdVFOpZ849qslDl0pHcfyaASPW8VTQ7+8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743707791; x=1744312591; 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=dorrjSo0orF//5lS6H31AEnatOUG0VehlrElNg21OPo=; b=mdpFQJSKjxytq4C+TFUMd5+Mb0xsNM/KhYIvj0xw9FETjJlJAN/qmMIgqSxhDkkFt+ MWddkp1QMb+UZtakRjhcZ79iZAhIJQqjX4GrQFoaAZWbg2xqgAiCvCj4YTsfpju3OY6/ FrgBqCXHH3A+nnaPCLvb7QCYJfnutK1EthpSXfZJ+qrKwCMXlCA5LmDkj79+NEvO7bXt L6ohzEHOlPd/NSSnhGX8ZHg2wMGpKXysKVE7/KoQ16ltOr0RZQZKOVi2KtrwLR1hA2Uc xnidmNJ9SsoywJGtbprdRy2haTG5KchinmRI5tEa2gxiAKDO6kgC75Rt4MgPKJ35mMdW 1xqw== X-Forwarded-Encrypted: i=1; AJvYcCW2I036fIkfvGp9+bwceTCBxLaEedcCkCPUBGKgZE0rHpCrzt5StnEi22EME30YP3yWBysJL3rdL2aPkws=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9zCi9JTo5qZRHpdoUCLQrtNtDK/Ba6eMlfSqBwYUH22rCXepz ZX1uzfXUZ3f+8Moc2XgCd1p15D71g3jGo8Cc7iHZwEwtTc1PlAdR/Kpze0goxw== X-Gm-Gg: ASbGncsOf75hE0y32GDUu88F4pzM4S3b86V41pRGT99AbgPt+H0YUfpTx3ekWTa1YZJ YlONb8sHnCWImrqY9woiWty2UrhdVQRzxSBiZzPtZsRlxSsTfuex/PSQ4zkQMG+eU+RZ0g+G9gI TQ3vqnU3ROImjzM8MtDkQwAZKLCHFTuav1+0ypEu1JrIS9dezauwkxhAXDcWEfLOzPUIjbZXvP4 Rx6eXne9AVfXUS8+ZzEzkjqKFfyyb2zO0Z3qyntX99umUp/pMYdnwTL+sDrSRNBoTy5u59EP8nB nd0laXqEXlMK5Q0ySWMMvC3ACdTn+vLLHlwXAyx1QoMIKUJXaZkI5fL5yFjssjT7XdLyy6ybEYY 01nJr5aUlApg8+LujAUCQKLWK X-Google-Smtp-Source: AGHT+IGVY3EFg5KnHKmHO2hTamBaTkRj2xwhuyk+NEFXhuefJ9O4PY6IbapG0I2fVQxVv80RmqRT3w== X-Received: by 2002:a05:6512:a91:b0:545:cd5:84d9 with SMTP id 2adb3069b0e04-54c2276e9b2mr115584e87.12.1743707790862; Thu, 03 Apr 2025 12:16:30 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65d6b1sm230142e87.194.2025.04.03.12.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 12:16:29 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 03 Apr 2025 19:16:19 +0000 Subject: [PATCH 8/8] media: uvcvideo: Do not create MC entities for virtual entities 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: <20250403-uvc-orientation-v1-8-1a0cc595a62d@chromium.org> References: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> In-Reply-To: <20250403-uvc-orientation-v1-0-1a0cc595a62d@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 Neither the GPIO nor the FWNODE entities form part of the device pipeline. We just create them to hold emulated uvc controls. When the device initializes, a warning is thrown by the v4l2 core: uvcvideo 1-1:1.0: Entity type for entity FWNODE was not initialized! There are no entity function that matches what we are doing here, and it does not make to much sense to create a function for entities that do not really exist. Do not create MC entities for them and pretend nothing happened here. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_entity.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc= _entity.c index 01eeba2f049e9ebb25e091340a133656acbf28ca..4a0a083b4f58f041023710207a7= 3e8fede8526e0 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c @@ -72,6 +72,16 @@ static int uvc_mc_init_entity(struct uvc_video_chain *ch= ain, { int ret; =20 + /* + * Do not initialize virtual entities, they do not really exist + * and are not connected to any other entities. + */ + switch (UVC_ENTITY_TYPE(entity)) { + case UVC_EXT_GPIO_UNIT: + case UVC_FWNODE_UNIT: + return 0; + } + if (UVC_ENTITY_TYPE(entity) !=3D UVC_TT_STREAMING) { u32 function; =20 --=20 2.49.0.504.g3bcea36a83-goog