Message ID | 20240722-fix-filter-mapping-v2-1-7ed5bb6c1185@chromium.org (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Laurent Pinchart |
Headers |
Received: from sv.mirrors.kernel.org ([139.178.88.99]) by linuxtv.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from <linux-media+bounces-15244-patchwork=linuxtv.org@vger.kernel.org>) id 1sVrbh-0000Rt-2U for patchwork@linuxtv.org; Mon, 22 Jul 2024 11:53:36 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 1CD60280B94 for <patchwork@linuxtv.org>; Mon, 22 Jul 2024 11:53:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 842E116D33A; Mon, 22 Jul 2024 11:52:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="WfTmXDlh" X-Original-To: linux-media@vger.kernel.org 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 917D316D318 for <linux-media@vger.kernel.org>; Mon, 22 Jul 2024 11:52:31 +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=1721649153; cv=none; b=XnQ0VBKySMG/+KxIRPrAMV/09LAs15c/ehrDombzmZUGB2hz0YiUQe41PA4oM2WCcyTGHMnJoVQZDS9bJxG8PJI7z2ALtTm5x3WcKVZ6ZckzCs99unEHBbZJQBYrawr51soWZmFUkB4npkDZhIE1yBYSl+gA/pJmTsQ/aQmYX9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721649153; c=relaxed/simple; bh=QsXTXPHta5hqnSr3LHCTAZhJ1stEGXqeSCLWBUmyozw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=WSxHvmfvHtiWysakMUYbFXljyUtKG7hfWr/zFtF1zXd8SXP2usq50//Wuzw3/yuD8Ipu9KQ6qp5MQcsOwOgV5pzJQYg24WAtGtZ3/TwYC5g9TXafDAuwjV1DR+ixyaZ41doB0GCfGq4TbnDVuc+FfKdqfDJvjJw6+MBcbmky8G8= 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=WfTmXDlh; 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 Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6b797234b09so34578456d6.0 for <linux-media@vger.kernel.org>; Mon, 22 Jul 2024 04:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1721649150; x=1722253950; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=XQYfbL9PFIw2vg4G+G5d59yXENQMiik/7/3n9CbSyT4=; b=WfTmXDlhy59TsUQiHTpVUqswyT2yJCoGaRmlr8mBb2dBR/wIKsqavNs8RjBfREUE16 fJLhIcVrBFOaGg/yLehy4qHXXlFhAT0M87M+4vImdbElj0EyELYNPKjF+WdIZShEoPml ZzzbOpJM8MCZxarVyh/HxNl9ykXGs5z8BnwzE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721649150; x=1722253950; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XQYfbL9PFIw2vg4G+G5d59yXENQMiik/7/3n9CbSyT4=; b=kgCM9oQD9BvYyQHBgnSWphOMIw2jDyO2uYQM1R4b+PV+DyekO5TWaTQTeCrIvxymjj coF8CM99vz50qU2JhfvTPzyaNpqiBDHbvqE6Cj4+LBzXUsVfXOxUccyNc5aZVHfJ0Juq dLXpRgLjcCNUeLL9okBJttxMyo54dJeFDCOMmxzpfsg5Wv0iHsGlwU6pg5ok7ufS6Cna n4mrAP4EI/avT1cNxXKQkWyQluq6HxgCMOgHdcIEwx77bcndv4CNpkh01jq4DMfMlrY6 qwPziV1H0qjknlldUs1H3q2cUgMFMpjqBmH2jIKy3ZCQxbxzp6s4ShaFqBbSCcvbFxjL 5bPg== X-Gm-Message-State: AOJu0YytJaMKqHXoKigZVlDwqRzY4MazTESpXz6WZW7cex7VY9GSYRI0 YdcfLWJ5o2XU3zTx0t6B6raUdxAjkma4rjxOKpLA4p45cNV4he/YIGeVCwmMZA== X-Google-Smtp-Source: AGHT+IHtBu5wz+9EWExK47KziP0oA/oIeohoyQXcWuVyU89lepQlMMboXK68AersAqjxj3D97IA/Gg== X-Received: by 2002:ad4:5042:0:b0:6b4:f979:1e03 with SMTP id 6a1803df08f44-6b79cd51d63mr238282386d6.25.1721649150341; Mon, 22 Jul 2024 04:52:30 -0700 (PDT) Received: from denia.c.googlers.com (197.5.86.34.bc.googleusercontent.com. [34.86.5.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b96c8fe8d4sm13914726d6.17.2024.07.22.04.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 04:52:29 -0700 (PDT) From: Ricardo Ribalda <ribalda@chromium.org> Date: Mon, 22 Jul 2024 11:52:26 +0000 Subject: [PATCH v2] media: uvcvideo: Fix custom control mapping probing Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: <linux-media.vger.kernel.org> List-Subscribe: <mailto:linux-media+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-media+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240722-fix-filter-mapping-v2-1-7ed5bb6c1185@chromium.org> X-B4-Tracking: v=1; b=H4sIAPlHnmYC/32NTQ6CMBCFr0JmbU1bGwquvIdhgWVoJxHaTJFoC He3cgAXb/G9vJ8NMjJhhmu1AeNKmeJcQJ8qcKGfPQoaCoOW2kirtRjpXfRckMXUp0SzF6ox1g6 ubqVpoBQTY0kdo/eucKC8RP4cH6v6uX/nViWUkNa51tWP0eDl5gLHiV7TObKHbt/3L+Nivqq3A AAA To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Sergey Senozhatsky <senozhatsky@chromium.org> Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, pmenzel@molgen.mpg.de, stable@vger.kernel.org, Ricardo Ribalda <ribalda@chromium.org> X-Mailer: b4 0.13.0 X-LSpam-Score: -5.9 (-----) X-LSpam-Report: No, score=-5.9 required=5.0 tests=ARC_SIGNED=0.001,ARC_VALID=-0.1,BAYES_00=-1.9,DKIMWL_WL_HIGH=-1,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,DMARC_PASS=-0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001,SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no |
Series |
[v2] media: uvcvideo: Fix custom control mapping probing
|
|
Commit Message
Ricardo Ribalda
July 22, 2024, 11:52 a.m. UTC
Custom control mapping introduced a bug, where the filter function was
applied to every single control.
Fix it so it is only applied to the matching controls.
The following dmesg errors during probe are now fixed:
usb 1-5: Found UVC 1.00 device Integrated_Webcam_HD (0c45:670c)
usb 1-5: Failed to query (GET_CUR) UVC control 2 on unit 2: -75 (exp. 1).
usb 1-5: Failed to query (GET_CUR) UVC control 3 on unit 2: -75 (exp. 1).
usb 1-5: Failed to query (GET_CUR) UVC control 6 on unit 2: -75 (exp. 1).
usb 1-5: Failed to query (GET_CUR) UVC control 7 on unit 2: -75 (exp. 1).
usb 1-5: Failed to query (GET_CUR) UVC control 8 on unit 2: -75 (exp. 1).
usb 1-5: Failed to query (GET_CUR) UVC control 9 on unit 2: -75 (exp. 1).
usb 1-5: Failed to query (GET_CUR) UVC control 10 on unit 2: -75 (exp. 1).
Reported-by: Paul Menzen <pmenzel@molgen.mpg.de>
Closes: https://lore.kernel.org/linux-media/518cd6b4-68a8-4895-b8fc-97d4dae1ddc4@molgen.mpg.de/T/#t
Cc: stable@vger.kernel.org
Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping")
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
Paul, could you check if this fixes your issue, thanks!
---
Changes in v2:
- Replace !(A && B) with (!A || !B)
- Add error message to commit message
- Link to v1: https://lore.kernel.org/r/20240722-fix-filter-mapping-v1-1-07cc9c6bf4e3@chromium.org
---
drivers/media/usb/uvc/uvc_ctrl.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
base-commit: 68a72104cbcf38ad16500216e213fa4eb21c4be2
change-id: 20240722-fix-filter-mapping-18477dc69048
Best regards,
Comments
Dear Ricardo, Thank you for sending v2. Am 22.07.24 um 13:52 schrieb Ricardo Ribalda: > Custom control mapping introduced a bug, where the filter function was > applied to every single control. > > Fix it so it is only applied to the matching controls. > > The following dmesg errors during probe are now fixed: > > usb 1-5: Found UVC 1.00 device Integrated_Webcam_HD (0c45:670c) > usb 1-5: Failed to query (GET_CUR) UVC control 2 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 3 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 6 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 7 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 8 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 9 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 10 on unit 2: -75 (exp. 1). > > Reported-by: Paul Menzen <pmenzel@molgen.mpg.de> Menze*l* > Closes: https://lore.kernel.org/linux-media/518cd6b4-68a8-4895-b8fc-97d4dae1ddc4@molgen.mpg.de/T/#t > Cc: stable@vger.kernel.org > Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping") > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > --- > Paul, could you check if this fixes your issue, thanks! > --- > Changes in v2: > - Replace !(A && B) with (!A || !B) > - Add error message to commit message > - Link to v1: https://lore.kernel.org/r/20240722-fix-filter-mapping-v1-1-07cc9c6bf4e3@chromium.org > --- > drivers/media/usb/uvc/uvc_ctrl.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index 0136df5732ba..4fe26e82e3d1 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, > for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { > const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i]; > > + if (!uvc_entity_match_guid(ctrl->entity, mapping->entity) || > + ctrl->info.selector != mapping->selector) > + continue; > + > /* Let the device provide a custom mapping. */ > if (mapping->filter_mapping) { > mapping = mapping->filter_mapping(chain, ctrl); > @@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, > continue; > } > > - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && > - ctrl->info.selector == mapping->selector) > - __uvc_ctrl_add_mapping(chain, ctrl, mapping); > + __uvc_ctrl_add_mapping(chain, ctrl, mapping); > } > } Kind regards, Paul
On Mon, Jul 22, 2024 at 11:52:26AM +0000, Ricardo Ribalda wrote: > Custom control mapping introduced a bug, where the filter function was > applied to every single control. > > Fix it so it is only applied to the matching controls. > > The following dmesg errors during probe are now fixed: > > usb 1-5: Found UVC 1.00 device Integrated_Webcam_HD (0c45:670c) > usb 1-5: Failed to query (GET_CUR) UVC control 2 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 3 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 6 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 7 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 8 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 9 on unit 2: -75 (exp. 1). > usb 1-5: Failed to query (GET_CUR) UVC control 10 on unit 2: -75 (exp. 1). > > Reported-by: Paul Menzen <pmenzel@molgen.mpg.de> > Closes: https://lore.kernel.org/linux-media/518cd6b4-68a8-4895-b8fc-97d4dae1ddc4@molgen.mpg.de/T/#t > Cc: stable@vger.kernel.org > Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping") > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> I'll add Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> from v1 and fix the reported-by tag. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Paul, could you check if this fixes your issue, thanks! > --- > Changes in v2: > - Replace !(A && B) with (!A || !B) > - Add error message to commit message > - Link to v1: https://lore.kernel.org/r/20240722-fix-filter-mapping-v1-1-07cc9c6bf4e3@chromium.org > --- > drivers/media/usb/uvc/uvc_ctrl.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index 0136df5732ba..4fe26e82e3d1 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, > for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { > const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i]; > > + if (!uvc_entity_match_guid(ctrl->entity, mapping->entity) || > + ctrl->info.selector != mapping->selector) > + continue; > + > /* Let the device provide a custom mapping. */ > if (mapping->filter_mapping) { > mapping = mapping->filter_mapping(chain, ctrl); > @@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, > continue; > } > > - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && > - ctrl->info.selector == mapping->selector) > - __uvc_ctrl_add_mapping(chain, ctrl, mapping); > + __uvc_ctrl_add_mapping(chain, ctrl, mapping); > } > } > > > --- > base-commit: 68a72104cbcf38ad16500216e213fa4eb21c4be2 > change-id: 20240722-fix-filter-mapping-18477dc69048
On Mon, 22 Jul 2024 at 14:22, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > On Mon, Jul 22, 2024 at 11:52:26AM +0000, Ricardo Ribalda wrote: > > Custom control mapping introduced a bug, where the filter function was > > applied to every single control. > > > > Fix it so it is only applied to the matching controls. > > > > The following dmesg errors during probe are now fixed: > > > > usb 1-5: Found UVC 1.00 device Integrated_Webcam_HD (0c45:670c) > > usb 1-5: Failed to query (GET_CUR) UVC control 2 on unit 2: -75 (exp. 1). > > usb 1-5: Failed to query (GET_CUR) UVC control 3 on unit 2: -75 (exp. 1). > > usb 1-5: Failed to query (GET_CUR) UVC control 6 on unit 2: -75 (exp. 1). > > usb 1-5: Failed to query (GET_CUR) UVC control 7 on unit 2: -75 (exp. 1). > > usb 1-5: Failed to query (GET_CUR) UVC control 8 on unit 2: -75 (exp. 1). > > usb 1-5: Failed to query (GET_CUR) UVC control 9 on unit 2: -75 (exp. 1). > > usb 1-5: Failed to query (GET_CUR) UVC control 10 on unit 2: -75 (exp. 1). > > > > Reported-by: Paul Menzen <pmenzel@molgen.mpg.de> > > Closes: https://lore.kernel.org/linux-media/518cd6b4-68a8-4895-b8fc-97d4dae1ddc4@molgen.mpg.de/T/#t > > Cc: stable@vger.kernel.org > > Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping") > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > > I'll add > > Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> > > from v1 and fix the reported-by tag. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Thanks :) > > --- > > Paul, could you check if this fixes your issue, thanks! > > --- > > Changes in v2: > > - Replace !(A && B) with (!A || !B) > > - Add error message to commit message > > - Link to v1: https://lore.kernel.org/r/20240722-fix-filter-mapping-v1-1-07cc9c6bf4e3@chromium.org > > --- > > drivers/media/usb/uvc/uvc_ctrl.c | 8 +++++--- > > 1 file changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > > index 0136df5732ba..4fe26e82e3d1 100644 > > --- a/drivers/media/usb/uvc/uvc_ctrl.c > > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > > @@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, > > for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { > > const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i]; > > > > + if (!uvc_entity_match_guid(ctrl->entity, mapping->entity) || > > + ctrl->info.selector != mapping->selector) > > + continue; > > + > > /* Let the device provide a custom mapping. */ > > if (mapping->filter_mapping) { > > mapping = mapping->filter_mapping(chain, ctrl); > > @@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, > > continue; > > } > > > > - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && > > - ctrl->info.selector == mapping->selector) > > - __uvc_ctrl_add_mapping(chain, ctrl, mapping); > > + __uvc_ctrl_add_mapping(chain, ctrl, mapping); > > } > > } > > > > > > --- > > base-commit: 68a72104cbcf38ad16500216e213fa4eb21c4be2 > > change-id: 20240722-fix-filter-mapping-18477dc69048 > > -- > Regards, > > Laurent Pinchart
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 0136df5732ba..4fe26e82e3d1 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i]; + if (!uvc_entity_match_guid(ctrl->entity, mapping->entity) || + ctrl->info.selector != mapping->selector) + continue; + /* Let the device provide a custom mapping. */ if (mapping->filter_mapping) { mapping = mapping->filter_mapping(chain, ctrl); @@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, continue; } - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && - ctrl->info.selector == mapping->selector) - __uvc_ctrl_add_mapping(chain, ctrl, mapping); + __uvc_ctrl_add_mapping(chain, ctrl, mapping); } }