From nobody Thu Apr 2 21:34:51 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32CF5C6FA8E for ; Tue, 20 Sep 2022 14:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231715AbiITONc (ORCPT ); Tue, 20 Sep 2022 10:13:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231502AbiITONH (ORCPT ); Tue, 20 Sep 2022 10:13:07 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 563F813F3D for ; Tue, 20 Sep 2022 07:11:22 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id l14so6464182eja.7 for ; Tue, 20 Sep 2022 07:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=7SbWdOzYyZ4DvXywVbhtnQssUKjn+mgaC4ezA3WwW3o=; b=kFnQKOcSb/HOluTfiESWSAxS4b+ac0m+08CMknX881ZXIUR0v9dOBCavYs5OMdQNPU eCpl00nnhyL+MyRpU2RBjqO5YwxhfXJ8QlBW0F4XnCpnnE+D8jYhQqr1jiTOA2FXphRK kQ7YzKh8Cu4L3ZgBj4RItpa/KXTXl27RQXByI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=7SbWdOzYyZ4DvXywVbhtnQssUKjn+mgaC4ezA3WwW3o=; b=D7NDVroArusaklnCGOTPOJLc4ySY1GcXcfZvC6xIO9NjyZyq5od61OwsSnwKMic3Yt I3ReZrKrpmNOF8b6uFFRjAtNcmmdWoXo+g7/mVPZVJZnB3GU8T+khYlVLmfqJD5KbS1E 78iSvFqdYDBg2S4i4IZAmfeVptynQ6SKlftubOajRN7OJDcesogrvitA516vG6fQ52pP Fj7LyhTbMCX6YicC4hUrF+T51yV+oXDc80QrKEaUvY3WhLxyxONzRLeZm+nl4/TWimIq ZD7wgsQQlgWHMr1/WOsEfge3U4xukvjr2/qkETXBT8lsJhkRG/B8wyVJi3GNmjIkIvTc 0HWQ== X-Gm-Message-State: ACrzQf2nCIziKzwixTl86w4q4e0K6c3BfpxRrVobGRQr95mEXH+doaD5 o3X5mPE4VbvALLdaf3ojR2FfCFuhN9550+RyJ58= X-Google-Smtp-Source: AMsMyM5hpLGMkj0xF0Ypp3/noizXD8wsUtLqgxhUtfLkgm3MkcTW4dTp7JImq3L8FJYDgR/Pn4l5pQ== X-Received: by 2002:a17:907:2bf8:b0:770:837a:e3b8 with SMTP id gv56-20020a1709072bf800b00770837ae3b8mr16739970ejc.562.1663683080412; Tue, 20 Sep 2022 07:11:20 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:20 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:04 +0200 Subject: [PATCH v1 1/5] media: uvcvideo: uvc_ctrl_is_accessible: check for INACTIVE MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Message-Id: <20220920-resend-v4l2-compliance-v1-1-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=5006; i=ribalda@chromium.org; h=from:subject:message-id; bh=xRue/wJ3pUDw9TYU7ZEzphzigf/XRMvyyhrkUV+XLC0=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcn8gTHpYmKRi+gxssRJuwAH49xopUaixfYUXUXW LbdiivGJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJ/AAKCRDRN9E+zzrEiB8lD/ 466NcHWkpY/16/og8S+G/pUJWwOuyuigoz0K0WcxyjUc/2vZnC/gwhsrHzCctVuGu7lKpKDC3XiuJ9 hV4pCSdlwY6cMEkecm5cLEVeEhHx08R5qSyOeJgCGlacRSuaztPALYi2OMdq4muShHXEfPq4/OGctE x6Y+N7hBNLIGFuWo8DArMJkpt9UGYdaJus6qdLH3nlViUQNvqMwJSfFf/ymk2JHKdcgxPt4kpc+lQ/ YaADo4viomu6zZE/RdvK+M5TW/PJtQNML3Vk8CSq9Hllt9eH3ou6kDrI4fuTUS7pj2IrIKOGOU3nbW 4UK9TYs+nQvsMKoImC42Awzb7FSURZ9ZXF288zop5OwRqBTM3tgzqOm6KTHygOVahwJfBgWZmhN4ys GnvBULhoqfJYEoJUTepIzEkTzNutKgB1tOxfA5zh2LwjzRDd+mmYsTbbTWjdHgy+Xd/uJOoSigAR9U vl1hldSTGDTeEML68emSIhdg1fTuvbnftHYR7gdFdCSr0NQfACXGkBWqxhYCE+LnJElKDIj/KP102U HUUINTAzC3JxpRqkYc6P52hVHggkzh6xVHL4GAb0KdlA0S7DlZ0UVV8/RGh0aJIpN8EBFBCXdLwvWO bQ3J+ZQClvZDt7aqGc7+XoTakTIfjWW/4kHcYObNz9N5Pt0fUbHjpz3bal2Q== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil Check for inactive controls in uvc_ctrl_is_accessible(). Use the new value for the master_id controls if present, otherwise use the existing value to determine if it is OK to set the control. Doing this here avoids attempting to set an inactive control, which will return an error from the USB device, which returns an invalid errorcode. This fixes: warn: v4l2-test-controls.cpp(483): s_ctrl returned EIO =C2=A0 warn: v4l2-test-controls.cpp(483): s_ctrl returned EIO test VIDIOC_G/S_CTRL: OK =C2=A0 warn: v4l2-test-controls.cpp(739): s_ext_ctrls returned EIO =C2=A0 warn: v4l2-test-controls.cpp(739): s_ext_ctrls returned EIO =C2=A0 warn: v4l2-test-controls.cpp(816): s_ext_ctrls returned EIO test VIDIOC_G/S/TRY_EXT_CTRLS: OK Tested with: v4l2-ctl -c auto_exposure=3D1 OK v4l2-ctl -c exposure_time_absolute=3D251 OK v4l2-ctl -c auto_exposure=3D3 OK v4l2-ctl -c exposure_time_absolute=3D251 VIDIOC_S_EXT_CTRLS: failed: Input/output error exposure_time_absolute: Input/output error ERROR v4l2-ctl -c auto_exposure=3D3,exposure_time_absolute=3D251,auto_exposure=3D1 v4l2-ctl -C auto_exposure,exposure_time_absolute =C2=A0 auto_exposure: 1 exposure_time_absolute: 251 Reviewed-by: Ricardo Ribalda Signed-off-by: Hans Verkuil diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 8c208db9600b..7153ee5aabb1 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1064,11 +1064,33 @@ static int uvc_query_v4l2_class(struct uvc_video_ch= ain *chain, u32 req_id, return 0; } =20 +/** + * uvc_ctrl_is_accessible() - Check if a control can be read/writen/tried. + * @chain: uvc_video_chain that the controls belong to. + * @v4l2_id: video4linux id of the control. + * @ctrl: Other controls that will be accessed in the ioctl. + * @ioctl: ioctl used to access the control. + * + * Check if a control can be accessed by a specicific ioctl operation, + * assuming that other controls are also going to be accessed by that ioct= l. + * We need to check the value of the other controls, to support operations + * where a master value is changed with a slave value. Eg. + * auto_exposure=3D1,exposure_time_absolute=3D251 + * + */ int uvc_ctrl_is_accessible(struct uvc_video_chain *chain, u32 v4l2_id, - bool read) + const struct v4l2_ext_controls *ctrls, + unsigned long ioctl) { + struct uvc_control_mapping *master_map =3D NULL; + struct uvc_control *master_ctrl =3D NULL; struct uvc_control_mapping *mapping; struct uvc_control *ctrl; + bool read =3D ioctl =3D=3D VIDIOC_G_EXT_CTRLS; + bool try =3D ioctl =3D=3D VIDIOC_TRY_EXT_CTRLS; + s32 val; + int ret; + int i; =20 if (__uvc_query_v4l2_class(chain, v4l2_id, 0) >=3D 0) return -EACCES; @@ -1083,6 +1105,29 @@ int uvc_ctrl_is_accessible(struct uvc_video_chain *c= hain, u32 v4l2_id, if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) && !read) return -EACCES; =20 + if (read || try || !mapping->master_id) + return 0; + + /* + * Iterate backwards in cases where the master control is accessed + * multiple times in the same ioctl. We want the last value. + */ + for (i =3D ctrls->count - 1; i >=3D 0; i--) { + if (ctrls->controls[i].id =3D=3D mapping->master_id) + return ctrls->controls[i].value =3D=3D + mapping->master_manual ? 0 : -EACCES; + } + + __uvc_find_control(ctrl->entity, mapping->master_id, &master_map, + &master_ctrl, 0); + + if (!master_ctrl || !(master_ctrl->info.flags & UVC_CTRL_FLAG_GET_CUR)) + return 0; + + ret =3D __uvc_ctrl_get(chain, master_ctrl, master_map, &val); + if (ret >=3D 0 && val !=3D mapping->master_manual) + return -EACCES; + return 0; } =20 diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index 4cc3fa6b8c98..d95168cdc2d1 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -1020,8 +1020,8 @@ static int uvc_ctrl_check_access(struct uvc_video_cha= in *chain, int ret =3D 0; =20 for (i =3D 0; i < ctrls->count; ++ctrl, ++i) { - ret =3D uvc_ctrl_is_accessible(chain, ctrl->id, - ioctl =3D=3D VIDIOC_G_EXT_CTRLS); + ret =3D uvc_ctrl_is_accessible(chain, ctrl->id, ctrls, + ioctl); if (ret) break; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 24c911aeebce..644d5fcf2eef 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -905,7 +905,8 @@ static inline int uvc_ctrl_rollback(struct uvc_fh *hand= le) int uvc_ctrl_get(struct uvc_video_chain *chain, struct v4l2_ext_control *x= ctrl); int uvc_ctrl_set(struct uvc_fh *handle, struct v4l2_ext_control *xctrl); int uvc_ctrl_is_accessible(struct uvc_video_chain *chain, u32 v4l2_id, - bool read); + const struct v4l2_ext_controls *ctrls, + unsigned long ioctl); =20 int uvc_xu_ctrl_query(struct uvc_video_chain *chain, struct uvc_xu_control_query *xqry); --=20 b4 0.11.0-dev-d93f8 From nobody Thu Apr 2 21:34:51 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 447F1C6FA92 for ; Tue, 20 Sep 2022 14:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231751AbiITONg (ORCPT ); Tue, 20 Sep 2022 10:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231411AbiITONH (ORCPT ); Tue, 20 Sep 2022 10:13:07 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 554971A388 for ; Tue, 20 Sep 2022 07:11:23 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id l14so6464310eja.7 for ; Tue, 20 Sep 2022 07:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=IsXtqWi3aYMJWgr4SCjULTHnfzXmNkyNP5+0rfZs3GE=; b=Wg+USxpTe2mvtgr+Cd7kMlIFnWdYOcgj1feCbTD48oJIvWAGrIPvx2p8i8NZ/2hCCw /aY2Y9toBiozhvZ4WbJOC7ncsBCDHggHirIjyMR3EAlySXxJYEuiK7YN8m3uLWpByMIn AxXP1glYWmVsKB6atXE12CCxANcsv/229T6Gg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=IsXtqWi3aYMJWgr4SCjULTHnfzXmNkyNP5+0rfZs3GE=; b=R7N1liekFMPATAaf+WtKBqVzrwoNN+6mvUoaFgErlxdMyt2pJPOPNGwI9dBxsYKzNi fTd+FPRw5caWh70BX+VrvD6gXOgQK9hwHnKKbamPEchtyMgarSzP9R975tBCvVjmKcSJ irTA5IJA7GcDGNt2EffHkMVECj+uEKNo634P7iaZysoDKnYpBTUGfc+BZozBhtUNupbM UgV7w5LyneDNSDHW59kbsSQvILiXF4lEJxjSeDckYpEWjYa5AiDV7/kZCzsl/b+jiVw/ fKSx3s5tn8qEirJ3U6dUg+s4RuHB4ltO87V4bVWtaBRcdEocEW6DYQrnM1NtAsXCDqkJ fn/w== X-Gm-Message-State: ACrzQf2yf6mWTvD6KG4Bu7/s1QxQxi0PoHb9ZDWp5+jN9x3C111Tbfm7 IqFIbNq/mr25I/xAFHYjyAPjK+yTFa0ZExYox90= X-Google-Smtp-Source: AMsMyM4Tsu6DrqVeVB0QDh8AuoFV1Dh8rvxs30c/15xLvA3rnx8VcrJnpsiyiZ2SBJy+3SARBYf2RA== X-Received: by 2002:a17:906:730f:b0:781:cb9a:cc1b with SMTP id di15-20020a170906730f00b00781cb9acc1bmr2194784ejc.41.1663683081472; Tue, 20 Sep 2022 07:11:21 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:21 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:05 +0200 Subject: [PATCH v1 2/5] media: uvcvideo: improve error logging in uvc_query_ctrl() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-v4l2-compliance-v1-2-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1125; i=ribalda@chromium.org; h=from:subject:message-id; bh=xuDJMTqPwFnBT90gGjW9sM+//WBwScMY4uWO/jQUOuQ=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcn+BMi7ITepYifnHZ0BCDGSoJWTOm0BW6fy98Tr u8zH2QOJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJ/gAKCRDRN9E+zzrEiM9tD/ 9GwAfC5G1onbDTMyTZEVTc2GnoQQi38QcbejqNYFqdF8qfKCD7qvdjt4OvAYlFnNIOXmBPbqy/arGd vaILw71ZtnaXhAet00YxVRvtswXeWlWJdCyzRpaMT71o2p2tGGZO+aBQOYwCqp/CjGAOe6+rTlFx93 RbzBAPiKnkMlnsj9guKyWLE4p3vCPDHfhTdihcC7xYX4bHEYjGF687htu/Ilfxt0PSbJ36+HEObyOk E4IjvA393FCnsfxUWe/IQLk9m2fpseYmDw9yOjmp2eb5jmXsrrXdmfDn+7vSy/+rrZoN4I9VszxZ5s 0UvmzTcU9YcgyLIbq7bvhfSyHV8iukbm5hV2REtlcl0dczDBSVd/IbQPd9UjQX28ffsiGGLQ70boiK 6nfAEFnnnnNVmgjAudGOElgbphyocRrBBL8ZEPA/oM4Hk2VEUPGHDAyLMC54Q0sD8BBA3wbV0J/JI5 EzQVTuK+crzLdqN4lxzPZZ4saFP0z4jae1Hb4BK+j3eylNsSJ8y8gYJwEAorD51xLPXGC+AUrxt5j5 FoB0RxDkq7aRDlOdeDM0AQXd45YewZRlwY49y1qDKuRgxNPnvj0jDMkYSBLItMQvW0Mb7ijR7v/7KI 2/zsy8E4S9lT38JtFfq2x2Ik4hQMhy7b8T3Gz8g+G4E0EgiU4ym9Lis48iEA== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil If __uvc_query_ctrl() failed with a non-EPIPE error, then report that with dev_err. If an error code is obtained, then report that with dev_dbg. Reviewed-by: Ricardo Ribalda Signed-off-by: Hans Verkuil diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index 170a008f4006..2cf7f692c0bb 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -79,13 +79,14 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8= unit, if (likely(ret =3D=3D size)) return 0; =20 - dev_err(&dev->udev->dev, - "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", - uvc_query_name(query), cs, unit, ret, size); - - if (ret !=3D -EPIPE) + if (ret !=3D -EPIPE) { + dev_err(&dev->udev->dev, + "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", + uvc_query_name(query), cs, unit, ret, size); return ret; + } =20 + /* reuse data[0] to request the error code. */ tmp =3D *(u8 *)data; =20 ret =3D __uvc_query_ctrl(dev, UVC_GET_CUR, 0, intfnum, --=20 b4 0.11.0-dev-d93f8 From nobody Thu Apr 2 21:34:51 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5331BC6FA91 for ; Tue, 20 Sep 2022 14:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231773AbiITONn (ORCPT ); Tue, 20 Sep 2022 10:13:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231455AbiITONH (ORCPT ); Tue, 20 Sep 2022 10:13:07 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80C942CDD1 for ; Tue, 20 Sep 2022 07:11:24 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id lc7so6621529ejb.0 for ; Tue, 20 Sep 2022 07:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=fZx/rWrR7bth2k3zX90922HeFwXDXF4+XRCwzM0uxDU=; b=hNs3RX9xQGVD65f7QO8VzrP4znwu+FGcrbo6ocv7O/05gKBZ1wH41NfT1tMoB9JKK+ fCnEJGtdMDBVBXb1GRcqA66h+89xj3KHTLcreDEUobgVWQilew9i+jzjGMKG1tG/c+ds QX40CW1oeB2mxfZTxSz0tD36imknHdZUK16b0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=fZx/rWrR7bth2k3zX90922HeFwXDXF4+XRCwzM0uxDU=; b=rDFpIwoRZSC569+slJvUwADsuYnMtGsSyt8oDMlHUJkFxP9YanERuxXmwkChUQTftV GorB/ac76F8iIT+NNG/hazGNd7UNIjbPc+cKOiyaVGE+EwTYS2V7/yn121P1m3sCrVNP OLc7VM64zX47ZV/JVSwFPKbRc9JaBbJfKxlcJbQR2hW/t58L0R5CZm5t3LVud+s80hpo VEbE6+dfkoYichmBbZrGs67zQdKhsO/4UX19sqkOTpsQxvW8FTXvrlU3+L7PUs/k6Tk7 c1yWihV+LIOW6kCnUoC28W4dx0SnpF9ErGvNo9I6f8CgziT0SJXyCXHHIChuEFcFTlKx pjzA== X-Gm-Message-State: ACrzQf0CJn2i991DI47oCcClhk9O/7XMwym5Ee3M6D1J6cVGIjfOB8Uk eYZfmpZRLPqayA7o7qJkNemaB9NNr7KbcLOeOR8= X-Google-Smtp-Source: AMsMyM49va1rmcsPaDlAugeRoY+PzfADCzIDSwOMykHAqiCqO0+W2W/625FQvzvQ7U8cpRoUv2xFOQ== X-Received: by 2002:a17:906:8a6b:b0:780:ab37:b63 with SMTP id hy11-20020a1709068a6b00b00780ab370b63mr15122776ejc.365.1663683082739; Tue, 20 Sep 2022 07:11:22 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:21 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:06 +0200 Subject: [PATCH v1 3/5] media: uvcvideo: Return -EACCES for Wrong state error MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-v4l2-compliance-v1-3-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=854; i=ribalda@chromium.org; h=from:subject:message-id; bh=l3Tve8hGJ5W5tTbag9O5QNFnAI00qvVi1fN45JRNTAM=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcn/J5h+0gj3RkVXT+F2wF6DERtyqXPbiyyPS7Lq 01rqx+2JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJ/wAKCRDRN9E+zzrEiHQTD/ 9ZBbIC//geY3g3ywDr6Lg3j0lkU5m5cFuiwGpZL3bDLnUZKL3tB9cmqFZQ/7+/DdRcS1r4tAb0rsWq 1XHhHIc+sM7TEzcdm57ZzhYfopuV/68vfB6OJCwS92xPqfL162Ra/Hw75GVS0MNrF+xX6US6MnnUYX BD8XtqNgRvMb878fj3jVT1cpI7wqY5wYEGOh5hg672qjO5lnXBiJJDNJ9dFxA5Y32sqBqPdjde+d4x 317Wit7YVtGnscLOwtnJquHVHK1mlclPv17aZXGiT5ja23aONAmSilXyZ9gIq1SSYOD5b9mLl7/Fx9 B49LiMIqk/Bu0pgLxrfG7lWNJDpjwoosiCKyMjwDemlX4IH2xutfvtoJbE9C5X1FnR0Z/k5WgLXG1n Gi/qwNnme0/qaxzH8LtckCv03PgDdT8F0Z7hCXHH/kHIlkbJxfbz4PYloO0xVKyrAzB/28t90eylny xX7q5sDFzaEGFATiPrPHgxRbMNG5JO9BadznggBkBEHsPqMEfPVvAkOTNxyyKxLpg1dKVluB+dgUDw b6BPlBIUw9vE5vdRn2Soq7bVPLR+DffaYnFgF75zjjWTZrurbo2BKwvRjxJkfLQKfmbmYC7FD6JrvK sorGg3tmm1lsqmx2Eqki3JvDotU44SzDJgR9u6d61m2hvOpy7ypTvYvG/CEw== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For error 2 (Wrong state) return -EACCES instead of -EILSEQ. EACCES is a much more appropriate error code. EILSEQ will return "Invalid or incomplete multibyte or wide character." in strerror(), which is a *very* confusing message. Suggested-by: Hans Verkuil Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index 2cf7f692c0bb..497073a50194 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -108,7 +108,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8= unit, case 1: /* Not ready */ return -EBUSY; case 2: /* Wrong state */ - return -EILSEQ; + return -EACCES; case 3: /* Power */ return -EREMOTE; case 4: /* Out of range */ --=20 b4 0.11.0-dev-d93f8 From nobody Thu Apr 2 21:34:51 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63F87C6FA94 for ; Tue, 20 Sep 2022 14:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231794AbiITONu (ORCPT ); Tue, 20 Sep 2022 10:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231668AbiITONK (ORCPT ); Tue, 20 Sep 2022 10:13:10 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9B55226 for ; Tue, 20 Sep 2022 07:11:25 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 29so4061725edv.2 for ; Tue, 20 Sep 2022 07:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=LybwIQYtr5MkOTsSbogVgHlZvfV5O5f7swHU1e23Nnk=; b=XGpXPObUCIdcbW6+kATPE1pa0rJOXlPSqXnXWxFCMfrdei94sbWnWOguM4Szh4xAz5 qw3MeS//hxpC/16vm9+/7bKhnPZ1S+einB3uW2QlJzNPzg6us/9Kwz0VzjoouFyemWOP SLj6xaKOTLbyfGjzHyMu4JgLdaQJ+K37OTYx0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=LybwIQYtr5MkOTsSbogVgHlZvfV5O5f7swHU1e23Nnk=; b=wcFFoXnc14g2jwiVcqOvyRxy3XdLV6mHsVdt62o2AVslWTrzvIsbNyZYpk21XwkwG9 xEj6L0rdmX7yeApFlbJVqALY/yN2DrEixjwk9tGaufH+NLHuXO7kqLS9wQWz9tirro5s bqmqgU4p6yFYniYX01Y9EWzbq6fc6JxnJFr7crDIZ2Wkf1bWezhVTQPQ1GGzYslHMSRE rCkOq7j1ejbVouqk24HKvy0cZBmN1q2xkYb4TFjJCmzLG1OzMKfseUIzgUEm9bi5cmbr H2PFa3DvpKmrYaLlCZuk1fi9h2oGG314NivJlL4A50FL25y5FE1ir2S3WhxnEI94Wuhv 5CiQ== X-Gm-Message-State: ACrzQf1SBTTDTx55P9exCn9ljuUaoFO0BHVChEsxsbnlg9v25b+NbX68 ZZFzixM/oYdghHEQKN9AxDLSWONdqRAlZ+reD6w= X-Google-Smtp-Source: AMsMyM6GueK/ScSoEqg+pIo2Qo627Mmr5ypK8TeU2+MpGfijHbEmj7S/BGDsKKkFvndBRaJ42Aqo9A== X-Received: by 2002:a05:6402:b85:b0:44e:dad7:3e24 with SMTP id cf5-20020a0564020b8500b0044edad73e24mr21080703edb.264.1663683083754; Tue, 20 Sep 2022 07:11:23 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:23 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:07 +0200 Subject: [PATCH v1 4/5] media: uvcvideo: Do not return positive errors in uvc_query_ctrl() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-v4l2-compliance-v1-4-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=835; i=ribalda@chromium.org; h=from:subject:message-id; bh=lvRGgJW7MhPUQfG+nYO+p570MCZiCiBKUgYSsY4PyFM=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcoBYgbZrbg5ljLAWYbJnhg/lWzmT9LI8kdMIM6Y A04RZISJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynKAQAKCRDRN9E+zzrEiMJfD/ 9mQFTZGV9/PXf7DjRSKX9FoxJQmOgiqY4qZ5id+f7u+hpqhJmjnQgYEBPaWvIan+xqNkPMN5IxotY5 nZT4mrnDNc2tr9NSaPHwpV5CGjYpDgvWIV8ABMSnFHwmJ9njolndOOccOVrsro1w6IYKJPEnH3oelC p8A+oEPhsZdgqHTWlsO53mBY2+YVnQLSxaOwSblTpjV5BhAcSedYDObFMUVAped0NjJP+O0eGpgGQn qAQtmEh/QtsV0cZtt21RxZPFGAndVcI3xvA3/XH4646eyrzE/FsgIltSlwgSlwWrw1nzgVx+iVP7rX cJihDQ+akf4ssGXcfb3+gLwuXA8ywMED5/Gl9ZvWz5DLSV82WbPeS8l7YtnMRteimSUfOnaiIO1Tmh P/TOyPtL39wZFBKRU4iuwVuaXmsL0lkIOgjncsQsXP3n/upFns28GiBKuI5z2F6qr68lDsn2Oy0ZB0 hkKsNPLgjA2yxJQixUSYO6GvlCis5DdizE5E0MkRBgVnoTfU8mpy1u1Ae7Yji0p+4T/0h4hSdV890L 8nZAgdV8oOs/A+yEFtnupy3g9ZyRSHbcoitHpnHdosH5/Gh9C4dydk0mb4h5uP8NxCOejt/sTkOOwa JrKqUEsprp6uDE+lIFW0jJJ+G0nr1fACK8qNMpXHlivWP0K4nhFbiNN+cKLA== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the returned size of the query does not match the expected size or it is zero, return -EPIPE instead of 0 or a positive value. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index 497073a50194..902f2817a743 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -83,7 +83,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 u= nit, dev_err(&dev->udev->dev, "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", uvc_query_name(query), cs, unit, ret, size); - return ret; + return ret < 0 ? ret : -EPIPE; } =20 /* reuse data[0] to request the error code. */ --=20 b4 0.11.0-dev-d93f8 From nobody Thu Apr 2 21:34:51 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AF1DC54EE9 for ; Tue, 20 Sep 2022 14:14:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231133AbiITOOH (ORCPT ); Tue, 20 Sep 2022 10:14:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231573AbiITONN (ORCPT ); Tue, 20 Sep 2022 10:13:13 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A9E41A060 for ; Tue, 20 Sep 2022 07:11:26 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id q21so4008291edc.9 for ; Tue, 20 Sep 2022 07:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=UQpZaYJCKWK0Pu7l712TNk2BJuL6CIWDc5YrLh30wjs=; b=GY4dKTSFJ0aG7Ehgy1MQE6tDuKby5zBXGij1uk7Qd+/Dk2wp7f6GqmcDMLAP869lbk /vHkLEpGb9aQvj/GmqYFqHRw27BHxBWPurpptweyXnhdi9bSkGa6MeOMW+Ac3MHRWQHa f/p86/iDC3Txt5zk/EDhzUwc5XlLWFwMG4a2o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=UQpZaYJCKWK0Pu7l712TNk2BJuL6CIWDc5YrLh30wjs=; b=QRF+whg4qpL+ns2HxDfrHUv/ZWz9VIQnvklSkcYNYTfKPF39dPXImWc07oCba9tKh1 2amSZ97YNMAL+EJHg7zkL9+7qC1FB1Lxta9Kr/gG2rLNDccBbGNV7QLajMzK237ZvIYd K10LhN4zz9igS9xdRabdL5GejHNfY5fcwFEnQ0Jz3StFdNqCK9kVG5RJlHtWXZl8YEoT M1lBqJE6+L89i0nMrETogqgXxm3HIdUE/xZYEGHhC87HVeVz3yXwrgF+O5U8/HvJiVrt SL9rAKNedfqpp5DaxLJ/SjNvRVP+ayG26L3H2o+IZyqZ8ScXLbzY0N5ORuKXCMhvvim/ EQfA== X-Gm-Message-State: ACrzQf1zv0EhJYpZ+iVEbmhtNP4f+5B+8lLxUFnqBl+mJuyEm8wnxDNY sHMOOm8ydaC1bpRKxJ2T23+APUD262siM1RIGCQ= X-Google-Smtp-Source: AMsMyM4Ls0dzBeoa3LjXsd2FcBrpl+vb18hTbIVmQX2kbkqiq5AXBRiNryvGL2FN2Y2L8jMkJjLSIA== X-Received: by 2002:a05:6402:26d6:b0:451:24da:f8cf with SMTP id x22-20020a05640226d600b0045124daf8cfmr20723773edd.385.1663683084906; Tue, 20 Sep 2022 07:11:24 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:24 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:08 +0200 Subject: [PATCH v1 5/5] media: uvcvideo: Fix handling on Bitmask controls MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-v4l2-compliance-v1-5-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=3891; i=ribalda@chromium.org; h=from:subject:message-id; bh=/j8z6PN7/Plr9CdgjDkkTYHlK0/ZUdYfEEIDx5PJha0=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcoDcJy26EznzdSST9G5q2VOlkTv+RVQAJ67x7J6 FAxG4U+JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynKAwAKCRDRN9E+zzrEiC08D/ 9xxiRVxqttcN9YCHY0dq93HYXrt7mGQ2+zQWqPRCnkWRdXCJwJt8JJcGrTxH1ChIPw1dnojnhvuJNQ hcOiiyViyLqLq5nhN/BhdBuqjUINPXW2ypaG5WtFkXS0gECDxFBCuA4gFdDSB8CUR1P2ITK9E0xlia 2WV527A3O8t8D+bOxV5pjmE4M+9tKizYf6U52PHAJRUWcBongM3uOC0dKXp5QP5L4JrRlr/5P1JHVR KlMX4QevuMLB4mEfLcogVzxvNLtA91t666zOJCHdprXOphDqGMpP88b1O6zkNgJaeh4hy9mdJpd//H uLZHLLAdhacL/rj7RIGOckstDmquiY4yvqG/tPjm6O9c3bK25EjaQHeXq9A+LEZqzobVTTuyd+00AD Z92kPrJpnhvMvOKfxRN5cU81w354TXRXy8/qd6DQpTr/uvX8S8JhYav99vY4PsVGXGdfeO71eiPeTR gKsAax7PL+izxg/+aK8HUw4tset+qZXbdAAihSeYf2TDHJNu79eY9/Wt+NBcYolSak+J9NlU5q4zBZ QHTkCNZaXy77EPbQigTJLctpOX13DDSbYyv5z2HXCQeAJfiHE0svWUhhsrf9o2rgbc5H9W4HG9KzK8 XQCy0lnz12AiuQUw6cBJyBGXlMIdoKnI1WQSc2aDb3DSwcZs/vcGwWozNwkQ== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Minimum and step values for V4L2_CTRL_TYPE_BITMASK controls should be 0. There is no need to query the camera firmware about this and maybe get invalid results. Also value should be masked to the max value advertised by the hardware. Finally, handle uvc 1.5 mask controls that use MAX instead of RES to describe the valid bits. Fixes v4l2-compliane: Control ioctls (Input 0): fail: v4l2-test-controls.cpp(97): minimum must be 0 for a b= itmask control test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: FAIL Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 7153ee5aabb1..526572044e82 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1145,6 +1145,25 @@ static const char *uvc_map_get_name(const struct uvc= _control_mapping *map) return "Unknown Control"; } =20 +static u32 uvc_get_ctrl_bitmap(struct uvc_control *ctrl, + struct uvc_control_mapping *mapping) +{ + /* + * Some controls, like CT_AE_MODE_CONTROL use GET_RES to + * represent the number of bits supported, those controls + * do not list GET_MAX as supported. + */ + if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MAX) + return mapping->get(mapping, UVC_GET_MAX, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); + + if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) + return mapping->get(mapping, UVC_GET_RES, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); + + return ~0; +} + static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, struct uvc_control *ctrl, struct uvc_control_mapping *mapping, @@ -1219,6 +1238,12 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_ch= ain *chain, v4l2_ctrl->step =3D 0; return 0; =20 + case V4L2_CTRL_TYPE_BITMASK: + v4l2_ctrl->minimum =3D 0; + v4l2_ctrl->maximum =3D uvc_get_ctrl_bitmap(ctrl, mapping); + v4l2_ctrl->step =3D 0; + return 0; + default: break; } @@ -1320,19 +1345,14 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *cha= in, =20 menu_info =3D &mapping->menu_info[query_menu->index]; =20 - if (mapping->data_type =3D=3D UVC_CTRL_DATA_TYPE_BITMASK && - (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES)) { - s32 bitmap; - + if (mapping->data_type =3D=3D UVC_CTRL_DATA_TYPE_BITMASK) { if (!ctrl->cached) { ret =3D uvc_ctrl_populate_cache(chain, ctrl); if (ret < 0) goto done; } =20 - bitmap =3D mapping->get(mapping, UVC_GET_RES, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); - if (!(bitmap & menu_info->value)) { + if (!(uvc_get_ctrl_bitmap(ctrl, mapping) & menu_info->value)) { ret =3D -EINVAL; goto done; } @@ -1815,6 +1835,18 @@ int uvc_ctrl_set(struct uvc_fh *handle, value =3D xctrl->value; break; =20 + case V4L2_CTRL_TYPE_BITMASK: + if (!ctrl->cached) { + ret =3D uvc_ctrl_populate_cache(chain, ctrl); + if (ret < 0) + return ret; + } + + xctrl->value =3D max(0, xctrl->value); + xctrl->value &=3D uvc_get_ctrl_bitmap(ctrl, mapping); + value =3D xctrl->value; + break; + case V4L2_CTRL_TYPE_BOOLEAN: xctrl->value =3D clamp(xctrl->value, 0, 1); value =3D xctrl->value; @@ -1829,17 +1861,14 @@ int uvc_ctrl_set(struct uvc_fh *handle, * Valid menu indices are reported by the GET_RES request for * UVC controls that support it. */ - if (mapping->data_type =3D=3D UVC_CTRL_DATA_TYPE_BITMASK && - (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES)) { + if (mapping->data_type =3D=3D UVC_CTRL_DATA_TYPE_BITMASK) { if (!ctrl->cached) { ret =3D uvc_ctrl_populate_cache(chain, ctrl); if (ret < 0) return ret; } =20 - step =3D mapping->get(mapping, UVC_GET_RES, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); - if (!(step & value)) + if (!(uvc_get_ctrl_bitmap(ctrl, mapping) & value)) return -EINVAL; } =20 --=20 b4 0.11.0-dev-d93f8