From nobody Tue Oct 7 10:00:52 2025 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 246A4270EB2; Thu, 10 Jul 2025 13:52:47 +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=1752155570; cv=none; b=ncmng6GwDSah9Zm3wCVlIhod6GRopzqSOSnXrRvCy/OYOsPpkh2hz+gg4203VHDdr4awolMwTmbyWLY1wCoC4jF3KGzwDh9wA/b2fjixcTigTvDeGZMGv/OnhPKSxpuRdV10pR4qmHX9lNFgowpQwMoEuZq6s7+suVtseb+D8do= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155570; c=relaxed/simple; bh=kxbOmxAViuG5CC5jYsRews9l0XX5SO0d2OkKvoO2D2k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WVqlONHqQjF9skNqLsvEDYQlUYwfi7N0iaIVI2gpdC0V6VBP4kooZWQVYYa56QeWX1lW+deUWWnHBQ3anp3D8l0GIGZ/f3w5ZbcCPA5Ut1sGQS3YM2nkAEP0HqnRQFMNry/aqgYAMj4k/SsznXjZGLe7pZaHr6+iM+V0KzBghk4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=AqsdVUiO; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="AqsdVUiO" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8C39DC0B; Thu, 10 Jul 2025 15:52:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155537; bh=kxbOmxAViuG5CC5jYsRews9l0XX5SO0d2OkKvoO2D2k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AqsdVUiO+BIFZ8yiYzg+UgurFiFCMSDEKJXtntLo126FErIXgOCEqmovEIsbOrOA4 d6aJCD5MgzW/6fCFDbrxTxqf+qe0pjeHABV/JO416XRmJv9j1LVfNQmXdwBVU8Fl9y T6yFeQLaPPt0rjT531s9X/wzRVJDuW7mmTHuA97o= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:10 +0200 Subject: [PATCH v2 1/8] media: uapi: Introduce V4L2 extensible params 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: <20250710-extensible-parameters-validation-v2-1-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8502; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=kxbOmxAViuG5CC5jYsRews9l0XX5SO0d2OkKvoO2D2k=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8Wq3sYuqK5CtddIYZAab1pzre6q8TZnG11I9 eLAHf4oeNCJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqgAKCRByNAaPFqFW PDSCD/9Sg1iWjzhZZoaDEDuBfsixX58m4x8ejZ7brUqrTEDKZr2Mhq7SyNbhtZjl9x51TEkMqIw nUwud7Z/1UMYUv0NhdmQXOp53Y8Kpzkf0TNVBS/O38xf+5nFOwkbkjATOS7v9kCMwQpfkdaMG3k OT829V+VIzGProQtQGAsFkk8rBWL1on9sbLomQI35nciUIzrr+N9G8Q4KIuUhrMn9hgmLS5Noe4 llQBoSL5N8A74k6ZQRgzluGpXgq9EhTowsaOLIYZGOA50x1jIeeqd8xMlIgJZpls0WEUrla5Aej zj3/uh55n0tS8X82Eecr8n6Yo6NTPYoY6U55xivwcyfOvLqT7+tHYhYM8Sonph9ZLe4YQGJs1Vn d53p0e4hJwDrTb8vANbAIzzXMnHPzyrVjvskVgPPp+q4Id2FopZYFjXuAkWhVJ6B6T18IpbxkdU TYzxlaLSQwSEk/Oeyb3Avg5tcg9v6zoOCf98Z7iWRRj+LxtsxMgrPWLjdXyax0DJ7Umf7Trh3+E J05LswktJsuQn19q+3KrgybImNCSk/IytYixPMba/ImSKPXyF6eifkpOnRNSbP/WEqBrjcjf4IC /8M1pPyGzrD0siWgz9RIhP7Vk+DXb4ZaZq3wYvQvzh6FCrPrzKcOeA7PA+OEf/jHBkZVkUhk680 yzuLcqAJl+G4MYw== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B Introduce v4l2-extensible-params.h in the Linux kernel uAPI. The header defines two types that all drivers that use the extensible parameters format for ISP configuration shall use to build their own format versions. The newly introduce type v4l2_params_block represent the header to be prepend to each ISP configuration block and the v4l2_params_buffer type represent the base type for the configuration parameters buffer. The v4l2_params_buffer represents the container for the ISP configuration data block. The generic type is defined with a 0-sized data block that specific ISP implementation shall properly size according to their capabilities. [Add v4l2_params_buffer_size()] Signed-off-by: Daniel Scally Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- MAINTAINERS | 6 + include/uapi/linux/media/v4l2-extensible-params.h | 144 ++++++++++++++++++= ++++ 2 files changed, 150 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 658543062bba3b7e600699d7271ffc89250ba7e5..49a9329e5fe8874bdbaca13946e= a28bd80134cb3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25968,6 +25968,12 @@ F: drivers/media/i2c/vd55g1.c F: drivers/media/i2c/vd56g3.c F: drivers/media/i2c/vgxy61.c =20 +V4L2 EXTENSIBLE PARAMETERS FORMAT +M: Jacopo Mondi +L: linux-media@vger.kernel.org +S: Maintained +F: include/uapi/linux/media/v4l2-extensible-params.h + VF610 NAND DRIVER M: Stefan Agner L: linux-mtd@lists.infradead.org diff --git a/include/uapi/linux/media/v4l2-extensible-params.h b/include/ua= pi/linux/media/v4l2-extensible-params.h new file mode 100644 index 0000000000000000000000000000000000000000..ace89299a4b37e428c0bc9a72fb= c079b1dcda91a --- /dev/null +++ b/include/uapi/linux/media/v4l2-extensible-params.h @@ -0,0 +1,144 @@ +/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR MIT) */ +/* + * Video4Linux2 extensible configuration parameters base types + * + * Copyright (C) 2025 Ideas On Board Oy + * Author: Jacopo Mondi + */ + +#ifndef _UAPI_V4L2_PARAMS_H_ +#define _UAPI_V4L2_PARAMS_H_ + +#include + +#define V4L2_PARAMS_FL_BLOCK_DISABLE (1U << 0) +#define V4L2_PARAMS_FL_BLOCK_ENABLE (1U << 1) + +/* + * Reserve the first 8 bits for V4L2_PARAMS_FL_* flag. Platform-specific f= lags + * should be defined as: + * #define PLATFORM_SPECIFIC_FLAG0 ((1U << V4L2_PARAMS_FL_PLATFORM_FLAGS(0= )) + * #define PLATFORM_SPECIFIC_FLAG1 ((1U << V4L2_PARAMS_FL_PLATFORM_FLAGS(1= )) + */ +#define V4L2_PARAMS_FL_PLATFORM_FLAGS(n) ((n) << 8) + +/** + * struct v4l2_params_block_header - V4L2 extensible parameters block head= er + * + * This structure represents the common part of all the ISP configuration + * blocks. Each parameters block shall embed an instance of this structure= type + * as its first member, followed by the block-specific configuration data.= The + * driver inspects this common header to discern the block type and its si= ze and + * properly handle the block content by casting it to the correct block-sp= ecific + * type. + * + * The @type field is one of the values enumerated by each platform-specif= ic ISP + * block types which specifies how the data should be interpreted by the d= river. + * The @size field specifies the size of the parameters block and is used = by the + * driver for validation purposes. + * + * The @flags field is a bitmask of per-block flags V4L2_PARAMS_FL_* and + * platform-specific flags specified by the platform-specific header. + * + * Documentation of the platform-specific flags handling is specified by t= he + * platform-specific block header type: + * + * - Rockchip RkISP1: :c:type:`rkisp1_ext_params_block_type` + * - Amlogic C3: :c:type:`c3_isp_params_block_type` + * + * Userspace is responsible for correctly populating the parameters block = header + * fields (@type, @flags and @size) and the block-specific parameters. + * + * @type: The parameters block type (platform-specific) + * @flags: A bitmask of block flags (platform-specific) + * @size: Size (in bytes) of the parameters block, including this header + */ +struct v4l2_params_block_header { + __u16 type; + __u16 flags; + __u32 size; +} __attribute__((aligned(8))); + +/** + * v4l2_params_buffer_size - Calculate size of v4l2_params_buffer for a pl= atform + * + * Users of the v4l2 extensible parameters will have differing sized data = arrays + * depending on their specific parameter buffers. Drivers and userspace wi= ll + * need to be able to calculate the appropriate size of the struct to + * accommodate all ISP configuration blocks provided by the platform. + * This macro provides a convenient tool for the calculation. + * + * Each driver shall provide a definition of their extensible parameters + * implementation data buffer size. As an example: + * + * #define PLATFORM_BLOCKS_MAX_SIZE \ + * sizeof(platform_block_0) + \ + * sizeof(platform_block_1) + * + * #define PLATFORM_BUFFER_SIZE \ + * v4l2_params_buffer_size(PLATFORM_BLOCKS_MAX_SIZE) + * + * Drivers are then responsible for allocating buffers of the proper size + * by assigning PLATFORM_BUFFER_SIZE to the per-plane size of the videobuf2 + * .queue_setup() operation and userspace shall use PLATFORM_BUFFER_SIZE + * when populating the ISP configuration data buffer. + * + * @max_params_size: The total size of the ISP configuration blocks + */ +#define v4l2_params_buffer_size(max_params_size) \ + (offsetof(struct v4l2_params_buffer, data) + (max_params_size)) + +/** + * struct v4l2_params_buffer - V4L2 extensible parameters configuration + * + * This struct contains the configuration parameters of the ISP algorithms, + * serialized by userspace into a data buffer. Each configuration parameter + * block is represented by a block-specific structure which contains a + * :c:type:`v4l2_params_block_header` entry as first member. Userspace pop= ulates + * the @data buffer with configuration parameters for the blocks that it i= ntends + * to configure. As a consequence, the data buffer effective size changes + * according to the number of ISP blocks that userspace intends to configu= re and + * is set by userspace in the @data_size field. + * + * The parameters buffer is versioned by the @version field to allow modif= ying + * and extending its definition. Userspace shall populate the @version fie= ld to + * inform the driver about the version it intends to use. The driver will = parse + * and handle the @data buffer according to the data layout specific to the + * indicated version and return an error if the desired version is not + * supported. + * + * For each ISP block that userspace wants to configure, a block-specific + * structure is appended to the @data buffer, one after the other without = gaps + * in between nor overlaps. Userspace shall populate the @data_size field = with + * the effective size, in bytes, of the @data buffer. + * + * Drivers shall take care of properly sizing of the extensible parameters + * buffer @data array. The v4l2_params_buffer type is defined with a + * flexible-array-member at the end, which resolves to a size of 0 bytes w= hen + * inspected with sizeof(struct v4l2_params_buffer). This of course is not + * suitable for neither buffer allocation in the kernel driver nor for pro= per + * handling in userspace of the @data buffer it has to populate. + * + * Drivers using this type in their userspace API definition are responsib= le + * for providing the exact definition of the @data buffer size using the + * v4l2_params_buffer_size() macro. The size shall be used + * by the driver for buffers allocation and by userspace for populating the + * @data buffer before queueing it to the driver + * + * Drivers that were already using extensible-parameters before the introd= uction + * of this file define their own type-convertible implementation of this + * type, see: + * - Rockchip RkISP1: :c:type:`rkisp1_ext_params_cfg` + * - Amlogic C3: :c:type:`c3_isp_params_cfg` + * + * @version: The parameters buffer version (platform-specific) + * @data_size: The configuration data effective size, excluding this header + * @data: The configuration data + */ +struct v4l2_params_buffer { + __u32 version; + __u32 data_size; + __u8 data[]; +}; + +#endif /* _UAPI_V4L2_PARAMS_H_ */ --=20 2.49.0 From nobody Tue Oct 7 10:00:52 2025 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 40FC4272803; Thu, 10 Jul 2025 13:52:49 +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=1752155572; cv=none; b=QI3P1CU41Z/7WctAlBXU+6T4riZ3oouDTOaKeHcIuqcBVzQ8D7j8Ym+Cqeq0pAxOD6hJP38k8WMfYik534KdaMgiGoLS3/fNO8ZBvX5J6l+EYlszeJylzeLZYbinjr1GMtQ7ILbAp43hclZFoZtlam9BLD+EjNGCqFSJ0v/Q8F8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155572; c=relaxed/simple; bh=7p0S45GnAkMB2JTqcBE/TxN1viQO9Br2/si04uKRvuw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OUEUtFBpvAi0xcCYq6GiuqtEIF3GmS35PSOy/eosRokApVaZSRUs7fGW3jIytYOi/yLN9sbgb7UustsVq/9vhssmIzxzNKWoy9T2nORhGamfdCKeua9tTgHSlx3axabbM+vIuFuli7EwP0SZfTH+097F0pfFn0CfbFUIiPpkvOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=YqZNYKOL; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="YqZNYKOL" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A94C1F09; Thu, 10 Jul 2025 15:52:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155538; bh=7p0S45GnAkMB2JTqcBE/TxN1viQO9Br2/si04uKRvuw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YqZNYKOL4sEZl6L/e0Y/gn4uQUk1zC1PNKArvGTWL53QaSRDx9+jVgO8oTI+v1aRk P4iBCm4S449ERE4Vbu0UgjhzvO94TvXUkzwwMBGLXg0w/e8hywB4EaYremqFjT3QpC 5PPtRZFctYDjkbkeNEythomyWmjRS9eE/w3Gxtyk= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:11 +0200 Subject: [PATCH v2 2/8] media: uapi: Convert RkISP1 to V4L2 extensible params 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: <20250710-extensible-parameters-validation-v2-2-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6938; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=7p0S45GnAkMB2JTqcBE/TxN1viQO9Br2/si04uKRvuw=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8WqKkT3l39ZAnRcXrrHJdFtr9TupVQPGHlwE QmsTyueR6OJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqgAKCRByNAaPFqFW PJarD/9zgkvZ8OtUyvwEFgld1YJgvPSgPeZc9uoXH/PBkCdJQGs36mElBh3QwEpCQ8mSlIe9/n8 IsbZ+IacaaQbLQqsF37+iMsoCbhlBpgq0wNSbewPB76UJWQw5DYf9AqvyNHAvFjgRIJBhaILFKj GeFNuFiP9oLyCfQNp0E9z7/TffzvTERZZE+t0xnckxXFvsESGLKKeigCpsexuF9+NL2zqfcV5Zp YmBHlnMj1JCmNGMJvRCFaTYMpWYhRV7ypljDtKj/BZNZV+57V8dnP0ceFkpGvNag9YwRbXZiD5x uVl8LYrSLDln33D9jPOfGrtT0/H+YEOGF3AmWLBJjyQ5EDdDlcxDrh75HuwDKsUnBKbjEBRE0HT w786Br6RKsWU83KJluyidSvcZsixV99iHiwyR+3QYGOZp8z8StknWNkPFpHZAjkuyLWIIP179ox 2dLVHG1mAUYp/dWx8V6UX2mStbKwrMftJHQCOwS6uHyoB4JexUTRvwkcxD15gVG2cIbwHEq2UL3 REGGjvMPnKpQChn+2zXzVzV5ra8EVKd2hc16iWH2R6vOCTKzZUu9JOtmezCnBQhi9tiWKuRpbEz Nq45hnxN3p1bxrxbuygqtkNb9a4CFX709MP1Ad9KSFmBUsGVS+2HqDRrLHgJB6vDIrKg2OmCgdR EYCVjR3IrTQ6IfA== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B With the introduction of common types for extensible parameters format, convert the rkisp1-config.h header to use the new types. Factor-out the documentation that is now part of the common header and only keep the driver-specific on in place. The conversion to use common types doesn't impact userspace as the new types are either identical to the ones already existing in the RkISP1 uAPI or are 1-to-1 type convertible. Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- include/uapi/linux/rkisp1-config.h | 67 +++++++++++++---------------------= ---- 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1= -config.h index 3b060ea6eed71b87d79abc8401eae4e9c9f5323a..fc040c7fb13cf18eaf8d9067e7b= e38bff120e6f6 100644 --- a/include/uapi/linux/rkisp1-config.h +++ b/include/uapi/linux/rkisp1-config.h @@ -7,8 +7,13 @@ #ifndef _UAPI_RKISP1_CONFIG_H #define _UAPI_RKISP1_CONFIG_H =20 +#ifdef __KERNEL__ +#include +#endif /* __KERNEL__ */ #include =20 +#include + /* Defect Pixel Cluster Detection */ #define RKISP1_CIF_ISP_MODULE_DPCC (1U << 0) /* Black Level Subtraction */ @@ -1158,26 +1163,21 @@ enum rkisp1_ext_params_block_type { RKISP1_EXT_PARAMS_BLOCK_TYPE_WDR, }; =20 -#define RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE (1U << 0) -#define RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE (1U << 1) +#define RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE V4L2_PARAMS_FL_BLOCK_DISABLE +#define RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE V4L2_PARAMS_FL_BLOCK_ENABLE =20 /* A bitmask of parameters blocks supported on the current hardware. */ #define RKISP1_CID_SUPPORTED_PARAMS_BLOCKS (V4L2_CID_USER_RKISP1_BASE + 0x= 01) =20 /** - * struct rkisp1_ext_params_block_header - RkISP1 extensible parameters bl= ock - * header + * rkisp1_ext_params_block_header - RkISP1 extensible parameters block hea= der * * This structure represents the common part of all the ISP configuration - * blocks. Each parameters block shall embed an instance of this structure= type - * as its first member, followed by the block-specific configuration data.= The - * driver inspects this common header to discern the block type and its si= ze and - * properly handle the block content by casting it to the correct block-sp= ecific - * type. + * blocks and is identical to :c:type:`v4l2_params_block_header`. * - * The @type field is one of the values enumerated by + * The type field is one of the values enumerated by * :c:type:`rkisp1_ext_params_block_type` and specifies how the data shoul= d be - * interpreted by the driver. The @size field specifies the size of the + * interpreted by the driver. The size field specifies the size of the * parameters block and is used by the driver for validation purposes. * * The @flags field is a bitmask of per-block flags RKISP1_EXT_PARAMS_FL_*. @@ -1193,14 +1193,14 @@ enum rkisp1_ext_params_block_type { * If a new configuration of an ISP block has to be applied userspace shall * fully populate the ISP block configuration and omit setting the * RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE and RKISP1_EXT_PARAMS_FL_BLOCK_DISABL= E bits - * in the @flags field. + * in the flags field. * * Setting both the RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE and - * RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE bits in the @flags field is not allo= wed + * RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE bits in the flags field is not allow= ed * and not accepted by the driver. * * Userspace is responsible for correctly populating the parameters block = header - * fields (@type, @flags and @size) and the block-specific parameters. + * fields (type, flags and size) and the block-specific parameters. * * For example: * @@ -1220,17 +1220,8 @@ enum rkisp1_ext_params_block_type { * bls->config.fixed_val.gb =3D blackLevelGreenB_; * bls->config.fixed_val.b =3D blackLevelBlue_; * } - * - * @type: The parameters block type, see - * :c:type:`rkisp1_ext_params_block_type` - * @flags: A bitmask of block flags - * @size: Size (in bytes) of the parameters block, including this header */ -struct rkisp1_ext_params_block_header { - __u16 type; - __u16 flags; - __u32 size; -}; +#define rkisp1_ext_params_block_header v4l2_params_block_header =20 /** * struct rkisp1_ext_params_bls_config - RkISP1 extensible params BLS conf= ig @@ -1594,21 +1585,7 @@ enum rksip1_ext_param_buffer_version { /** * struct rkisp1_ext_params_cfg - RkISP1 extensible parameters configurati= on * - * This struct contains the configuration parameters of the RkISP1 ISP - * algorithms, serialized by userspace into a data buffer. Each configurat= ion - * parameter block is represented by a block-specific structure which cont= ains a - * :c:type:`rkisp1_ext_params_block_header` entry as first member. Userspa= ce - * populates the @data buffer with configuration parameters for the blocks= that - * it intends to configure. As a consequence, the data buffer effective si= ze - * changes according to the number of ISP blocks that userspace intends to - * configure and is set by userspace in the @data_size field. - * - * The parameters buffer is versioned by the @version field to allow modif= ying - * and extending its definition. Userspace shall populate the @version fie= ld to - * inform the driver about the version it intends to use. The driver will = parse - * and handle the @data buffer according to the data layout specific to the - * indicated version and return an error if the desired version is not - * supported. + * This is the driver-specific implementation of :c:type:`v4l2_params_buff= er`. * * Currently the single RKISP1_EXT_PARAM_BUFFER_V1 version is supported. * When a new format version will be added, a mechanism for userspace to q= uery @@ -1624,11 +1601,6 @@ enum rksip1_ext_param_buffer_version { * the maximum value represents the blocks supported by the kernel driver, * independently of the device instance. * - * For each ISP block that userspace wants to configure, a block-specific - * structure is appended to the @data buffer, one after the other without = gaps - * in between nor overlaps. Userspace shall populate the @data_size field = with - * the effective size, in bytes, of the @data buffer. - * * The expected memory layout of the parameters buffer is:: * * +-------------------- struct rkisp1_ext_params_cfg -------------------+ @@ -1678,4 +1650,11 @@ struct rkisp1_ext_params_cfg { __u8 data[RKISP1_EXT_PARAMS_MAX_SIZE]; }; =20 +#ifdef __KERNEL__ +/* Make sure the header is type-convertible to the generic v4l2 params one= */ +static_assert((sizeof(struct rkisp1_ext_params_cfg) - + RKISP1_EXT_PARAMS_MAX_SIZE) =3D=3D + sizeof(struct v4l2_params_buffer)); +#endif /* __KERNEL__ */ + #endif /* _UAPI_RKISP1_CONFIG_H */ --=20 2.49.0 From nobody Tue Oct 7 10:00:52 2025 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 106232737F6; Thu, 10 Jul 2025 13:52:51 +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=1752155573; cv=none; b=IeWU8mU62dqrmlCE6q0B+vBnsEfqImTCST1L3t5rBLRckRLG6bOKq7ijMToBnXvt7Wh38r7zYPpCa5myJ1+iz6MNbo5umquXb+cG9vPX009RX1+bpUhhD7bTo7QrzfaEIpIRthX5zuyKR2bD+RwG/Rr6cuV594f7IrogtliPXII= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155573; c=relaxed/simple; bh=ocDfHmwhFkBEj++dyd8u+aPRUHOxpBG9wQGQR9RmuDc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QJ1VSNDk6Bn3lQMeqqpXf+2iXFtBt1TCgcchCcIYaK66icv4UIfTRvlYxZNIYvv8ZcOtxEllvrSZlnjRNWmrW9BZ3ELIYn0WN+M6gNyursLGuZvuCz/DZ3NeDDp7QYc19g+1M0V9JHm3uJxdz18/JO02gTArbm3gA5M7+VuuJn0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=UhciDtS+; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="UhciDtS+" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B365E111D; Thu, 10 Jul 2025 15:52:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155539; bh=ocDfHmwhFkBEj++dyd8u+aPRUHOxpBG9wQGQR9RmuDc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=UhciDtS+kjwJ/ov+tdkJ6AKRPqPNGZTS84L6iDXIr65oPzJyjT6VJhpgAL8HS4pe+ 8fhVEdxs3uykC9BUP3yGSHu8Nvh2l8EZMX9Z/x/NOGCP3n5iatsyWHUH0L7PtNH6LE sp9/CqJsuOz+WZSObxh7aKGiQ8creKleWvOZG3mM= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:12 +0200 Subject: [PATCH v2 3/8] media: uapi: Convert Amlogic C3 to V4L2 extensible params 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: <20250710-extensible-parameters-validation-v2-3-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4576; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=ocDfHmwhFkBEj++dyd8u+aPRUHOxpBG9wQGQR9RmuDc=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8WqsCxcIv3CltSYirvfLaD6Ver6y9j6jhjT+ rmU9kx4LoGJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqgAKCRByNAaPFqFW PAgyD/9cp+kfbyqwNXXtWpRZdhKI3OVUbbhLXAl+udHK1pgaq5kFfqdmJ6uYFH1kgBJUwKWIybd YkZ+2RQKTHiaA/7xZLPhmUzvzDe+da2avK+3GiUcXnNudvpMySHHmeUw0XsWR69YZ69gqLLbnaq GsvH5apS4O6YnjOw2dIIuKX4XOxyYIj1oJjzo8hkT++OoixoeF5+ejZJIaQBoxYsiMFKUcgw3sn cy6vb9pJ/dQO1UsMH+FDZAWRBA645cgz6TVtkqtL3qjqEajApS8AGOgESUFiJ9CObLuvwH1nrlC 3XUI7c0HNmhIJJtCGSrWecNuH1fGFXhFUC1OpFiSvxJkrvhxCfuqau2Re9AjLBxVP3/w8uatmmb zD1BgLoYeCSJfQI08e8PtnNnB7hYPQsyvweUV+K2xXGc/Lgo8UkdSg39/VRs/ks5aZkZs/N8LZY Ws2dtKadr1ltIQXByavgL+n/zds3Mxi7CKwer1uLDkVOuafOf6s7zDaykibJeRgtAAeehU3K4ab D0MFrsslYrsJHVl637N6pxs5VwnmvB3U4Lu7ZEajmM3aOAijESu7G58vGChq+HVrqwJIAl8JYjc 79RahXilwyL0yS4Z9S+Wgyzs5/LbyzvV9jMjXJ23a51aCysBLfXgOolfW+wP1XNGTYg4+rQ4cPe t0fAw6cxaicX3AA== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B With the introduction of common types for extensible parameters format, convert the c3-isp-config.h header to use the new types. Factor-out the documentation that is now part of the common header and only keep the driver-specific on in place. The conversion to use common types doesn't impact userspace as the new types are either identical to the ones already existing in the C3 ISP uAPI or are 1-to-1 type convertible. Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- include/uapi/linux/media/amlogic/c3-isp-config.h | 48 ++++++++------------= ---- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/include/uapi/linux/media/amlogic/c3-isp-config.h b/include/uap= i/linux/media/amlogic/c3-isp-config.h index ed085ea62a574932c7ad8d59d34b2c5c74a597d8..15d3ac289ece610132e1d4b43ec= d56b7ef527ef6 100644 --- a/include/uapi/linux/media/amlogic/c3-isp-config.h +++ b/include/uapi/linux/media/amlogic/c3-isp-config.h @@ -6,8 +6,13 @@ #ifndef _UAPI_C3_ISP_CONFIG_H_ #define _UAPI_C3_ISP_CONFIG_H_ =20 +#ifdef __KERNEL__ +#include +#endif /* __KERNEL__ */ #include =20 +#include + /* * Frames are split into zones of almost equal width and height - a zone i= s a * rectangular tile of a frame. The metering blocks within the ISP collect @@ -183,11 +188,6 @@ enum c3_isp_params_block_type { * struct c3_isp_params_block_header - C3 ISP parameter block header * * This structure represents the common part of all the ISP configuration - * blocks. Each parameters block shall embed an instance of this structure= type - * as its first member, followed by the block-specific configuration data.= The - * driver inspects this common header to discern the block type and its si= ze and - * properly handle the block content by casting it to the correct block-sp= ecific - * type. * * The @type field is one of the values enumerated by * :c:type:`c3_isp_params_block_type` and specifies how the data should be @@ -223,15 +223,8 @@ enum c3_isp_params_block_type { * gamma->pst_gamma_lut[i] =3D i; * } * - * @type: The parameters block type from :c:type:`c3_isp_params_block_type` - * @flags: A bitmask of block flags - * @size: Size (in bytes) of the parameters block, including this header */ -struct c3_isp_params_block_header { - __u16 type; - __u16 flags; - __u32 size; -}; +#define c3_isp_params_block_header v4l2_params_block_header =20 /** * struct c3_isp_params_awb_gains - Gains for auto-white balance @@ -498,26 +491,9 @@ struct c3_isp_params_blc { /** * struct c3_isp_params_cfg - C3 ISP configuration parameters * - * This struct contains the configuration parameters of the C3 ISP - * algorithms, serialized by userspace into an opaque data buffer. Each - * configuration parameter block is represented by a block-specific struct= ure - * which contains a :c:type:`c3_isp_param_block_header` entry as first - * member. Userspace populates the @data buffer with configuration paramet= ers - * for the blocks that it intends to configure. As a consequence, the data - * buffer effective size changes according to the number of ISP blocks that - * userspace intends to configure. - * - * The parameters buffer is versioned by the @version field to allow modif= ying - * and extending its definition. Userspace should populate the @version fi= eld to - * inform the driver about the version it intends to use. The driver will = parse - * and handle the @data buffer according to the data layout specific to the - * indicated revision and return an error if the desired revision is not - * supported. - * - * For each ISP block that userspace wants to configure, a block-specific - * structure is appended to the @data buffer, one after the other without = gaps - * in between nor overlaps. Userspace shall populate the @total_size field= with - * the effective size, in bytes, of the @data buffer. + * This is the driver-specific implementation of :c:type:`v4l2_params_buff= er`. + * + * Currently only C3_ISP_PARAM_BUFFER_V0 is supported. * * The expected memory layout of the parameters buffer is:: * @@ -561,4 +537,10 @@ struct c3_isp_params_cfg { __u8 data[C3_ISP_PARAMS_MAX_SIZE]; }; =20 +#ifdef __KERNEL__ +/* Make sure the header is type-convertible to the generic v4l2 params one= */ +static_assert((sizeof(struct c3_isp_params_cfg) - C3_ISP_PARAMS_MAX_SIZE) = =3D=3D + sizeof(struct v4l2_params_buffer)); +#endif /* __KERNEL__ */ + #endif --=20 2.49.0 From nobody Tue Oct 7 10:00:52 2025 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 AFC83273D71; Thu, 10 Jul 2025 13:52:53 +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=1752155575; cv=none; b=Nf4pfLnzdf5NSmlcs9dIEhV25hOGgT05h8OiFiAPSfD6JhgdApDJVov0oCk6lCiEYTRcZPet0sDocqkGs7sc0PS1Gi7yxTPD1/NFp40WaFsK9GpCPVvxk3eMb7fYl7S9OzSBfWcxJSETRsQkitO/vrKWt1JYKQXcKC7V6vITY30= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155575; c=relaxed/simple; bh=d7XUyzRrxvNfwTKUjtwnr/8Wt0x2t8Ril2GgGGU8mJ8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R4E31nka/YgBU9Q1fdv7+lk+lLuolEPy8wk5dagDbX3Obt+gNtZ+GW71TOdjwcZEyfXozkCC82IrV1BEEXgM3asvhD8a6k8zVrQnUgbubmFg4OSk5nCjsxqqtZM6Os6fOacUs/tCqmlhNprwwBX44pAjo6LtYPDjLkTpaVZU0O4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=CcqQwlUE; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CcqQwlUE" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DD6CB18B1; Thu, 10 Jul 2025 15:52:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155540; bh=d7XUyzRrxvNfwTKUjtwnr/8Wt0x2t8Ril2GgGGU8mJ8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CcqQwlUEe6jWWSpeU45Uhkqu6oaccb9HuJyBEYco57zfcxTiYZqrxzDhpff56M71S 5vd1ONVEYCXU6CSEbhfTji7YWVzp/HgFCKrtdi/r3AultxS18lmKUAJ+qzRPXX9ovL fdbyM3AroIY+U4UMhfzPG6+rDW3nWqc6VTCZxErw= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:13 +0200 Subject: [PATCH v2 4/8] media: Documentation: uapi: Add V4L2 extensible parameters 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: <20250710-extensible-parameters-validation-v2-4-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5896; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=d7XUyzRrxvNfwTKUjtwnr/8Wt0x2t8Ril2GgGGU8mJ8=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8WrJtzhnI9KuhM2zMwOVznfah4C5H9uVOLIi 6GGYkzO7BiJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqwAKCRByNAaPFqFW PLOLD/9eEwPG6bqp8h1SKlOJHHpFbql+4THTOxcezzMQmir5opbA7wz9Y/yTO4S4B8o/cbbSnNL kGgxFGG48Tt+JQRDV8bD6pg8OMsAErDUkNINi4r+zKftHBuivchfnLNyR0UUsahen27KY5+Ewce 9Qbtxq7/yoZYG0GaptjAOppXN/HqaEWKetKJNxVZsrtzcLXbmOZNnwy8UdNJe2BQYxc5Lc3n3yK FKtDTZrHKa1xBxHjjbI3bMxCjGKtjs5OsWeQN5DPz02fKGfFn3+KqKk1Urj5/ceink6jpgQ1hqC popGVtHSCgu4Isgr2ky32JLuhZEBVleVWXSfbdh200FyJ1gPc7hmSvGSrizvp29k2aDzKEXXOxi lJJka3Kq8doqEmwm8e9zfbLl82cU8TBSyQ7jeV3NTdhcTDFEZvbN11eRj/F2MU9CCjrFz0ZVKU8 +oELnfiX0SBoMAKRyjE+vqdoMEofitIVDGr7H08mKDifnvvEyFtqMAXLo5/k9jcgmuCBsRjCeqW fSsKRAmWVnEcUAgh/NPwGbkoS7Eq0uRLizku1+Co6zqGSYNuRWhMN1estM+lVbwTCQ6BAhx0bGl 94wpERmcPYDvr3rV1W5ZwqmnAudLKvPTBpJgDbOw5yeJtlASeQYFBxBpvEDY46AfjNmIFLnJLCq Fs759qjFH+QrzVA== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B Add documentation for extensible parameters format to the V4L2 userspace API documentation. Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- .../media/v4l/extensible-parameters.rst | 89 ++++++++++++++++++= ++++ .../userspace-api/media/v4l/meta-formats.rst | 1 + MAINTAINERS | 1 + 3 files changed, 91 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/extensible-parameters.rs= t b/Documentation/userspace-api/media/v4l/extensible-parameters.rst new file mode 100644 index 0000000000000000000000000000000000000000..c4caa5c1df991d4dd91f986571d= b55135d15204a --- /dev/null +++ b/Documentation/userspace-api/media/v4l/extensible-parameters.rst @@ -0,0 +1,89 @@ +.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later + +.. _extensible-parameters: + +********************************** + V4L2 extensible parameters format +********************************** + +ISP configuration +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +ISP configuration parameters are computed by userspace and programmed into= a +*parameters buffer* which is queued to the ISP driver on a per-frame basis= . The +layout of the *parameters buffer* generally reflects the ISP peripheral +registers layout and is, for this reason, platform specific. + +The ISP configuration parameters are passed to the ISP driver through a me= tadata +output video node, using the :c:type:`v4l2_meta_format` interface. Each ISP +driver defines a metadata format that implements the configuration paramet= ers +layout. + +Metadata output formats that describe ISP configuration parameters are mos= t of +the time realized by implementing C structures that reflect the registers = layout +and gets populated by userspace before queueing the buffer to the ISP. Each +C structure usually corresponds to one ISP *processing block*, with each b= lock +implementing one of the ISP supported features. + +The uAPI/ABI problem +-------------------- + +By upstreaming data types that describe the configuration parameters layou= t, +driver developers make them part of the Linux kernel ABI. As it sometimes +happens for most peripherals in Linux, ISP drivers development is often an +iterative process, where sometimes not all the hardware features are suppo= rted +in the first version that lands in the kernel, and some parts of the inter= face +have to later be modified for bug-fixes or improvements. + +If any later bug-fix/improvement requires changes to the metadata output f= ormat, +this is considered an ABI-breakage that is strictly forbidden by the Linux +kernel policies. For this reason, each new iteration of an ISP driver supp= ort +would require defining a new metadata output format, implying that drivers= have +to be made ready to handle several different configuration formats. + +A new set of metadata output formats has then to be defined, with the desi= gn +goals of being: + +- Extensible: new features can be added later on without breaking the exis= ting + interface +- Versioned: different versions of the format can be defined without + breaking the existing interface + +The extensible parameters format +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D + +Extensible configuration formats are realized by a defining a single C str= ucture +that contains a few control parameters and a binary buffer where userspace +programs a variable number of *ISP configuration blocks* data. + +The generic :c:type:`v4l2_params_buffer` defines a base type that each dri= ver +can use by properly sizing the data buffer array. + +Each *ISP configuration block* is identified by an header and contains the +parameters for that specific block. + +The generic :c:type:`v4l2_params_block_header` defines a base type that ea= ch +driver can re-use as it is or extend appropriately. + +Userspace applications program in the control buffer only the parameters o= f the +ISP whose configuration has changed for the next frame. The ISP driver par= ses +the configuration parameters and apply them to the hardware register. + +Any further development that happens after the ISP driver has been merged = in +Linux and which requires supporting new ISP features can be implemented by +adding new blocks definition without invalidating the existing ones. Simil= arly, +any change to the existing ISP configuration blocks can be handled by vers= ioning +them, again without invalidating the existing ones. + +Implementations +--------------- + +ISP drivers that define an extensible parameters metadata output format: + +- :ref:`RkISP1 ` +- :ref:`Amlogic C3 ISP ` + +V4L2 extensible parameters uAPI data types +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +.. kernel-doc:: include/uapi/linux/media/v4l2-extensible-params.h diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Docum= entation/userspace-api/media/v4l/meta-formats.rst index bb6876cfc271e1a0543eee4209d6251e1a6a73cc..58eb3c9c962bee008eee27d9c16= 678213c47baa9 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst @@ -12,6 +12,7 @@ These formats are used for the :ref:`metadata` interface = only. .. toctree:: :maxdepth: 1 =20 + extensible-parameters metafmt-c3-isp metafmt-d4xx metafmt-generic diff --git a/MAINTAINERS b/MAINTAINERS index 49a9329e5fe8874bdbaca13946ea28bd80134cb3..beecac86991d988c48d31366ba5= 201b09ef25715 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25972,6 +25972,7 @@ V4L2 EXTENSIBLE PARAMETERS FORMAT M: Jacopo Mondi L: linux-media@vger.kernel.org S: Maintained +F: Documentation/userspace-api/media/v4l/extensible-parameters.rst F: include/uapi/linux/media/v4l2-extensible-params.h =20 VF610 NAND DRIVER --=20 2.49.0 From nobody Tue Oct 7 10:00:52 2025 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 21C63274B2D; Thu, 10 Jul 2025 13:52:55 +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=1752155577; cv=none; b=qY8Sh4M/SDVEydPA/2g5E6hcaHvSUrZW0FNaPFdtOSOblqBfj+6X+BYS5Szcaaiei8DRvwQcYwj5RJIkZuzoxPWo9M4Q+MYs9cSGVKM2xbMt5vg+Sut0zAu36iRVfuWA23x7uIJUXzpsBIytgzuED9GTd4cXKcdFR6rfnYXwlcc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155577; c=relaxed/simple; bh=LzdhjGHFZAJWVWmdaCpkz455akL0E3MzU/UWgA36WWI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TbERvXDTh2TQVWKEfUD9nOe18NYL46DJQp0L5Eoxds0cVIseCE8cyXA5jBYnh0984dq6iTat3uK9RhklIoPzut1kizF2PQDd46eKQqq1H/3q1t1BQBS783/x7+TbW3VXBLD16WtZdFz1jf9fZmkSSLr1Px9vBeuuBrU9P0awXtA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=pUIKCwpw; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="pUIKCwpw" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 14C957E4; Thu, 10 Jul 2025 15:52:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155542; bh=LzdhjGHFZAJWVWmdaCpkz455akL0E3MzU/UWgA36WWI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pUIKCwpwJ56iZNAC2K1Wb7132ZZyeKPmXsr2doc1no7Trbhg/MUarl+CyUJoX77rO xEl6nuuKYYDApR2rTpWqYBvswusZ2AXU5RoeeVrVgJpt4PUL9S4KXUYm70hLLo5A8Q hbcX4nGzJh/hYwbr2C3oLNyItSUOzVS83WBs+bm4= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:14 +0200 Subject: [PATCH v2 5/8] media: v4l2-common: Introduce v4l2-params.c 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: <20250710-extensible-parameters-validation-v2-5-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=13580; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=LzdhjGHFZAJWVWmdaCpkz455akL0E3MzU/UWgA36WWI=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8WrpUoB9Mnqo/TF4YcQUQ5ggcAhdAcuG2Zly 9/b/A2jukWJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqwAKCRByNAaPFqFW PD61D/9UJncuoDboHYcT64q0haoTtjzsHdp7OJA7st1aMBpI0GUC8DyFx0oov7Jvh88aT01pLvB XPQfbZLgIWaxG8Vy72fsKP/5D8Nd1ImOHTIZknyPLNZroWtMO79tyEHvXRz5kXmrCVJAs6lFCa6 BK6eKswqIC8/loK71M8GN2nYEnlCd7wzdAmztLyEsXD2cLPXAGphBSze47eL5+hkzhpp5v3FA1k +HbX1+Oo8VlQpgimnaTF5CpS/W6a3WjHilM9sRH+rdNq3BGYjUdb8jG9gkxzZapFbmxdGF6LJAE n4zadfe3AkhU0pqc68DEneAP+4iRwps5njvKkqG3ZskeJvZkVAhg8PIQ8kOk2zWsDSswmj4codt dk3vdoThvd3UYTZezm6VlGeOVLnWWXRdO2bvU5TQhbdCTLDy408yWG6086Pvgdd4UN6VyDrq/ph Igv9sYwWCC91lUuCi41jutnaaoNZdVR89n0tIXlt8JTthT+vjLuFnS+4/RGGmN30g6eml2qULV7 N4Z4SnPkErzcRHIb2zTx/CLBL0ZNGzlF7PhI385ZfdQsEvEvcKU3UNks8M/zIjo9274ikOI2zkX FE9P0vWAWzg1NQVxW3L7NUxL1UoTis2xGC1nEo+tcgld/QCmBj+aDoH3gWtRNMGma7h3pI+1eNC Uu/kKAuTED/b7YQ== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B Add to the v4l2 framework an helper function to support drivers when validating a buffer of extensible parameters. Introduce new types in include/media/v4l2-params.h that drivers shall use in order to comply with the v4l2-params validation procedure, and add a helper functions to v4l2-params.c to perform block and buffer validation. Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- MAINTAINERS | 2 + drivers/media/v4l2-core/Makefile | 3 +- drivers/media/v4l2-core/v4l2-params.c | 128 ++++++++++++++++++++++++++ include/media/v4l2-params.h | 165 ++++++++++++++++++++++++++++++= ++++ 4 files changed, 297 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index beecac86991d988c48d31366ba5201b09ef25715..3d9a8e06c59eb08360d1e8eea85= e450a15ee95af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25973,6 +25973,8 @@ M: Jacopo Mondi L: linux-media@vger.kernel.org S: Maintained F: Documentation/userspace-api/media/v4l/extensible-parameters.rst +F: drivers/media/v4l2-core/v4l2-params.c +F: include/media/v4l2-params.h F: include/uapi/linux/media/v4l2-extensible-params.h =20 VF610 NAND DRIVER diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Mak= efile index 2177b9d63a8ffc1127c5a70118249a2ff63cd759..323330dd359f95c1ae3d0c35bd6= fcb8291a33a07 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -11,7 +11,8 @@ tuner-objs :=3D tuner-core.o videodev-objs :=3D v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \ v4l2-event.o v4l2-subdev.o v4l2-common.o \ v4l2-ctrls-core.o v4l2-ctrls-api.o \ - v4l2-ctrls-request.o v4l2-ctrls-defs.o + v4l2-ctrls-request.o v4l2-ctrls-defs.o \ + v4l2-params.o =20 # Please keep it alphabetically sorted by Kconfig name # (e. g. LC_ALL=3DC sort Makefile) diff --git a/drivers/media/v4l2-core/v4l2-params.c b/drivers/media/v4l2-cor= e/v4l2-params.c new file mode 100644 index 0000000000000000000000000000000000000000..e2d27fa595110600ea27f1c14cd= 3d129c66dcd75 --- /dev/null +++ b/drivers/media/v4l2-core/v4l2-params.c @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Video4Linux2 extensible parameters helpers + * + * Copyright (C) 2025 Ideas On Board Oy + * Author: Jacopo Mondi + */ + +#include + +int v4l2_params_buffer_validate(struct device *dev, struct vb2_buffer *vb, + size_t max_size, + v4l2_params_validate_buffer buffer_validate) +{ + size_t header_size =3D offsetof(struct v4l2_params_buffer, data); + struct v4l2_params_buffer *buffer =3D vb2_plane_vaddr(vb, 0); + size_t payload_size =3D vb2_get_plane_payload(vb, 0); + size_t buffer_size; + int ret; + + /* Payload size can't be greater than the destination buffer size */ + if (payload_size > max_size) { + dev_dbg(dev, "Payload size is too large: %zu\n", payload_size); + return -EINVAL; + } + + /* Payload size can't be smaller than the header size */ + if (payload_size < header_size) { + dev_dbg(dev, "Payload size is too small: %zu\n", payload_size); + return -EINVAL; + } + + /* Validate the size reported in the parameter buffer header */ + buffer_size =3D header_size + buffer->data_size; + if (buffer_size !=3D payload_size) { + dev_dbg(dev, "Data size %zu and payload size %zu are different\n", + buffer_size, payload_size); + return -EINVAL; + } + + /* Driver-specific buffer validation. */ + if (buffer_validate) { + ret =3D buffer_validate(dev, buffer); + if (ret) + return ret; + } + + return 0; +} +EXPORT_SYMBOL_GPL(v4l2_params_buffer_validate); + +int v4l2_params_blocks_validate(struct device *dev, + const struct v4l2_params_buffer *buffer, + const struct v4l2_params_handler *handlers, + size_t num_handlers, + v4l2_params_validate_block block_validate) +{ + size_t block_offset =3D 0; + size_t buffer_size; + int ret; + + /* Walk the list of parameter blocks and validate them. */ + buffer_size =3D buffer->data_size; + while (buffer_size >=3D sizeof(struct v4l2_params_block_header)) { + const struct v4l2_params_handler *handler; + const struct v4l2_params_block_header *block; + bool valid_size =3D true; + + /* Validate block sizes and types against the handlers. */ + block =3D (const struct v4l2_params_block_header *) + (buffer->data + block_offset); + + if (block->type >=3D num_handlers) { + dev_dbg(dev, "Invalid parameters block type\n"); + return -EINVAL; + } + + if (block->size > buffer_size) { + dev_dbg(dev, "Premature end of parameters data\n"); + return -EINVAL; + } + + /* It's invalid to specify both ENABLE and DISABLE. */ + if ((block->flags & (V4L2_PARAMS_FL_BLOCK_ENABLE | + V4L2_PARAMS_FL_BLOCK_DISABLE)) =3D=3D + (V4L2_PARAMS_FL_BLOCK_ENABLE | + V4L2_PARAMS_FL_BLOCK_DISABLE)) { + dev_dbg(dev, "Invalid parameters block flags\n"); + return -EINVAL; + } + + /* + * Match the block reported size against the handler's expected + * one, but allow the block to only contain the header in + * case it is going to be disabled. + */ + handler =3D &handlers[block->type]; + if (block->size !=3D handler->size) { + valid_size =3D false; + + if ((block->flags & V4L2_PARAMS_FL_BLOCK_DISABLE) && + block->size =3D=3D sizeof(*block)) + valid_size =3D true; + } + if (!valid_size) { + dev_dbg(dev, "Invalid parameters block size\n"); + return -EINVAL; + } + + /* Driver-specific per-block validation. */ + if (block_validate) { + ret =3D block_validate(dev, block); + if (ret) + return ret; + } + + block_offset +=3D block->size; + buffer_size -=3D block->size; + } + + if (buffer_size) { + dev_dbg(dev, "Unexpected data after the parameters buffer end\n"); + return -EINVAL; + } + + return 0; +} +EXPORT_SYMBOL_GPL(v4l2_params_blocks_validate); diff --git a/include/media/v4l2-params.h b/include/media/v4l2-params.h new file mode 100644 index 0000000000000000000000000000000000000000..e8169e559d114af03bb41876111= 839fbe023ee6d --- /dev/null +++ b/include/media/v4l2-params.h @@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Video4Linux2 extensible parameters helpers + * + * Copyright (C) 2025 Ideas On Board Oy + * Author: Jacopo Mondi + */ + +#ifndef V4L2_PARAMS_H_ +#define V4L2_PARAMS_H_ + +#include + +#include + +#include + +/** + * typedef v4l2_params_block_handler - V4L2 extensible format block handler + * @arg: pointer the driver-specific argument + * @block: the ISP configuration block to handle + * + * Defines the function signature of the functions that handle an ISP block + * configuration. + */ +typedef void (*v4l2_params_block_handler)(void *arg, + const struct v4l2_params_block_header *block); + +/** + * struct v4l2_params_handler - V4L2 extensible format handler + * @size: the block expected size + * @handler: the block handler function + * @group: the device-specific group id the block belongs to (optional) + * @features: the device-specific features flags (optional) + * + * The v4l2_params_handler defines the type that driver making use of the + * V4L2 extensible parameters shall use to define their own ISP block + * handlers. + * + * Drivers shall prepare a list of handlers, one for each supported ISP bl= ock + * and correctly populate the structure's field with the expected block @s= ize + * (used for validation), a pointer to each block @handler function and an + * optional @group and @feature flags, the driver can use to differentiate= which + * ISP blocks are present on the ISP implementation. + * + * The @group field is intended to be used as a bitmask of driver-specific + * flags to allow the driver to setup certain blocks at different times. A= s an + * example an ISP driver can divide its block handlers in "pre-configure" = blocks + * and "run-time" blocks and use the @group bitmask to identify the ISP bl= ocks + * that have to be pre-configured from the ones that only have to be handl= ed at + * run-time. The usage and definition of the @group field is totally + * driver-specific. + * + * The @features flag can instead be used to differentiate between blocks + * implemented in different revisions of the ISP design. In example some I= SP + * blocks might be present on more recent revision than others. Populating= the + * @features bitmask with the ISP/SoC machine identifier allows the driver= to + * correctly ignore the blocks not supported on the ISP revision it is run= ning + * on. As per the @group bitmask, the usage and definition of the @features + * field is totally driver-specific. + */ +struct v4l2_params_handler { + size_t size; + v4l2_params_block_handler handler; + unsigned int group; + unsigned int features; +}; + +/** + * typedef v4l2_params_validate_buffer - V4L2 extensible parameters buffer + * validation callback + * @dev: the driver's device pointer (as passed by the driver to + * v4l2_params_buffer_validate()) + * @buffer: the extensible parameters buffer + * + * Defines the function prototype for the driver's callback to perform + * driver-specific validation on the extensible parameters buffer + */ +typedef int (*v4l2_params_validate_buffer)(struct device *dev, + const struct v4l2_params_buffer *buffer); + +/** + * v4l2_params_buffer_validate - Validate a V4L2 extensible parameters buf= fer + * @dev: the driver's device pointer + * @vb: the videobuf2 buffer + * @max_size: the maximum allowed buffer size + * @buffer_validate: callback to the driver-specific buffer validation + * + * Helper function that performs validation of an extensible parameters bu= ffer. + * + * The helper is meant to be used by drivers to perform validation of the + * extensible parameters buffer size correctness. + * + * The @vb buffer as received from the vb2 .buf_prepare operation is check= ed + * against @max_size and its validated to be large enough to accommodate at + * least one ISP configuration block. The effective buffer size is compared + * to the data size reported by @cfg to make sure they match. + * + * If provided, the @buffer_validate callback function is invoked to allow + * drivers to perform driver-specific validation (such as checking that the + * buffer version is supported). + * + * Drivers should use this function to validate the buffer size correctness + * before performing a copy of the user-provided videobuf2 buffer content = into a + * kernel-only memory buffer to prevent userspace from modifying the buffer + * content after it has been submitted to the driver. + *. + * Examples of users of this function can be found in + * rkisp1_params_prepare_ext_params() and in c3_isp_params_vb2_buf_prepare= (). + */ +int v4l2_params_buffer_validate(struct device *dev, struct vb2_buffer *vb, + size_t max_size, + v4l2_params_validate_buffer buffer_validate); + +/** + * typedef v4l2_params_validate_block - V4L2 extensible parameters block + * validation callback + * @dev: the driver's device pointer (as passed by the driver to + * v4l2_params_validate()) + * @block: the ISP configuration block to validate + * + * Defines the function prototype for the driver's callback to perform + * driver-specific validation on each ISP block. + */ +typedef int (*v4l2_params_validate_block)(struct device *dev, + const struct v4l2_params_block_header *block); + +/** + * v4l2_params_blocks_validate - Validate V4L2 extensible parameters ISP + * configuration blocks + * @dev: the driver's device pointer + * @buffer: the extensible parameters configuration buffer + * @handlers: the list of block handlers + * @num_handlers: the number of block handlers + * @block_validate: callback to the driver-specific per-block validation + * function + * + * Helper function that performs validation of the ISP configuration block= s in + * an extensible parameters buffer. + * + * The helper is meant to be used by drivers to perform validation of the + * ISP configuration data blocks. For each block in the extensible paramet= ers + * buffer, its size and correctness are validated against its associated h= andler + * in the @handlers list. Additionally, if provided, the @block_validate + * callback is invoked on each block to allow drivers to perform driver-sp= ecific + * validation. + * + * Drivers should to use this function to validate the ISP configuration b= locks + * after having validated the correctness of the vb2 buffer sizes by using= the + * v4l2_params_buffer_validate() helper first. Once the buffer size has be= en + * validated, drivers should perform a copy of the user-provided buffer in= to a + * kernel-only memory buffer @cfg to prevent userspace from modifying the = buffer + * content after it has been submitted to the driver, and then call this + * function to perform per-block validation. + * + * Examples of users of this function can be found in + * rkisp1_params_prepare_ext_params() and in c3_isp_params_vb2_buf_prepare= (). + */ +int v4l2_params_blocks_validate(struct device *dev, + const struct v4l2_params_buffer *buffer, + const struct v4l2_params_handler *handlers, + size_t num_handlers, + v4l2_params_validate_block block_validate); + +#endif /* V4L2_PARAMS_H_ */ --=20 2.49.0 From nobody Tue Oct 7 10:00:52 2025 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 1BBDA27586C; Thu, 10 Jul 2025 13:52:56 +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=1752155579; cv=none; b=SpqHiitp9DpXlzQlQHFiGZ0jhd5kBeHzQ1U01DE+VYIDjG6P5Xz7vSljWAQxV+Ts5g3D/m490JARxDeEQbUDMedLEPyyzoAFp2zQ1neZjxIj2aN8gU8xpgAhulYX2F2t8i0SpLrP9sDax3RqVTVlsplk746Id8aCNjztyKj8n5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155579; c=relaxed/simple; bh=1RN0GvFQ6DpaAqsi8k5kVQz6owxdwK9Atz+NgPW4+qE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cWsMddseTBbbFcnjMKir7/Cl315YiEnNlf5dTnH30EYzcdSffYHhe1XZzowuSBrjSsgVT+ZPrXrZkkHkUwchmgT5d9tQYj7Z9A5uXdsKIp54nzamXF2aUucfncx+SYhle5IkwNGESHoitiq0c+LmVlWw54QYLdouPvY6t3jCLU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=jHsxwuBI; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jHsxwuBI" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7D9E61A9A; Thu, 10 Jul 2025 15:52:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155543; bh=1RN0GvFQ6DpaAqsi8k5kVQz6owxdwK9Atz+NgPW4+qE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jHsxwuBItJPoCpfEoh0q50+Njlm7xfyLPeImhc0Oqx8cvajGM0nfM7eGf0X2Dl3En dQnlEZ4luB3hlRVHahsMYL2b+2Du574QQKdLw1OeMwKy6vlTFq0UvIlbn6vnxmr/Fh hckbosZJtNkJgNk/KbU09TYO7w1a7JmZDUnRpLyc= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:15 +0200 Subject: [PATCH v2 6/8] media: rkisp1: Use v4l2-params for validation 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: <20250710-extensible-parameters-validation-v2-6-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=23744; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=1RN0GvFQ6DpaAqsi8k5kVQz6owxdwK9Atz+NgPW4+qE=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8Wr8G3tHzMv5czEhP5vHfWHDYSsxsCuGJndJ 95kAfCA1OKJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqwAKCRByNAaPFqFW PDnyD/48fk0+VCftvgKqSvN0UWnaaH1IBs1uwj0M4NpIWVkLQibxO1pr7CSKZgh+JoY8+U7LV4U K/UgN45eLyOUDqo9Fulljar08gb8Wa4P8NpHSUbrDayVguHN6Ik26BaAuz6qWOQEGYFysnaNcEK Cna/JMDVDgp+GGUtqJweNmbWpEDewBbOO+ayH+pPH+gMzbCIzH2MPT00iEuL/SKpaGJnV0esNYt Ja4zyVnHLYTjm9tpu5xAoyEw5gHChR1UiBTK+e+Q8Xnjg/jW/9Sry4vzfzKdWfTg02LakT3I85n B/Zzix+Gs9fkjvkZLvNv23ySeaqB6pVnAteYmh8bWoisil78NMvBQhbwPVXRiSXQr/N9W+tBEgQ +K6gRqdMGIGBu/KLmLOKL4pcWn8+4cFnq9ffEEGwt+myyVSTjlRN2wKgsWQjtFl3eZejMRABEPL vhT5ZjmgbvuIaIp1wiGujs9G2U3JxsNSi2uyjTjg1lh73Iev/dWiwYgP7G9FCu5KrLfrZ4OaiW0 GCTXRpUelbTqVpGT0aiU5fQlR9UmmoRN3xci+5M2BFVRoSPMMxMuVszF8keVtTgY2szh0CHXo3l sZSklI2nqUJZPyRztlpDoz6iazRWiFODXi8dZGkJcjxumMFEHSS65/1taM+b0i96mkimujE+rNB RNBmEjRNHojDO+g== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B Convert rkisp1-params.c to use the new types for block handlers defined in v4l2-params.h and use the new helpers from v4l2-params.c to remove bolierplate code from the driver. Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- .../media/platform/rockchip/rkisp1/rkisp1-params.c | 349 +++++++++--------= ---- 1 file changed, 141 insertions(+), 208 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drive= rs/media/platform/rockchip/rkisp1/rkisp1-params.c index f1585f8fa0f478304f74317fd9dd09199c94ec82..d7bfb1b50ed7e8dec5a20aec6cd= 775b721091abf 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include /* for ISP params */ =20 @@ -40,30 +41,6 @@ #define RKISP1_EXT_PARAMS_BLOCK_GROUP_OTHERS BIT(0) #define RKISP1_EXT_PARAMS_BLOCK_GROUP_LSC BIT(1) =20 -union rkisp1_ext_params_config { - struct rkisp1_ext_params_block_header header; - struct rkisp1_ext_params_bls_config bls; - struct rkisp1_ext_params_dpcc_config dpcc; - struct rkisp1_ext_params_sdg_config sdg; - struct rkisp1_ext_params_lsc_config lsc; - struct rkisp1_ext_params_awb_gain_config awbg; - struct rkisp1_ext_params_flt_config flt; - struct rkisp1_ext_params_bdm_config bdm; - struct rkisp1_ext_params_ctk_config ctk; - struct rkisp1_ext_params_goc_config goc; - struct rkisp1_ext_params_dpf_config dpf; - struct rkisp1_ext_params_dpf_strength_config dpfs; - struct rkisp1_ext_params_cproc_config cproc; - struct rkisp1_ext_params_ie_config ie; - struct rkisp1_ext_params_awb_meas_config awbm; - struct rkisp1_ext_params_hst_config hst; - struct rkisp1_ext_params_aec_config aec; - struct rkisp1_ext_params_afc_config afc; - struct rkisp1_ext_params_compand_bls_config compand_bls; - struct rkisp1_ext_params_compand_curve_config compand_curve; - struct rkisp1_ext_params_wdr_config wdr; -}; - enum rkisp1_params_formats { RKISP1_PARAMS_FIXED, RKISP1_PARAMS_EXTENSIBLE, @@ -1689,11 +1666,12 @@ static void rkisp1_isp_isr_meas_config(struct rkisp= 1_params *params, * Extensible parameters format handling */ =20 -static void -rkisp1_ext_params_bls(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_bls(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_bls_config *bls =3D &block->bls; + const struct rkisp1_ext_params_bls_config *bls =3D + (const struct rkisp1_ext_params_bls_config *)block; + struct rkisp1_params *params =3D dev; =20 if (bls->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_BLS_CTRL, @@ -1709,11 +1687,12 @@ rkisp1_ext_params_bls(struct rkisp1_params *params, RKISP1_CIF_ISP_BLS_ENA); } =20 -static void -rkisp1_ext_params_dpcc(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_dpcc(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_dpcc_config *dpcc =3D &block->dpcc; + const struct rkisp1_ext_params_dpcc_config *dpcc =3D + (const struct rkisp1_ext_params_dpcc_config *)block; + struct rkisp1_params *params =3D dev; =20 if (dpcc->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_DPCC_MODE, @@ -1729,11 +1708,12 @@ rkisp1_ext_params_dpcc(struct rkisp1_params *params, RKISP1_CIF_ISP_DPCC_MODE_DPCC_ENABLE); } =20 -static void -rkisp1_ext_params_sdg(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_sdg(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_sdg_config *sdg =3D &block->sdg; + const struct rkisp1_ext_params_sdg_config *sdg =3D + (const struct rkisp1_ext_params_sdg_config *)block; + struct rkisp1_params *params =3D dev; =20 if (sdg->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_CTRL, @@ -1749,11 +1729,12 @@ rkisp1_ext_params_sdg(struct rkisp1_params *params, RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA); } =20 -static void -rkisp1_ext_params_lsc(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_lsc(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_lsc_config *lsc =3D &block->lsc; + const struct rkisp1_ext_params_lsc_config *lsc =3D + (const struct rkisp1_ext_params_lsc_config *)block; + struct rkisp1_params *params =3D dev; =20 if (lsc->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL, @@ -1769,11 +1750,12 @@ rkisp1_ext_params_lsc(struct rkisp1_params *params, RKISP1_CIF_ISP_LSC_CTRL_ENA); } =20 -static void -rkisp1_ext_params_awbg(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_awbg(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_awb_gain_config *awbg =3D &block->awbg; + const struct rkisp1_ext_params_awb_gain_config *awbg =3D + (const struct rkisp1_ext_params_awb_gain_config *)block; + struct rkisp1_params *params =3D dev; =20 if (awbg->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_CTRL, @@ -1789,11 +1771,12 @@ rkisp1_ext_params_awbg(struct rkisp1_params *params, RKISP1_CIF_ISP_CTRL_ISP_AWB_ENA); } =20 -static void -rkisp1_ext_params_flt(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_flt(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_flt_config *flt =3D &block->flt; + const struct rkisp1_ext_params_flt_config *flt =3D + (const struct rkisp1_ext_params_flt_config *)block; + struct rkisp1_params *params =3D dev; =20 if (flt->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_FILT_MODE, @@ -1809,11 +1792,12 @@ rkisp1_ext_params_flt(struct rkisp1_params *params, RKISP1_CIF_ISP_FLT_ENA); } =20 -static void -rkisp1_ext_params_bdm(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_bdm(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_bdm_config *bdm =3D &block->bdm; + const struct rkisp1_ext_params_bdm_config *bdm =3D + (const struct rkisp1_ext_params_bdm_config *)block; + struct rkisp1_params *params =3D dev; =20 if (bdm->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_DEMOSAIC, @@ -1829,11 +1813,12 @@ rkisp1_ext_params_bdm(struct rkisp1_params *params, RKISP1_CIF_ISP_DEMOSAIC_BYPASS); } =20 -static void -rkisp1_ext_params_ctk(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_ctk(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_ctk_config *ctk =3D &block->ctk; + const struct rkisp1_ext_params_ctk_config *ctk =3D + (const struct rkisp1_ext_params_ctk_config *)block; + struct rkisp1_params *params =3D dev; =20 if (ctk->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_ctk_enable(params, false); @@ -1847,11 +1832,12 @@ rkisp1_ext_params_ctk(struct rkisp1_params *params, rkisp1_ctk_enable(params, true); } =20 -static void -rkisp1_ext_params_goc(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_goc(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_goc_config *goc =3D &block->goc; + const struct rkisp1_ext_params_goc_config *goc =3D + (const struct rkisp1_ext_params_goc_config *)block; + struct rkisp1_params *params =3D dev; =20 if (goc->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_CTRL, @@ -1869,11 +1855,12 @@ rkisp1_ext_params_goc(struct rkisp1_params *params, RKISP1_CIF_ISP_CTRL_ISP_GAMMA_OUT_ENA); } =20 -static void -rkisp1_ext_params_dpf(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_dpf(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_dpf_config *dpf =3D &block->dpf; + const struct rkisp1_ext_params_dpf_config *dpf =3D + (const struct rkisp1_ext_params_dpf_config *)block; + struct rkisp1_params *params =3D dev; =20 if (dpf->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_DPF_MODE, @@ -1889,20 +1876,22 @@ rkisp1_ext_params_dpf(struct rkisp1_params *params, RKISP1_CIF_ISP_DPF_MODE_EN); } =20 -static void -rkisp1_ext_params_dpfs(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_dpfs(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_dpf_strength_config *dpfs =3D &block->dpfs; + const struct rkisp1_ext_params_dpf_strength_config *dpfs =3D + (const struct rkisp1_ext_params_dpf_strength_config *)block; + struct rkisp1_params *params =3D dev; =20 rkisp1_dpf_strength_config(params, &dpfs->config); } =20 -static void -rkisp1_ext_params_cproc(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_cproc(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_cproc_config *cproc =3D &block->cproc; + const struct rkisp1_ext_params_cproc_config *cproc =3D + (const struct rkisp1_ext_params_cproc_config *)block; + struct rkisp1_params *params =3D dev; =20 if (cproc->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_C_PROC_CTRL, @@ -1918,11 +1907,12 @@ rkisp1_ext_params_cproc(struct rkisp1_params *param= s, RKISP1_CIF_C_PROC_CTR_ENABLE); } =20 -static void -rkisp1_ext_params_ie(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_ie(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_ie_config *ie =3D &block->ie; + const struct rkisp1_ext_params_ie_config *ie =3D + (const struct rkisp1_ext_params_ie_config *)block; + struct rkisp1_params *params =3D dev; =20 if (ie->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_ie_enable(params, false); @@ -1936,11 +1926,12 @@ rkisp1_ext_params_ie(struct rkisp1_params *params, rkisp1_ie_enable(params, true); } =20 -static void -rkisp1_ext_params_awbm(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_awbm(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_awb_meas_config *awbm =3D &block->awbm; + const struct rkisp1_ext_params_awb_meas_config *awbm =3D + (const struct rkisp1_ext_params_awb_meas_config *)block; + struct rkisp1_params *params =3D dev; =20 if (awbm->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { params->ops->awb_meas_enable(params, &awbm->config, @@ -1956,11 +1947,12 @@ rkisp1_ext_params_awbm(struct rkisp1_params *params, true); } =20 -static void -rkisp1_ext_params_hstm(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_hstm(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_hst_config *hst =3D &block->hst; + const struct rkisp1_ext_params_hst_config *hst =3D + (const struct rkisp1_ext_params_hst_config *)block; + struct rkisp1_params *params =3D dev; =20 if (hst->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { params->ops->hst_enable(params, &hst->config, false); @@ -1974,11 +1966,12 @@ rkisp1_ext_params_hstm(struct rkisp1_params *params, params->ops->hst_enable(params, &hst->config, true); } =20 -static void -rkisp1_ext_params_aecm(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_aecm(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_aec_config *aec =3D &block->aec; + const struct rkisp1_ext_params_aec_config *aec =3D + (const struct rkisp1_ext_params_aec_config *)block; + struct rkisp1_params *params =3D dev; =20 if (aec->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_EXP_CTRL, @@ -1994,11 +1987,12 @@ rkisp1_ext_params_aecm(struct rkisp1_params *params, RKISP1_CIF_ISP_EXP_ENA); } =20 -static void -rkisp1_ext_params_afcm(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_afcm(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_afc_config *afc =3D &block->afc; + const struct rkisp1_ext_params_afc_config *afc =3D + (const struct rkisp1_ext_params_afc_config *)block; + struct rkisp1_params *params =3D dev; =20 if (afc->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_AFM_CTRL, @@ -2014,11 +2008,12 @@ rkisp1_ext_params_afcm(struct rkisp1_params *params, RKISP1_CIF_ISP_AFM_ENA); } =20 -static void rkisp1_ext_params_compand_bls(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_compand_bls(void *dev, + const struct v4l2_params_block_header *block) { const struct rkisp1_ext_params_compand_bls_config *bls =3D - &block->compand_bls; + (const struct rkisp1_ext_params_compand_bls_config *)block; + struct rkisp1_params *params =3D dev; =20 if (bls->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_COMPAND_CTRL, @@ -2034,11 +2029,13 @@ static void rkisp1_ext_params_compand_bls(struct rk= isp1_params *params, RKISP1_CIF_ISP_COMPAND_CTRL_BLS_ENABLE); } =20 -static void rkisp1_ext_params_compand_expand(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void +rkisp1_ext_params_compand_expand(void *dev, + const struct v4l2_params_block_header *block) { const struct rkisp1_ext_params_compand_curve_config *curve =3D - &block->compand_curve; + (const struct rkisp1_ext_params_compand_curve_config *)block; + struct rkisp1_params *params =3D dev; =20 if (curve->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_COMPAND_CTRL, @@ -2054,11 +2051,13 @@ static void rkisp1_ext_params_compand_expand(struct= rkisp1_params *params, RKISP1_CIF_ISP_COMPAND_CTRL_EXPAND_ENABLE); } =20 -static void rkisp1_ext_params_compand_compress(struct rkisp1_params *param= s, - const union rkisp1_ext_params_config *block) +static void +rkisp1_ext_params_compand_compress(void *dev, + const struct v4l2_params_block_header *block) { const struct rkisp1_ext_params_compand_curve_config *curve =3D - &block->compand_curve; + (const struct rkisp1_ext_params_compand_curve_config *)block; + struct rkisp1_params *params =3D dev; =20 if (curve->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_COMPAND_CTRL, @@ -2074,10 +2073,12 @@ static void rkisp1_ext_params_compand_compress(stru= ct rkisp1_params *params, RKISP1_CIF_ISP_COMPAND_CTRL_COMPRESS_ENABLE); } =20 -static void rkisp1_ext_params_wdr(struct rkisp1_params *params, - const union rkisp1_ext_params_config *block) +static void rkisp1_ext_params_wdr(void *dev, + const struct v4l2_params_block_header *block) { - const struct rkisp1_ext_params_wdr_config *wdr =3D &block->wdr; + const struct rkisp1_ext_params_wdr_config *wdr =3D + (const struct rkisp1_ext_params_wdr_config *)block; + struct rkisp1_params *params =3D dev; =20 if (wdr->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) { rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_WDR_CTRL, @@ -2093,15 +2094,7 @@ static void rkisp1_ext_params_wdr(struct rkisp1_para= ms *params, RKISP1_CIF_ISP_WDR_CTRL_ENABLE); } =20 -typedef void (*rkisp1_block_handler)(struct rkisp1_params *params, - const union rkisp1_ext_params_config *config); - -static const struct rkisp1_ext_params_handler { - size_t size; - rkisp1_block_handler handler; - unsigned int group; - unsigned int features; -} rkisp1_ext_params_handlers[] =3D { +static const struct v4l2_params_handler rkisp1_ext_params_handlers[] =3D { [RKISP1_EXT_PARAMS_BLOCK_TYPE_BLS] =3D { .size =3D sizeof(struct rkisp1_ext_params_bls_config), .handler =3D rkisp1_ext_params_bls, @@ -2224,18 +2217,18 @@ static void rkisp1_ext_params_config(struct rkisp1_= params *params, =20 /* Walk the list of parameter blocks and process them. */ while (block_offset < cfg->data_size) { - const struct rkisp1_ext_params_handler *block_handler; - const union rkisp1_ext_params_config *block; + const struct v4l2_params_handler *block_handler; + const struct v4l2_params_block_header *block; =20 - block =3D (const union rkisp1_ext_params_config *) + block =3D (const struct v4l2_params_block_header *) &cfg->data[block_offset]; - block_offset +=3D block->header.size; + block_offset +=3D block->size; =20 /* * Make sure the block is supported by the platform and in the * list of groups to configure. */ - block_handler =3D &rkisp1_ext_params_handlers[block->header.type]; + block_handler =3D &rkisp1_ext_params_handlers[block->type]; if (!(block_handler->group & block_group_mask)) continue; =20 @@ -2245,10 +2238,10 @@ static void rkisp1_ext_params_config(struct rkisp1_= params *params, =20 block_handler->handler(params, block); =20 - if (block->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) - params->enabled_blocks &=3D ~BIT(block->header.type); - else if (block->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE) - params->enabled_blocks |=3D BIT(block->header.type); + if (block->flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) + params->enabled_blocks &=3D ~BIT(block->type); + else if (block->flags & RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE) + params->enabled_blocks |=3D BIT(block->type); } } =20 @@ -2641,36 +2634,36 @@ static void rkisp1_params_vb2_buf_queue(struct vb2_= buffer *vb) spin_unlock_irq(¶ms->config_lock); } =20 +static int +rkisp1_ext_params_validate_buffer(struct device *dev, + const struct v4l2_params_buffer *buffer) +{ + /* Only v1 is supported at the moment. */ + if (buffer->version !=3D RKISP1_EXT_PARAM_BUFFER_V1) { + dev_dbg(dev, "Unsupported extensible format version: %u\n", + buffer->version); + return -EINVAL; + } + + return 0; +} + static int rkisp1_params_prepare_ext_params(struct rkisp1_params *params, struct vb2_buffer *vb) { struct vb2_v4l2_buffer *vbuf =3D to_vb2_v4l2_buffer(vb); struct rkisp1_params_buffer *params_buf =3D to_rkisp1_params_buffer(vbuf); - size_t header_size =3D offsetof(struct rkisp1_ext_params_cfg, data); struct rkisp1_ext_params_cfg *cfg =3D params_buf->cfg; size_t payload_size =3D vb2_get_plane_payload(vb, 0); struct rkisp1_ext_params_cfg *usr_cfg =3D vb2_plane_vaddr(&vbuf->vb2_buf, 0); - size_t block_offset =3D 0; - size_t cfg_size; - - /* - * Validate the buffer payload size before copying the parameters. The - * payload has to be smaller than the destination buffer size and larger - * than the header size. - */ - if (payload_size > params->metafmt->buffersize) { - dev_dbg(params->rkisp1->dev, - "Too large buffer payload size %zu\n", payload_size); - return -EINVAL; - } + int ret; =20 - if (payload_size < header_size) { - dev_dbg(params->rkisp1->dev, - "Buffer payload %zu smaller than header size %zu\n", - payload_size, header_size); - return -EINVAL; - } + ret =3D v4l2_params_buffer_validate(params->rkisp1->dev, vb, + params->metafmt->buffersize, + rkisp1_ext_params_validate_buffer); + if (ret) + return ret; =20 /* * Copy the parameters buffer to the internal scratch buffer to avoid @@ -2678,71 +2671,11 @@ static int rkisp1_params_prepare_ext_params(struct = rkisp1_params *params, */ memcpy(cfg, usr_cfg, payload_size); =20 - /* Only v1 is supported at the moment. */ - if (cfg->version !=3D RKISP1_EXT_PARAM_BUFFER_V1) { - dev_dbg(params->rkisp1->dev, - "Unsupported extensible format version: %u\n", - cfg->version); - return -EINVAL; - } - - /* Validate the size reported in the parameters buffer header. */ - cfg_size =3D header_size + cfg->data_size; - if (cfg_size !=3D payload_size) { - dev_dbg(params->rkisp1->dev, - "Data size %zu different than buffer payload size %zu\n", - cfg_size, payload_size); - return -EINVAL; - } - - /* Walk the list of parameter blocks and validate them. */ - cfg_size =3D cfg->data_size; - while (cfg_size >=3D sizeof(struct rkisp1_ext_params_block_header)) { - const struct rkisp1_ext_params_block_header *block; - const struct rkisp1_ext_params_handler *handler; - - block =3D (const struct rkisp1_ext_params_block_header *) - &cfg->data[block_offset]; - - if (block->type >=3D ARRAY_SIZE(rkisp1_ext_params_handlers)) { - dev_dbg(params->rkisp1->dev, - "Invalid parameters block type\n"); - return -EINVAL; - } - - if (block->size > cfg_size) { - dev_dbg(params->rkisp1->dev, - "Premature end of parameters data\n"); - return -EINVAL; - } - - if ((block->flags & (RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE | - RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE)) =3D=3D - (RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE | - RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE)) { - dev_dbg(params->rkisp1->dev, - "Invalid parameters block flags\n"); - return -EINVAL; - } - - handler =3D &rkisp1_ext_params_handlers[block->type]; - if (block->size !=3D handler->size) { - dev_dbg(params->rkisp1->dev, - "Invalid parameters block size\n"); - return -EINVAL; - } - - block_offset +=3D block->size; - cfg_size -=3D block->size; - } - - if (cfg_size) { - dev_dbg(params->rkisp1->dev, - "Unexpected data after the parameters buffer end\n"); - return -EINVAL; - } - - return 0; + return v4l2_params_blocks_validate(params->rkisp1->dev, + (struct v4l2_params_buffer *)cfg, + rkisp1_ext_params_handlers, + ARRAY_SIZE(rkisp1_ext_params_handlers), + NULL); } =20 static int rkisp1_params_vb2_buf_prepare(struct vb2_buffer *vb) @@ -2842,7 +2775,7 @@ static int rkisp1_params_ctrl_init(struct rkisp1_para= ms *params) v4l2_ctrl_handler_init(¶ms->ctrls, 1); =20 for (unsigned int i =3D 0; i < ARRAY_SIZE(rkisp1_ext_params_handlers); i+= +) { - const struct rkisp1_ext_params_handler *block_handler; + const struct v4l2_params_handler *block_handler; =20 block_handler =3D &rkisp1_ext_params_handlers[i]; ctrl_config.max |=3D BIT(i); --=20 2.49.0 From nobody Tue Oct 7 10:00:52 2025 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 DCF54275B05; Thu, 10 Jul 2025 13:52:58 +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=1752155581; cv=none; b=PthkFTGGEQxPWQao/XJR242O9jArBbalTDghN1p8SGybcQxGE2qLnDxPjUzTdnFsINp95HIodOas5lRHfUKgjZa7xWHE3Bqa9liInJr1XKfipi6iqpe0VaTaLh+fNHlQE9l88oPsmdDvqW6kNK9WSICf1LJhn37U4Psy3e90O4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155581; c=relaxed/simple; bh=tYHpQbATsTVEppNxk/t2nMeHa96qyyO9DAQ4/64rZJc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bv7zfCgDvTI3s2bscgyYaDI5XfG6WHiZiY8Hjvwt3YNPF9tJz2b226OYGigGfbB903V0u3N1RnkXTQJ0Q8TZWs/8q8fgT7Luw0KkwrHbDRU9ZJLIZBo4kYjcIXr7PfdvsTi18e4WCvCgCxho1z9yBnfCn7BZEVnKxN8xvZs5uIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=SN4vtOrX; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="SN4vtOrX" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 00FBBC0B; Thu, 10 Jul 2025 15:52:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155545; bh=tYHpQbATsTVEppNxk/t2nMeHa96qyyO9DAQ4/64rZJc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SN4vtOrXPy/5TDUywJ0HcG4K4kcUge0IfHUd/J+ITXepGwJkcuh4DUffq4JYcnEYQ SjNj9UHzAiOjW8bumG32manCZ40qiVU7Thl4oonUSb02VLtH7rgwc0S9llQnD0HpJQ dR2ez24zknsIDm13GRSv8kMvMOymVfMcjzvjceEw= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:16 +0200 Subject: [PATCH v2 7/8] media: amlogic-c3: Use v4l2-params for validation 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: <20250710-extensible-parameters-validation-v2-7-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=17302; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=tYHpQbATsTVEppNxk/t2nMeHa96qyyO9DAQ4/64rZJc=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8Wr3AfFGMMAzWR8crOB6jVURw9pDxtC9JnS/ uKpg76Hk8uJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqwAKCRByNAaPFqFW PBKfEAC5vYbZzqOC4lJcqkKE2yaftK4OF3Lv4K+EkpZclx4J93C3wSD41pf65K77+YAL9ow58k1 fWY1UCl+x/LlHqNF7f1SidK+c029CD4NHYUTvY7MLuBDWo46v0oMzwN9fEtJUZXWLFDnUFqr3SQ cr40yyjvWk/NFhPT2CA1uukUEIj1FDWH+DWIflUQbwpvzJbEcoh9PbUBFGwwahpRRvYTJex5/uu E0cCg0u2aOST51BvguLhAEF14U4Hhmntz/1LHf6pbgCWrvRMVU7wvlJFHboRkoOi21Z8pBb+N9J TWEz8rQBg90kna6+S1LU5DSkrHB6wMSZtCNTtpQubrVmlm7zCZQDG9IyPZ1DDGCeS+kKQ0LFCQ4 kPQSwsbmoHVCD8E41ECOZdmFWRSJatQY9HSCFdrMsPaFLRWXH707crHhwGGbewGKo1U3TVn1BWq seJ9ygJbiZoVimhRaZqSbxHGgqKxzTu6tV5fA9lNOHu26mcLW4vfV17gIUNhv3V7YtJLE2YDOHN V3wJ+yxhlWJU1B1nNXNH7G1ylss4rOR//CMSZJ4TQ+7tujhPRBQnDnjVIZNrZVFz8qb9vSYMlMg E8E4A04OgjM7s8doG370AfXV3nb8B6z7cdQ8ox6o0iW+bCaUc4A8Obm7qwbiWaHEQ8vRH+fF+Cf EHTMbTkyjnrq5/A== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B Convert c3-ispa-params.c to use the new types fro block handlers defined in v4l2-params.h and use the new helpers from v4l2-params.c to remove boilerplate code from the driver. Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- .../media/platform/amlogic/c3/isp/c3-isp-params.c | 263 ++++++++---------= ---- 1 file changed, 94 insertions(+), 169 deletions(-) diff --git a/drivers/media/platform/amlogic/c3/isp/c3-isp-params.c b/driver= s/media/platform/amlogic/c3/isp/c3-isp-params.c index c80667dd766210d2b2e1ee60c8254a5814b9d81b..259cb354ffddf4a1195422dfd9b= 3ba24c79607fc 100644 --- a/drivers/media/platform/amlogic/c3/isp/c3-isp-params.c +++ b/drivers/media/platform/amlogic/c3/isp/c3-isp-params.c @@ -9,64 +9,26 @@ =20 #include #include +#include #include =20 #include "c3-isp-common.h" #include "c3-isp-regs.h" =20 -/* - * union c3_isp_params_block - Generalisation of a parameter block - * - * This union allows the driver to treat a block as a generic struct to th= is - * union and safely access the header and block-specific struct without ha= ving - * to resort to casting. The header member is accessed first, and the type= field - * checked which allows the driver to determine which of the other members - * should be used. - * - * @header: The shared header struct embedded as the first member - * of all the possible other members. This member would be - * accessed first and the type field checked to determine - * which of the other members should be accessed. - * @awb_gains: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_AWB_GAINS - * @awb_cfg: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_AWB_CONFIG - * @ae_cfg: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_AE_CONFIG - * @af_cfg: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_AF_CONFIG - * @pst_gamma: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_PST_GAMMA - * @ccm: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_CCM - * @csc: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_CSC - * @blc: For header.type =3D=3D C3_ISP_PARAMS_BLOCK_BLC - */ -union c3_isp_params_block { - struct c3_isp_params_block_header header; - struct c3_isp_params_awb_gains awb_gains; - struct c3_isp_params_awb_config awb_cfg; - struct c3_isp_params_ae_config ae_cfg; - struct c3_isp_params_af_config af_cfg; - struct c3_isp_params_pst_gamma pst_gamma; - struct c3_isp_params_ccm ccm; - struct c3_isp_params_csc csc; - struct c3_isp_params_blc blc; -}; - -typedef void (*c3_isp_block_handler)(struct c3_isp_device *isp, - const union c3_isp_params_block *block); - -struct c3_isp_params_handler { - size_t size; - c3_isp_block_handler handler; -}; - #define to_c3_isp_params_buffer(vbuf) \ container_of(vbuf, struct c3_isp_params_buffer, vb) =20 /* Hardware configuration */ =20 -static void c3_isp_params_cfg_awb_gains(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void +c3_isp_params_cfg_awb_gains(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_awb_gains *awb_gains =3D &block->awb_gains; + const struct c3_isp_params_awb_gains *awb_gains =3D + (const struct c3_isp_params_awb_gains *)block; + struct c3_isp_device *isp =3D dev; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_BEO_CTRL, ISP_TOP_BEO_CTRL_WB_EN_MASK, ISP_TOP_BEO_CTRL_WB_DIS); @@ -89,7 +51,7 @@ static void c3_isp_params_cfg_awb_gains(struct c3_isp_dev= ice *isp, ISP_LSWB_WB_GAIN2_IR_GAIN_MASK, ISP_LSWB_WB_GAIN2_IR_GAIN(awb_gains->gb_gain)); =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_BEO_CTRL, ISP_TOP_BEO_CTRL_WB_EN_MASK, ISP_TOP_BEO_CTRL_WB_EN); @@ -151,12 +113,15 @@ static void c3_isp_params_awb_cood(struct c3_isp_devi= ce *isp, ISP_AWB_IDX_DATA_VIDX_DATA(cfg->vert_coord[i])); } =20 -static void c3_isp_params_cfg_awb_config(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void +c3_isp_params_cfg_awb_config(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_awb_config *awb_cfg =3D &block->awb_cfg; + const struct c3_isp_params_awb_config *awb_cfg =3D + (const struct c3_isp_params_awb_config *)block; + struct c3_isp_device *isp =3D dev; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_3A_STAT_CRTL, ISP_TOP_3A_STAT_CRTL_AWB_STAT_EN_MASK, ISP_TOP_3A_STAT_CRTL_AWB_STAT_DIS); @@ -205,7 +170,7 @@ static void c3_isp_params_cfg_awb_config(struct c3_isp_= device *isp, c3_isp_params_awb_wt(isp, awb_cfg); c3_isp_params_awb_cood(isp, awb_cfg); =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_3A_STAT_CRTL, ISP_TOP_3A_STAT_CRTL_AWB_STAT_EN_MASK, ISP_TOP_3A_STAT_CRTL_AWB_STAT_EN); @@ -268,12 +233,15 @@ static void c3_isp_params_ae_cood(struct c3_isp_devic= e *isp, ISP_AE_IDX_DATA_VIDX_DATA(cfg->vert_coord[i])); } =20 -static void c3_isp_params_cfg_ae_config(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void +c3_isp_params_cfg_ae_config(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_ae_config *ae_cfg =3D &block->ae_cfg; + const struct c3_isp_params_ae_config *ae_cfg =3D + (const struct c3_isp_params_ae_config *)block; + struct c3_isp_device *isp =3D dev; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_3A_STAT_CRTL, ISP_TOP_3A_STAT_CRTL_AE_STAT_EN_MASK, ISP_TOP_3A_STAT_CRTL_AE_STAT_DIS); @@ -303,7 +271,7 @@ static void c3_isp_params_cfg_ae_config(struct c3_isp_d= evice *isp, c3_isp_params_ae_wt(isp, ae_cfg); c3_isp_params_ae_cood(isp, ae_cfg); =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_3A_STAT_CRTL, ISP_TOP_3A_STAT_CRTL_AE_STAT_EN_MASK, ISP_TOP_3A_STAT_CRTL_AE_STAT_EN); @@ -326,12 +294,15 @@ static void c3_isp_params_af_cood(struct c3_isp_devic= e *isp, ISP_AF_IDX_DATA_VIDX_DATA(cfg->vert_coord[i])); } =20 -static void c3_isp_params_cfg_af_config(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void +c3_isp_params_cfg_af_config(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_af_config *af_cfg =3D &block->af_cfg; + const struct c3_isp_params_af_config *af_cfg =3D + (const struct c3_isp_params_af_config *)block; + struct c3_isp_device *isp =3D dev; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_3A_STAT_CRTL, ISP_TOP_3A_STAT_CRTL_AF_STAT_EN_MASK, ISP_TOP_3A_STAT_CRTL_AF_STAT_DIS); @@ -351,20 +322,23 @@ static void c3_isp_params_cfg_af_config(struct c3_isp= _device *isp, =20 c3_isp_params_af_cood(isp, af_cfg); =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_3A_STAT_CRTL, ISP_TOP_3A_STAT_CRTL_AF_STAT_EN_MASK, ISP_TOP_3A_STAT_CRTL_AF_STAT_EN); } =20 -static void c3_isp_params_cfg_pst_gamma(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void +c3_isp_params_cfg_pst_gamma(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_pst_gamma *gm =3D &block->pst_gamma; + const struct c3_isp_params_pst_gamma *gm =3D + (const struct c3_isp_params_pst_gamma *)block; + struct c3_isp_device *isp =3D dev; unsigned int base; unsigned int i; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_BED_CTRL, ISP_TOP_BED_CTRL_PST_GAMMA_EN_MASK, ISP_TOP_BED_CTRL_PST_GAMMA_DIS); @@ -393,19 +367,21 @@ static void c3_isp_params_cfg_pst_gamma(struct c3_isp= _device *isp, } } =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_BED_CTRL, ISP_TOP_BED_CTRL_PST_GAMMA_EN_MASK, ISP_TOP_BED_CTRL_PST_GAMMA_EN); } =20 /* Configure 3 x 3 ccm matrix */ -static void c3_isp_params_cfg_ccm(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void c3_isp_params_cfg_ccm(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_ccm *ccm =3D &block->ccm; + const struct c3_isp_params_ccm *ccm =3D + (const struct c3_isp_params_ccm *)block; + struct c3_isp_device *isp =3D dev; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_BED_CTRL, ISP_TOP_BED_CTRL_CCM_EN_MASK, ISP_TOP_BED_CTRL_CCM_DIS); @@ -442,19 +418,21 @@ static void c3_isp_params_cfg_ccm(struct c3_isp_devic= e *isp, ISP_CCM_MTX_22_23_RS_MTX_22_MASK, ISP_CCM_MTX_22_23_RS_MTX_22(ccm->matrix[2][2])); =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_BED_CTRL, ISP_TOP_BED_CTRL_CCM_EN_MASK, ISP_TOP_BED_CTRL_CCM_EN); } =20 /* Configure color space conversion matrix parameters */ -static void c3_isp_params_cfg_csc(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void c3_isp_params_cfg_csc(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_csc *csc =3D &block->csc; + const struct c3_isp_params_csc *csc =3D + (const struct c3_isp_params_csc *)block; + struct c3_isp_device *isp =3D dev; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_BED_CTRL, ISP_TOP_BED_CTRL_CM0_EN_MASK, ISP_TOP_BED_CTRL_CM0_DIS); @@ -491,19 +469,21 @@ static void c3_isp_params_cfg_csc(struct c3_isp_devic= e *isp, ISP_CM0_COEF22_OUP_OFST0_MTX_22_MASK, ISP_CM0_COEF22_OUP_OFST0_MTX_22(csc->matrix[2][2])); =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_BED_CTRL, ISP_TOP_BED_CTRL_CM0_EN_MASK, ISP_TOP_BED_CTRL_CM0_EN); } =20 /* Set blc offset of each color channel */ -static void c3_isp_params_cfg_blc(struct c3_isp_device *isp, - const union c3_isp_params_block *block) +static void c3_isp_params_cfg_blc(void *dev, + const struct v4l2_params_block_header *block) { - const struct c3_isp_params_blc *blc =3D &block->blc; + const struct c3_isp_params_blc *blc =3D + (const struct c3_isp_params_blc *)block; + struct c3_isp_device *isp =3D dev; =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_DISABLE) { c3_isp_update_bits(isp, ISP_TOP_BEO_CTRL, ISP_TOP_BEO_CTRL_BLC_EN_MASK, ISP_TOP_BEO_CTRL_BLC_DIS); @@ -517,13 +497,13 @@ static void c3_isp_params_cfg_blc(struct c3_isp_devic= e *isp, ISP_LSWB_BLC_OFST1_GB_OFST(blc->gb_ofst) | ISP_LSWB_BLC_OFST1_B_OFST(blc->b_ofst)); =20 - if (block->header.flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) + if (block->flags & C3_ISP_PARAMS_BLOCK_FL_ENABLE) c3_isp_update_bits(isp, ISP_TOP_BEO_CTRL, ISP_TOP_BEO_CTRL_BLC_EN_MASK, ISP_TOP_BEO_CTRL_BLC_EN); } =20 -static const struct c3_isp_params_handler c3_isp_params_handlers[] =3D { +static const struct v4l2_params_handler c3_isp_params_handlers[] =3D { [C3_ISP_PARAMS_BLOCK_AWB_GAINS] =3D { .size =3D sizeof(struct c3_isp_params_awb_gains), .handler =3D c3_isp_params_cfg_awb_gains, @@ -568,16 +548,16 @@ static void c3_isp_params_cfg_blocks(struct c3_isp_pa= rams *params) =20 /* Walk the list of parameter blocks and process them */ while (block_offset < config->data_size) { - const struct c3_isp_params_handler *block_handler; - const union c3_isp_params_block *block; + const struct v4l2_params_handler *block_handler; + const struct v4l2_params_block_header *block; =20 - block =3D (const union c3_isp_params_block *) + block =3D (const struct v4l2_params_block_header *) &config->data[block_offset]; =20 - block_handler =3D &c3_isp_params_handlers[block->header.type]; + block_handler =3D &c3_isp_params_handlers[block->type]; block_handler->handler(params->isp, block); =20 - block_offset +=3D block->header.size; + block_offset +=3D block->size; } } =20 @@ -766,31 +746,35 @@ static void c3_isp_params_vb2_buf_queue(struct vb2_bu= ffer *vb) list_add_tail(&buf->list, ¶ms->pending); } =20 +static int +c3_isp_params_validate_buffer(struct device *dev, + const struct v4l2_params_buffer *buffer) +{ + /* Only v0 is supported at the moment */ + if (buffer->version !=3D C3_ISP_PARAMS_BUFFER_V0) { + dev_dbg(dev, "Invalid params buffer version: %u\n", + buffer->version); + return -EINVAL; + } + + return 0; +} + static int c3_isp_params_vb2_buf_prepare(struct vb2_buffer *vb) { struct vb2_v4l2_buffer *vbuf =3D to_vb2_v4l2_buffer(vb); struct c3_isp_params_buffer *buf =3D to_c3_isp_params_buffer(vbuf); struct c3_isp_params *params =3D vb2_get_drv_priv(vb->vb2_queue); - struct c3_isp_params_cfg *cfg =3D buf->cfg; struct c3_isp_params_cfg *usr_cfg =3D vb2_plane_vaddr(vb, 0); size_t payload_size =3D vb2_get_plane_payload(vb, 0); - size_t header_size =3D offsetof(struct c3_isp_params_cfg, data); - size_t block_offset =3D 0; - size_t cfg_size; - - /* Payload size can't be greater than the destination buffer size */ - if (payload_size > params->vfmt.fmt.meta.buffersize) { - dev_dbg(params->isp->dev, - "Payload size is too large: %zu\n", payload_size); - return -EINVAL; - } + struct c3_isp_params_cfg *cfg =3D buf->cfg; + int ret; =20 - /* Payload size can't be smaller than the header size */ - if (payload_size < header_size) { - dev_dbg(params->isp->dev, - "Payload size is too small: %zu\n", payload_size); - return -EINVAL; - } + ret =3D v4l2_params_buffer_validate(params->isp->dev, vb, + params->vfmt.fmt.meta.buffersize, + c3_isp_params_validate_buffer); + if (ret) + return ret; =20 /* * Use the internal scratch buffer to avoid userspace modifying @@ -798,70 +782,11 @@ static int c3_isp_params_vb2_buf_prepare(struct vb2_b= uffer *vb) */ memcpy(cfg, usr_cfg, payload_size); =20 - /* Only v0 is supported at the moment */ - if (cfg->version !=3D C3_ISP_PARAMS_BUFFER_V0) { - dev_dbg(params->isp->dev, - "Invalid params buffer version: %u\n", cfg->version); - return -EINVAL; - } - - /* Validate the size reported in the parameter buffer header */ - cfg_size =3D header_size + cfg->data_size; - if (cfg_size !=3D payload_size) { - dev_dbg(params->isp->dev, - "Data size %zu and payload size %zu are different\n", - cfg_size, payload_size); - return -EINVAL; - } - - /* Walk the list of parameter blocks and validate them */ - cfg_size =3D cfg->data_size; - while (cfg_size >=3D sizeof(struct c3_isp_params_block_header)) { - const struct c3_isp_params_block_header *block; - const struct c3_isp_params_handler *handler; - - block =3D (struct c3_isp_params_block_header *) - &cfg->data[block_offset]; - - if (block->type >=3D ARRAY_SIZE(c3_isp_params_handlers)) { - dev_dbg(params->isp->dev, - "Invalid params block type\n"); - return -EINVAL; - } - - if (block->size > cfg_size) { - dev_dbg(params->isp->dev, - "Block size is greater than cfg size\n"); - return -EINVAL; - } - - if ((block->flags & (C3_ISP_PARAMS_BLOCK_FL_ENABLE | - C3_ISP_PARAMS_BLOCK_FL_DISABLE)) =3D=3D - (C3_ISP_PARAMS_BLOCK_FL_ENABLE | - C3_ISP_PARAMS_BLOCK_FL_DISABLE)) { - dev_dbg(params->isp->dev, - "Invalid parameters block flags\n"); - return -EINVAL; - } - - handler =3D &c3_isp_params_handlers[block->type]; - if (block->size !=3D handler->size) { - dev_dbg(params->isp->dev, - "Invalid params block size\n"); - return -EINVAL; - } - - block_offset +=3D block->size; - cfg_size -=3D block->size; - } - - if (cfg_size) { - dev_dbg(params->isp->dev, - "Unexpected data after the params buffer end\n"); - return -EINVAL; - } - - return 0; + return v4l2_params_blocks_validate(params->isp->dev, + (struct v4l2_params_buffer *)cfg, + c3_isp_params_handlers, + ARRAY_SIZE(c3_isp_params_handlers), + NULL); } =20 static int c3_isp_params_vb2_buf_init(struct vb2_buffer *vb) --=20 2.49.0 From nobody Tue Oct 7 10:00:52 2025 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 4B823276046; Thu, 10 Jul 2025 13:53:01 +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=1752155583; cv=none; b=AuaDUOHVCTuvyU0QatkoxG2iBXZitzU9w3PFitZZn67l1QtCjc7kiGkG9MwO8q5STheWczX0xCQJxQY4/L7PTZ1fXDFz2jauARKSXpBfecBpnbQgLHpyQm6VOl+k77DxCCf/Y65dZnh0HrM6Q0NCX9cTkdZnpLPdDew8y9EBqtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752155583; c=relaxed/simple; bh=BFyCUyrT0Ujus6OGYnAmCl/GqNuIEDJQSk8MQCzrzmo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jJfjoIi4fLAqAinQXKbcC0MDonlmCMjsMwlzdb3tNFLG213hnkCrua6wrfL335PplVj3ORhWKhQHFoK11hyzl3mfH4IG5oWOyXTg3YyWK0rYMmub0MZdwDD4/ap/yYmefTwfQJa37gi6gyGhHoCAdf5gQySKz1DnNxHNmoqcATQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (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=LqZyDWIc; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="LqZyDWIc" Received: from [192.168.0.172] (mob-5-90-137-205.net.vodafone.it [5.90.137.205]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 37689F09; Thu, 10 Jul 2025 15:52:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1752155546; bh=BFyCUyrT0Ujus6OGYnAmCl/GqNuIEDJQSk8MQCzrzmo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LqZyDWIcNX9ZTUOAqZt5qLdSc6rAHXA0r/sXWI+UFLMcc1XyFQ0Nwb2SEUP1OTQyU Mku/vBgAukLGRW2RW737mST0vNwG67/mVw5wFnq4lqZs+I6Yk7IhbSZcMrkymjf8Yq Qe/SkN3x6Ad5c5T0MTKUVcMh+QSBT0Dm3z94WTMU= From: Jacopo Mondi Date: Thu, 10 Jul 2025 15:52:17 +0200 Subject: [PATCH v2 8/8] media: Documentation: kapi: Add v4l2 extensible parameters 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: <20250710-extensible-parameters-validation-v2-8-7ec8918ec443@ideasonboard.com> References: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> In-Reply-To: <20250710-extensible-parameters-validation-v2-0-7ec8918ec443@ideasonboard.com> To: Dafna Hirschfeld , Laurent Pinchart , Keke Li , Mauro Carvalho Chehab , Heiko Stuebner , Dan Scally , Sakari Ailus Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1789; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=BFyCUyrT0Ujus6OGYnAmCl/GqNuIEDJQSk8MQCzrzmo=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBob8Wr/aGoNxfRR23l/5wD6G+4Ew6/K9t5x5Sg+ B6olFD0u9iJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaG/FqwAKCRByNAaPFqFW POXRD/49NlvFZ6WTfiz+ALosMbcBtZbO6d5YqWv4nL2Qi8LyLr3DiZHDkp/5jcMXK0pHje+MLhA ysf7/JN8fPywWY1ohWQVBHu/fi+Tp2pxvyqwtWuBzMvlzhrNuWY4dvYNP7B6ky/x5ODC9KUBchK d9SbeHLZDmrjA9fYXc6LcsfL818nZLr0uKwXu88/MQcEpsd7LpS93bc7mQmFsOeoeKpcfxPEMvz 7AydmBMNNbLXAYkA2VaH08JnYRYItZkVAaV4l2CCmz0vGOOuzKxE4HCxD1fto6fpuUki1fUfEkd UIIZGF9rraSYDL5Wne2SLSqHU8Ua466saP20Ce8x6Ku1LSooHSaSQhvqrfyh+A32Z+9/93RSs2m 3qjhnbt+vWcwL2qDthAJgRlWPeEGXkZh5NLepB2h9fk+or2kzXjoxBg2uTylc7F0cYqxszEqC1X MeN4CwhirXktF/mPVGtuilS7nCX6shSwdkf8gizycuBmopC4JL0i7UEwNqzqreE5wdmh5b3t2lm B/FUL+jjRypcThyaWy4JBKtgq2LU5XeNKizk9gGjalZmNZCtdsXcrYSoyLYLeCvPoNM+ktEAhE6 xC2/IdvtHLKV+smY4h60iT509i6nSJ6aKrxazY+fvSWZiaCVJxsy+phwljEz2eeoHwnbiSikz6D OjqYPjLOGjdCOBA== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B Add to the driver-api documentation the v4l2-params.h types and helpers documentation. Signed-off-by: Jacopo Mondi --- Documentation/driver-api/media/v4l2-core.rst | 1 + Documentation/driver-api/media/v4l2-params.rst | 5 +++++ MAINTAINERS | 1 + 3 files changed, 7 insertions(+) diff --git a/Documentation/driver-api/media/v4l2-core.rst b/Documentation/d= river-api/media/v4l2-core.rst index ad987c34ad2a8460bb95e97adc4d850d624e0b81..2d7793298c6a2046bdd59b185a4= 11e092b659d52 100644 --- a/Documentation/driver-api/media/v4l2-core.rst +++ b/Documentation/driver-api/media/v4l2-core.rst @@ -27,3 +27,4 @@ Video4Linux devices v4l2-common v4l2-tveeprom v4l2-jpeg + v4l2-params diff --git a/Documentation/driver-api/media/v4l2-params.rst b/Documentation= /driver-api/media/v4l2-params.rst new file mode 100644 index 0000000000000000000000000000000000000000..8d2a5f004d21dfc3a81255cabbc= 6b7cce588db71 --- /dev/null +++ b/Documentation/driver-api/media/v4l2-params.rst @@ -0,0 +1,5 @@ +.. SPDX-License-Identifier: GPL-2.0 + +V4L2 extensible parameters kAPI +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. kernel-doc:: include/media/v4l2-params.h diff --git a/MAINTAINERS b/MAINTAINERS index 3d9a8e06c59eb08360d1e8eea85e450a15ee95af..f03c10092a891a06052484b6914= 09f0c459de87d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25972,6 +25972,7 @@ V4L2 EXTENSIBLE PARAMETERS FORMAT M: Jacopo Mondi L: linux-media@vger.kernel.org S: Maintained +F: Documentation/driver-api/media/v4l2-params.rst F: Documentation/userspace-api/media/v4l/extensible-parameters.rst F: drivers/media/v4l2-core/v4l2-params.c F: include/media/v4l2-params.h --=20 2.49.0