From nobody Sat Feb 7 01:52:14 2026 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (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 059AF1AF0AB for ; Thu, 14 Nov 2024 19:10:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731611457; cv=none; b=L+q2zQHqFnggizzCki30b8X38PSlzdnKGms5+Lliu7JNX+BXanea5Kc4f1hsgMbsvDZUAXGgbA69sT8La6/l0P5nbCYW7XtKbHzSUJJJWcEsprAxDqhujRWksAzl2ffujrRD09Gbe/xWh8E/FRLMyDoIAXMXqvMHNqZSf7cblAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731611457; c=relaxed/simple; bh=eEpxjAmbwD3Lt+gRDs1Am6dF+cKdoldhzE/k4zEeBtQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nsu97MHwM8gR1+wKOobixMtG8xywFP0c2OuvzlCGemip5vCm4gDoevM+ol0RHVCIfBEuPXbjZgAzZfNXxug0Rd0UAL2GpzrTcJMaLUtORu8W/OOGCA7bKSjVaqaOiPnTh6Fui1BAxosbEqQJVg+lKbzH5SbbpLG7TARLUDiCbf8= 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=njsaxu8/; arc=none smtp.client-ip=209.85.219.52 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="njsaxu8/" Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6d3f64df14aso4105956d6.1 for ; Thu, 14 Nov 2024 11:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1731611455; x=1732216255; 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=zJbE2HWSb90CvyoZHkq71MDXLaiW+wPC8fPWnyVZD4E=; b=njsaxu8/gMz6dHHEwUP5vhf4ogLr9un9Am0HdzZG7ldwhAcb5jLWLGLD3XyQh+RqhJ Ltj0oLG4rnLlhFPYZzog3me/SgItAqOpR7uFCjbev2ZYgUrafyhTsiMZgXAENFnWzegW upFYjZ4jrkGwIRxpPa9sKfl7iZ/40XCkXgmWM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731611455; x=1732216255; 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=zJbE2HWSb90CvyoZHkq71MDXLaiW+wPC8fPWnyVZD4E=; b=jM/81UqpHUcnQAm3RKGrihtXJRpOY1teOrdnVSdFmJxZIYW7N2HFY05rLpZm2E5gW7 cYNDX36jNB4gg5zeyMn311QDdrwNrRSqit/dYQLSGGrIixArHrl+ll0rNfCM08aug5t5 zl5Qdo231jFrEZmlUzLQgILB/cHVPMLKFjT02tgLT2VbP95fAia12nWPQAa0AtRVhBQ7 VV1ib5jO+vCYir9a6BZHr1fwAFP8DVrsGmSjloZZmW1JUaqXT4kqHyjVw4QVzVLjisNm pIdC5VC86iWkjmf+FwMY/1bAmCclxI4k10CDeoQvT/PGqxuZXuH//4wAOaO+Rfz66Lqq QIHQ== X-Forwarded-Encrypted: i=1; AJvYcCWpyZrJik3PQ74KyvuH/3uTNPvUpWLmywTWdvAFH4es6dLuJLn0RkwTHZYRDKx4Yk3TQ8WvRKmigezusl4=@vger.kernel.org X-Gm-Message-State: AOJu0YxI8zfju2W0OFWh2jqHDQ7x8v5Nqj6+YpkhpelklByy234UguMj wn8qbFsge6v/039cvnOE2Ma9/H8qCv2uheN+rEJMeFmiyoZ4pcndgvUAF/Tamw== X-Google-Smtp-Source: AGHT+IEvcPAJuJO2mAlNO/pEgGAbnA4uxX9GYiqUlzz3FMhGvdAEvXWG55u9OyHeUYdgEK9DLzdemw== X-Received: by 2002:a0c:9e81:0:b0:6d3:fa75:e9ed with SMTP id 6a1803df08f44-6d3fa75ec86mr4480876d6.41.1731611455074; Thu, 14 Nov 2024 11:10:55 -0800 (PST) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d3ee7cc7e1sm8857766d6.53.2024.11.14.11.10.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 11:10:54 -0800 (PST) From: Ricardo Ribalda Date: Thu, 14 Nov 2024 19:10:39 +0000 Subject: [PATCH v15 10/19] media: uvcvideo: Factor out clamping from uvc_ctrl_set 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: <20241114-uvc-roi-v15-10-64cfeb56b6f8@chromium.org> References: <20241114-uvc-roi-v15-0-64cfeb56b6f8@chromium.org> In-Reply-To: <20241114-uvc-roi-v15-0-64cfeb56b6f8@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Hans de Goede , Ricardo Ribalda , Sakari Ailus , Hans Verkuil Cc: Yunke Cao , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Move the logic to a separated function. Do not expect any change. This is a preparation for supporting compound controls. Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede Reviewed-by: Yunke Cao --- drivers/media/usb/uvc/uvc_ctrl.c | 82 +++++++++++++++++++++---------------= ---- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 6d5167eb368d..893d12cd3f90 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2002,28 +2002,17 @@ int uvc_ctrl_get(struct uvc_video_chain *chain, u32= which, return -EINVAL; } =20 -int uvc_ctrl_set(struct uvc_fh *handle, - struct v4l2_ext_control *xctrl) +static int uvc_ctrl_clamp(struct uvc_video_chain *chain, + struct uvc_control *ctrl, + struct uvc_control_mapping *mapping, + s32 *value_in_out) { - struct uvc_video_chain *chain =3D handle->chain; - struct uvc_control *ctrl; - struct uvc_control_mapping *mapping; - s32 value; + s32 value =3D *value_in_out; u32 step; s32 min; s32 max; int ret; =20 - if (__uvc_query_v4l2_class(chain, xctrl->id, 0) >=3D 0) - return -EACCES; - - ctrl =3D uvc_find_control(chain, xctrl->id, &mapping); - if (ctrl =3D=3D NULL) - return -EINVAL; - if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR)) - return -EACCES; - - /* Clamp out of range values. */ switch (mapping->v4l2_type) { case V4L2_CTRL_TYPE_INTEGER: if (!ctrl->cached) { @@ -2041,14 +2030,13 @@ int uvc_ctrl_set(struct uvc_fh *handle, if (step =3D=3D 0) step =3D 1; =20 - xctrl->value =3D min + DIV_ROUND_CLOSEST((u32)(xctrl->value - min), - step) * step; + value =3D min + DIV_ROUND_CLOSEST((u32)(value - min), step) * step; if (mapping->data_type =3D=3D UVC_CTRL_DATA_TYPE_SIGNED) - xctrl->value =3D clamp(xctrl->value, min, max); + value =3D clamp(value, min, max); else - xctrl->value =3D clamp_t(u32, xctrl->value, min, max); - value =3D xctrl->value; - break; + value =3D clamp_t(u32, value, min, max); + *value_in_out =3D value; + return 0; =20 case V4L2_CTRL_TYPE_BITMASK: if (!ctrl->cached) { @@ -2057,21 +2045,20 @@ int uvc_ctrl_set(struct uvc_fh *handle, return ret; } =20 - xctrl->value &=3D uvc_get_ctrl_bitmap(ctrl, mapping); - value =3D xctrl->value; - break; + value &=3D uvc_get_ctrl_bitmap(ctrl, mapping); + *value_in_out =3D value; + return 0; =20 case V4L2_CTRL_TYPE_BOOLEAN: - xctrl->value =3D clamp(xctrl->value, 0, 1); - value =3D xctrl->value; - break; + *value_in_out =3D clamp(value, 0, 1); + return 0; =20 case V4L2_CTRL_TYPE_MENU: - if (xctrl->value < (ffs(mapping->menu_mask) - 1) || - xctrl->value > (fls(mapping->menu_mask) - 1)) + if (value < (ffs(mapping->menu_mask) - 1) || + value > (fls(mapping->menu_mask) - 1)) return -ERANGE; =20 - if (!test_bit(xctrl->value, &mapping->menu_mask)) + if (!test_bit(value, &mapping->menu_mask)) return -EINVAL; =20 /* @@ -2079,8 +2066,7 @@ int uvc_ctrl_set(struct uvc_fh *handle, * UVC controls that support it. */ if (mapping->data_type =3D=3D UVC_CTRL_DATA_TYPE_BITMASK) { - int val =3D uvc_mapping_get_menu_value(mapping, - xctrl->value); + int val =3D uvc_mapping_get_menu_value(mapping, value); if (!ctrl->cached) { ret =3D uvc_ctrl_populate_cache(chain, ctrl); if (ret < 0) @@ -2090,14 +2076,34 @@ int uvc_ctrl_set(struct uvc_fh *handle, if (!(uvc_get_ctrl_bitmap(ctrl, mapping) & val)) return -EINVAL; } - value =3D xctrl->value; - break; + return 0; =20 default: - value =3D xctrl->value; - break; + return 0; } =20 + return 0; +} + +int uvc_ctrl_set(struct uvc_fh *handle, struct v4l2_ext_control *xctrl) +{ + struct uvc_video_chain *chain =3D handle->chain; + struct uvc_control_mapping *mapping; + struct uvc_control *ctrl; + int ret; + + if (__uvc_query_v4l2_class(chain, xctrl->id, 0) >=3D 0) + return -EACCES; + + ctrl =3D uvc_find_control(chain, xctrl->id, &mapping); + if (!ctrl) + return -EINVAL; + if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR)) + return -EACCES; + + ret =3D uvc_ctrl_clamp(chain, ctrl, mapping, &xctrl->value); + if (ret) + return ret; /* * If the mapping doesn't span the whole UVC control, the current value * needs to be loaded from the device to perform the read-modify-write @@ -2116,7 +2122,7 @@ int uvc_ctrl_set(struct uvc_fh *handle, ctrl->info.size); } =20 - uvc_mapping_set_s32(mapping, value, + uvc_mapping_set_s32(mapping, xctrl->value, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); =20 if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) --=20 2.47.0.338.g60cca15819-goog