From patchwork Thu Mar 11 12:20:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 399173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25DFBC43333 for ; Thu, 11 Mar 2021 12:21:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F116A64FFE for ; Thu, 11 Mar 2021 12:21:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233162AbhCKMVC (ORCPT ); Thu, 11 Mar 2021 07:21:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233131AbhCKMUs (ORCPT ); Thu, 11 Mar 2021 07:20:48 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 086CDC061574 for ; Thu, 11 Mar 2021 04:20:48 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id mm21so45722025ejb.12 for ; Thu, 11 Mar 2021 04:20:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CaRhVK/8csj+vIrO16ApXt+4+Lm7p1eKMEWudzp2f7U=; b=gmjGSpExTAWAssj+18RP7Dlx4fkoDIUccDxXC04TbeBV0PT+XzNObVR3Q4Oe/gFjL1 b+m/r2+mTqwiTUxiI2rO61orwxdgpzrlTTjZ3V1j36I+mh9TA1zyqwA9v+IWQaSI25Xy FTXNwfE5qDdmUWnNgCapfmcqnmFFEhHizT9Cc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CaRhVK/8csj+vIrO16ApXt+4+Lm7p1eKMEWudzp2f7U=; b=jvLQV+9nD63ahwIP7CjNq7SUziCmmmYIkAH45rPSAcHmuZXieMiSp+mUU/aDIdpcHF nt+ta+/y6P0H8Ylj8jRtxgrepC347yIFxKi+T/faio9WAR/6BR699V1FRCjIPMrDBqHv 3rSwDxi8NEKN6IPt/2+Sbzl9rrpxfrqVonaywdf5wcVjIo88G28Zh0XjTfP1z+tx7oGu L7EujJSfSMCHhDPRHinQfbkVimgVOmBJR0EZdA9VnG4lqvt1F2vlzec9BzOIviO0OwNU XknEziY7WaqXPFa6Z4dqz2YrOsHoW2QPJec68zAGJ3HlxO1BEykkuRYY848ZbH/QnIyh KSYQ== X-Gm-Message-State: AOAM533DGiqfo4+cthMAz8muuqM3m7qo8pwucPbZgVeXfuzvWOwIIjTN YXeALfcJDh7y7LUy3W77zggU0A== X-Google-Smtp-Source: ABdhPJz9csyyS/O02ggpZUqK882qN17Rjf54BW2VsvpJXVt4YaeHbCvtOfqPHRIQesuhtAKo8HIZYQ== X-Received: by 2002:a17:906:3b47:: with SMTP id h7mr2769759ejf.377.1615465246673; Thu, 11 Mar 2021 04:20:46 -0800 (PST) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id u13sm1264126ejy.31.2021.03.11.04.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 04:20:46 -0800 (PST) From: Ricardo Ribalda To: Laurent Pinchart , Mauro Carvalho Chehab , Tomasz Figa , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, senozhatsky@chromium.org Cc: Ricardo Ribalda Subject: [PATCH 06/10] media: uvcvideo: Implement UVC_CTRL_CLASS_UNIT Date: Thu, 11 Mar 2021 13:20:36 +0100 Message-Id: <20210311122040.1264410-8-ribalda@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210311122040.1264410-1-ribalda@chromium.org> References: <20210311122040.1264410-1-ribalda@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Create a virtual entity that holds all the class control. Fixes v4l2-compliance: Control ioctls (Input 0): fail: v4l2-test-controls.cpp(216): missing control class for class 00980000 fail: v4l2-test-controls.cpp(253): missing control class for class 009a0000 test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: FAIL Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 3 ++ drivers/media/usb/uvc/uvc_driver.c | 52 +++++++++++++++++++++++++++--- drivers/media/usb/uvc/uvc_entity.c | 1 + drivers/media/usb/uvc/uvcvideo.h | 10 ++++++ 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index fd4d5ad098b9..273eccc136b8 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2354,6 +2354,9 @@ int uvc_ctrl_init_device(struct uvc_device *dev) } else if (UVC_ENTITY_TYPE(entity) == UVC_EXT_GPIO_UNIT) { bmControls = entity->gpio.bmControls; bControlSize = entity->gpio.bControlSize; + } else if (UVC_ENTITY_TYPE(entity) == UVC_CTRL_CLASS_UNIT) { + bmControls = entity->ctrl_class.bmControls; + bControlSize = entity->ctrl_class.bControlSize; } /* Remove bogus/blacklisted controls */ diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 30ef2a3110f7..996e8bd06ac5 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1025,6 +1025,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, } static const u8 uvc_camera_guid[16] = UVC_GUID_UVC_CAMERA; +static const u8 uvc_ctrl_class_guid[16] = UVC_GUID_CTRL_CLASS; static const u8 uvc_gpio_guid[16] = UVC_GUID_EXT_GPIO_CONTROLLER; static const u8 uvc_media_transport_input_guid[16] = UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT; @@ -1057,6 +1058,9 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, * is initialized by the caller. */ switch (type) { + case UVC_CTRL_CLASS_UNIT: + memcpy(entity->guid, uvc_ctrl_class_guid, 16); + break; case UVC_EXT_GPIO_UNIT: memcpy(entity->guid, uvc_gpio_guid, 16); break; @@ -1474,6 +1478,39 @@ static int uvc_parse_control(struct uvc_device *dev) return 0; } +/* ----------------------------------------------------------------------------- + * Control Class + */ + +static int uvc_ctrl_class_get_info(struct uvc_device *dev, + struct uvc_entity *entity, + u8 cs, u8 *caps) +{ + *caps = 0; + return 0; +} + +static int uvc_ctrl_class_parse(struct uvc_device *dev) +{ + struct uvc_entity *unit; + + unit = uvc_alloc_entity(UVC_CTRL_CLASS_UNIT, + UVC_CTRL_CLASS_UNIT_ID, 0, 1); + if (!unit) + return -ENOMEM; + + unit->ctrl_class.bControlSize = 1; + unit->ctrl_class.bmControls = (u8 *)unit + sizeof(*unit); + unit->ctrl_class.bmControls[0] = (1 << (UVC_CC_LAST_CLASS + 1)) - 1; + unit->get_info = uvc_ctrl_class_get_info; + strncpy(unit->name, "Control Class", sizeof(unit->name) - 1); + + list_add_tail(&unit->list, &dev->entities); + dev->ctrl_class_unit = unit; + + return 0; +} + /* ----------------------------------------------------------------------------- * Privacy GPIO */ @@ -2054,12 +2091,11 @@ static int uvc_scan_device(struct uvc_device *dev) return -1; } - /* Add GPIO entity to the first chain. */ - if (dev->gpio_unit) { - chain = list_first_entry(&dev->chains, - struct uvc_video_chain, list); + /* Add virtual entities to the first chain. */ + chain = list_first_entry(&dev->chains, struct uvc_video_chain, list); + list_add_tail(&dev->ctrl_class_unit->chain, &chain->entities); + if (dev->gpio_unit) list_add_tail(&dev->gpio_unit->chain, &chain->entities); - } return 0; } @@ -2399,6 +2435,12 @@ static int uvc_probe(struct usb_interface *intf, goto error; } + /* Parse the control class. */ + if (uvc_ctrl_class_parse(dev) < 0) { + uvc_dbg(dev, PROBE, "Unable to parse UVC CTRL CLASS\n"); + 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 7c4d2f93d351..5285030a738c 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 *chain, case UVC_OTT_MEDIA_TRANSPORT_OUTPUT: case UVC_EXTERNAL_VENDOR_SPECIFIC: case UVC_EXT_GPIO_UNIT: + case UVC_CTRL_CLASS_UNIT: default: function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; break; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 5792232ed312..1d59ac10c2eb 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -41,6 +41,9 @@ #define UVC_EXT_GPIO_UNIT 0x7ffe #define UVC_EXT_GPIO_UNIT_ID 0x100 +#define UVC_CTRL_CLASS_UNIT 0x7ffd +#define UVC_CTRL_CLASS_UNIT_ID 0x101 + /* ------------------------------------------------------------------------ * GUIDs */ @@ -183,6 +186,7 @@ */ #define UVC_CC_CAMERA_CLASS 0 #define UVC_CC_USER_CLASS 1 +#define UVC_CC_LAST_CLASS UVC_CC_USER_CLASS /* ------------------------------------------------------------------------ * Driver specific constants. @@ -375,6 +379,11 @@ struct uvc_entity { struct gpio_desc *gpio_privacy; int irq; } gpio; + + struct { + u8 bControlSize; + u8 *bmControls; + } ctrl_class; }; u8 bNrInPins; @@ -715,6 +724,7 @@ struct uvc_device { } async_ctrl; struct uvc_entity *gpio_unit; + struct uvc_entity *ctrl_class_unit; }; enum uvc_handle_state {