Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp2078943lqp; Tue, 16 Apr 2024 06:56:15 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUD9a1huoK/fxm2pifWBfemg5wba+Z+vTnTGpvX9OI4MFYO9IThNMDXjR5gVGyMsEYdrPg7FrC3h8ccD05jFYvhjVMPz0YeqK7xkGQLLw== X-Google-Smtp-Source: AGHT+IEkiHgeKWt1UnhfONKGokyEXyG7FwxLXF+P5M9KVUC51GoZNB7WvgBC8f3aZDVo8/eAxxiP X-Received: by 2002:a05:622a:306:b0:434:6658:b281 with SMTP id q6-20020a05622a030600b004346658b281mr4228770qtw.2.1713275775511; Tue, 16 Apr 2024 06:56:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713275775; cv=pass; d=google.com; s=arc-20160816; b=zD0XbzvnzNc+fPcj0RGrpBivf6rSSjLu0+J4K18M3fDrcunuFNf3xK22JVTtvWe/Rc XF3ApTS1H3c2KzvOL+GIWBP/UysJM2lidPtwhj8FvRSgXYA2jL563iCQh6sQZfer3zj6 9Z6OANXbb/fZ81H4y7Z2OPMnyyQedUxHvZQNo7kqJQvQhOPj7xbaNi3lb16T5AMx3dt5 YdvS+w1zwCDCPY1nO+/CE3diaqYDtkX8hX4i1I2BjuGqPLPElLVgRVLW3K9guJqpWMjP h/SP4wMZZuCCNxHu2WgQ3NX0FLv/ccm9d43xXmK0YAHl2pdYnq559xzaG/YOqot+Dkm9 X7Pw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=eWx2Kpbtub7ppqOBZGqwQkOESKbR8xDF2YSYcFIKhQM=; fh=KsVfM5wJAwSmWlBDhQUIuzi3h8aTwgJEe33eqLJyRj0=; b=ObWjzI77l/9GA8+nv8OpfayPUDmst4I1w20jt7ODgKdTP7+zjo1QcZo9Mz/el/6gwe xDAUNgSkfG5fRz2z5WyPZZfc8qkdQA8OcKZXhRqjpl0AdGnb/qP5oUfaVWQMh8JrLyXX o0SNN68VVYeLU0JZDgAXm8qxxQb4VeNI2oYbr3Sw1+KPIDB9MqzPcE8lPvDa8MeLIigy cEyv75PxMZLi/uu6yr8cyGuYbcfTi2+3rNXuu/U/L5SwoGuZjlDGEmu+2dnPEpodp5sX SB1eZCAXLEYNMWzPfrmaQXud1eKQ/ejwWcY+wwd0fX/G17tbTekK4gus0VD5Z6Pq3NMW Q0Pg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="OPOI/WQS"; arc=pass (i=1 spf=pass spfdomain=ideasonboard.com dkim=pass dkdomain=ideasonboard.com); spf=pass (google.com: domain of linux-kernel+bounces-146918-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146918-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id d17-20020a05622a05d100b00430eb084557si12886442qtb.807.2024.04.16.06.56.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 06:56:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-146918-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="OPOI/WQS"; arc=pass (i=1 spf=pass spfdomain=ideasonboard.com dkim=pass dkdomain=ideasonboard.com); spf=pass (google.com: domain of linux-kernel+bounces-146918-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146918-linux.lists.archive=gmail.com@vger.kernel.org" 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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 2990B1C21452 for ; Tue, 16 Apr 2024 13:56:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4C9D112DDBB; Tue, 16 Apr 2024 13:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="OPOI/WQS" Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19C6212D1EF; Tue, 16 Apr 2024 13:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713275731; cv=none; b=PZu8iIIZc1Mncot4DCZIZCqY63gjA8a0KYrozy+wSZb6wLF/+isUHr6zt6+KAdT64yWG3IDkXxZcbpG+169w6GWc3/fYpgfAxO6Njlm1B/QPLjFmM99uDgAX6jJEnYc1YoU0zpSYrbm45UQhOOJvI/qLD5GepSTOyFT66wVpktA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713275731; c=relaxed/simple; bh=Z0RyfSEDzUrNB+KTFQ++Lirh0TD9nIjn5FaVBuc0a8A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t2+yBEZdHl9DSZQpYrz/9n1FfLakyXYQ1PpNRp5ujBid0G78lPS1dBWohfjgt6aHlE4+JZhYQMtOoBHtTixPWkKUHJqu71P5Bksq8o9rTOhTDuJvMUlXfBL5FnLUd8BdW8R2ulNfXd67dqO2DJSMz5y22yNpQ6HrAMWLK/u3W1U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=OPOI/WQS; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Received: from [127.0.1.1] (91-154-34-181.elisa-laajakaista.fi [91.154.34.181]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 328671653; Tue, 16 Apr 2024 15:54:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1713275680; bh=Z0RyfSEDzUrNB+KTFQ++Lirh0TD9nIjn5FaVBuc0a8A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OPOI/WQShm6Hc783Fx3BCpG3TEMDOk9AU+JnMMCeMKbQsyfr6XxEDwZcn6ksdsNUR JyEtYylsjqiDxtfEfel/Tn0hwGyvvgotrXjf/Y76lFXIUjMzQnHW5C20PBSJpQhXjO muwyflVhPArqwa/YdTPJ7UjzEG0M6YLsSN3dOK1E= From: Tomi Valkeinen Date: Tue, 16 Apr 2024 16:55:06 +0300 Subject: [PATCH v5 03/10] media: subdev: Add checks for subdev features 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: 7bit Message-Id: <20240416-enable-streams-impro-v5-3-bd5fcea49388@ideasonboard.com> References: <20240416-enable-streams-impro-v5-0-bd5fcea49388@ideasonboard.com> In-Reply-To: <20240416-enable-streams-impro-v5-0-bd5fcea49388@ideasonboard.com> To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , Umang Jain Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Tomi Valkeinen X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2250; i=tomi.valkeinen@ideasonboard.com; h=from:subject:message-id; bh=Z0RyfSEDzUrNB+KTFQ++Lirh0TD9nIjn5FaVBuc0a8A=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBmHoNJKFZLenFRr4w8dYUXbgGXSNB1DawZHYwoQ ZKeun7oR+mJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZh6DSQAKCRD6PaqMvJYe 9WCNEAClmM9DATCx3xKGwjD7/0+7eD36TAZf37HH47tU/a5yr4AWXIn46PdCiA8sHT7LL9O3/6U 8LJOSKXst6twC9/PVui2CAm/UOlwGD3SSTSKkiV2Qx8p7gR7vDXxO+AKH3xu0FgXjW+s5rotD36 LqvuUfNBJm8sux2w6Jj8VZxak3ZGP79kJ22QhbhT93vjkMmE3/W010BPvhEBTwuq1/e/iRnVmDm b6D2fPeScGbkIytAVu389gZXCTOoGlW/hz2OQwVHm+8HsUmRyEPfBEqhKtmSSkfOiw6cQtQjGjj 0En4XhdCdnjtC/1NQDWSw0UWPxKk/0sqsdTTkNmaQtFZUgwE4aDnuft8vwO/VAtMOaFPcyj8ans gxLWKaTHgsd7PBTi3VWtmXbSk3OyrXQCFqWMa//kn6FcaV6qltVvX1U1+9qaFxIKauDcy8bGB3x jZ9qVzaZenqoc/bbv0hptuNBOra3m/zlBwHL+Bzg0k+L4wST/TbbNhbI0+Dv6teb83zUyKqaID4 ipGRHq2gsVJ8AH6bUOqsg269PGvum8QpF/QhHLkUlH0CdUDQ3Hb9e64MY66RVQGRMAj+S6ZPY75 tGQEb7Zkp1B7ge4NjfaNBS6t3bTpRYf9K/Tb14u1yLCq+JSihbXSoo6h8ECTgwmMfy3iCA+prRm oLMWwfc7PQ7s41A== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Add some checks to verify that the subdev driver implements required features. A subdevice that supports streams (V4L2_SUBDEV_FL_STREAMS) must do one of the following: - Implement neither .enable/disable_streams() nor .s_stream(), if the subdev is part of a video driver that uses an internal method to enable the subdev. - Implement only .enable/disable_streams(), if support for legacy sink-side subdevices is not needed. - Implement .enable/disable_streams() and .s_stream(), if support for legacy sink-side subdevices is needed. At the moment the framework doesn't check this requirement. Add the check. Reviewed-by: Umang Jain Reviewed-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/media/v4l2-core/v4l2-subdev.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 4a531c2b16c4..606a909cd778 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -1533,6 +1533,33 @@ int __v4l2_subdev_init_finalize(struct v4l2_subdev *sd, const char *name, struct lock_class_key *key) { struct v4l2_subdev_state *state; + struct device *dev = sd->dev; + bool has_disable_streams; + bool has_enable_streams; + bool has_s_stream; + + /* Check that the subdevice implements the required features */ + + has_s_stream = v4l2_subdev_has_op(sd, video, s_stream); + has_enable_streams = v4l2_subdev_has_op(sd, pad, enable_streams); + has_disable_streams = v4l2_subdev_has_op(sd, pad, disable_streams); + + if (has_enable_streams != has_disable_streams) { + dev_err(dev, + "subdev '%s' must implement both or neither of .enable_streams() and .disable_streams()\n", + sd->name); + return -EINVAL; + } + + if (sd->flags & V4L2_SUBDEV_FL_STREAMS) { + if (has_s_stream && !has_enable_streams) { + dev_err(dev, + "subdev '%s' must implement .enable/disable_streams()\n", + sd->name); + + return -EINVAL; + } + } state = __v4l2_subdev_state_alloc(sd, name, key); if (IS_ERR(state)) -- 2.34.1