| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <d537d8fc-2161-45c3-a7a4-d81d85d05d41@ideasonboard.com>
Date: Wed, 9 Jul 2025 16:09:49 +0100
From: Dan Scally <dan.scally@...asonboard.com>
To: Jacopo Mondi <jacopo.mondi@...asonboard.com>,
Dafna Hirschfeld <dafna@...tmail.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Keke Li <keke.li@...ogic.com>, Mauro Carvalho Chehab <mchehab@...nel.org>,
Heiko Stuebner <heiko@...ech.de>, Sakari Ailus <sakari.ailus@...ux.intel.com>
Cc: linux-kernel@...r.kernel.org, linux-media@...r.kernel.org,
linux-rockchip@...ts.infradead.org, linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH 6/8] media: rkisp1: Use v4l2-params for validation
Hi Jacopo
On 08/07/2025 11:40, Jacopo Mondi wrote:
> 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 <jacopo.mondi@...asonboard.com>
> ---
> .../media/platform/rockchip/rkisp1/rkisp1-params.c | 364 +++++++++------------
> 1 file changed, 156 insertions(+), 208 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> index f1585f8fa0f478304f74317fd9dd09199c94ec82..36840048e97b4557894cf401210d1c135de874cc 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> @@ -12,6 +12,7 @@
> #include <media/v4l2-common.h>
> #include <media/v4l2-event.h>
> #include <media/v4l2-ioctl.h>
> +#include <media/v4l2-params.h>
> #include <media/videobuf2-core.h>
> #include <media/videobuf2-vmalloc.h> /* for ISP params */
>
> @@ -40,30 +41,6 @@
> #define RKISP1_EXT_PARAMS_BLOCK_GROUP_OTHERS BIT(0)
> #define RKISP1_EXT_PARAMS_BLOCK_GROUP_LSC BIT(1)
>
> -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;
> -};
I think that we should keep the union, it makes things a lot tidier. We can replace the first member
with a struct v4l2_params_block[_header] pointer to keep the same effect, and then have a union
variable in each handler that's set like so:
static void mali_c55_params_lsc_selection(void *arg, const struct v4l2_params_block *header)
{
const struct mali_c55_params_mesh_shading_selection *params;
union mali_c55_params_block block;
struct mali_c55 *mali_c55 = arg;
block.header = header;
params = block.shading_selection;
...
}
> -
> enum rkisp1_params_formats {
> RKISP1_PARAMS_FIXED,
> RKISP1_PARAMS_EXTENSIBLE,
> @@ -1689,11 +1666,12 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> * Extensible parameters format handling
> */
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_bls_config *bls = &block->bls;
> + const struct rkisp1_ext_params_bls_config *bls =
> + (const struct rkisp1_ext_params_bls_config *)block;
And then we can avoid all the casting like this.
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_dpcc_config *dpcc = &block->dpcc;
> + const struct rkisp1_ext_params_dpcc_config *dpcc =
> + (const struct rkisp1_ext_params_dpcc_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_sdg_config *sdg = &block->sdg;
> + const struct rkisp1_ext_params_sdg_config *sdg =
> + (const struct rkisp1_ext_params_sdg_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_lsc_config *lsc = &block->lsc;
> + const struct rkisp1_ext_params_lsc_config *lsc =
> + (const struct rkisp1_ext_params_lsc_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_awb_gain_config *awbg = &block->awbg;
> + const struct rkisp1_ext_params_awb_gain_config *awbg =
> + (const struct rkisp1_ext_params_awb_gain_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_flt_config *flt = &block->flt;
> + const struct rkisp1_ext_params_flt_config *flt =
> + (const struct rkisp1_ext_params_flt_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_bdm_config *bdm = &block->bdm;
> + const struct rkisp1_ext_params_bdm_config *bdm =
> + (const struct rkisp1_ext_params_bdm_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_ctk_config *ctk = &block->ctk;
> + const struct rkisp1_ext_params_ctk_config *ctk =
> + (const struct rkisp1_ext_params_ctk_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_goc_config *goc = &block->goc;
> + const struct rkisp1_ext_params_goc_config *goc =
> + (const struct rkisp1_ext_params_goc_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_dpf_config *dpf = &block->dpf;
> + const struct rkisp1_ext_params_dpf_config *dpf =
> + (const struct rkisp1_ext_params_dpf_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_dpf_strength_config *dpfs = &block->dpfs;
> + const struct rkisp1_ext_params_dpf_strength_config *dpfs =
> + (const struct rkisp1_ext_params_dpf_strength_config *)block;
> + struct rkisp1_params *params = dev;
>
> rkisp1_dpf_strength_config(params, &dpfs->config);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_cproc_config *cproc = &block->cproc;
> + const struct rkisp1_ext_params_cproc_config *cproc =
> + (const struct rkisp1_ext_params_cproc_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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 *params,
> RKISP1_CIF_C_PROC_CTR_ENABLE);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_ie_config *ie = &block->ie;
> + const struct rkisp1_ext_params_ie_config *ie =
> + (const struct rkisp1_ext_params_ie_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_awb_meas_config *awbm = &block->awbm;
> + const struct rkisp1_ext_params_awb_meas_config *awbm =
> + (const struct rkisp1_ext_params_awb_meas_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_hst_config *hst = &block->hst;
> + const struct rkisp1_ext_params_hst_config *hst =
> + (const struct rkisp1_ext_params_hst_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_aec_config *aec = &block->aec;
> + const struct rkisp1_ext_params_aec_config *aec =
> + (const struct rkisp1_ext_params_aec_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_afc_config *afc = &block->afc;
> + const struct rkisp1_ext_params_afc_config *afc =
> + (const struct rkisp1_ext_params_afc_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -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 *block)
> {
> const struct rkisp1_ext_params_compand_bls_config *bls =
> - &block->compand_bls;
> + (const struct rkisp1_ext_params_compand_bls_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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 rkisp1_params *params,
> RKISP1_CIF_ISP_COMPAND_CTRL_BLS_ENABLE);
> }
>
> -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 *block)
> {
> const struct rkisp1_ext_params_compand_curve_config *curve =
> - &block->compand_curve;
> + (const struct rkisp1_ext_params_compand_curve_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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);
> }
>
> -static void rkisp1_ext_params_compand_compress(struct rkisp1_params *params,
> - const union rkisp1_ext_params_config *block)
> +static void
> +rkisp1_ext_params_compand_compress(void *dev,
> + const struct v4l2_params_block *block)
> {
> const struct rkisp1_ext_params_compand_curve_config *curve =
> - &block->compand_curve;
> + (const struct rkisp1_ext_params_compand_curve_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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(struct rkisp1_params *params,
> RKISP1_CIF_ISP_COMPAND_CTRL_COMPRESS_ENABLE);
> }
>
> -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 *block)
> {
> - const struct rkisp1_ext_params_wdr_config *wdr = &block->wdr;
> + const struct rkisp1_ext_params_wdr_config *wdr =
> + (const struct rkisp1_ext_params_wdr_config *)block;
> + struct rkisp1_params *params = dev;
>
> 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_params *params,
> RKISP1_CIF_ISP_WDR_CTRL_ENABLE);
> }
>
> -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[] = {
> +static const struct v4l2_params_handler rkisp1_ext_params_handlers[] = {
> [RKISP1_EXT_PARAMS_BLOCK_TYPE_BLS] = {
> .size = sizeof(struct rkisp1_ext_params_bls_config),
> .handler = rkisp1_ext_params_bls,
> @@ -2224,18 +2217,18 @@ static void rkisp1_ext_params_config(struct rkisp1_params *params,
>
> /* 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 *block;
>
> - block = (const union rkisp1_ext_params_config *)
> + block = (const struct v4l2_params_block *)
> &cfg->data[block_offset];
And with the union this can be block.data = &cfg->data[block_offset]
> - block_offset += block->header.size;
> + block_offset += block->size;
>
> /*
> * Make sure the block is supported by the platform and in the
> * list of groups to configure.
> */
> - block_handler = &rkisp1_ext_params_handlers[block->header.type];
> + block_handler = &rkisp1_ext_params_handlers[block->type];
> if (!(block_handler->group & block_group_mask))
> continue;
>
> @@ -2245,10 +2238,10 @@ static void rkisp1_ext_params_config(struct rkisp1_params *params,
>
> block_handler->handler(params, block);
Perhaps the calling of the handlers could be moved to v4l2-params.c too?
>
> - if (block->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE)
> - params->enabled_blocks &= ~BIT(block->header.type);
> - else if (block->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE)
> - params->enabled_blocks |= BIT(block->header.type);
> + if (block->flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE)
> + params->enabled_blocks &= ~BIT(block->type);
> + else if (block->flags & RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE)
> + params->enabled_blocks |= BIT(block->type);
> }
> }
>
> @@ -2641,36 +2634,51 @@ static void rkisp1_params_vb2_buf_queue(struct vb2_buffer *vb)
> spin_unlock_irq(¶ms->config_lock);
> }
>
> +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 != RKISP1_EXT_PARAM_BUFFER_V1) {
> + dev_dbg(dev, "Unsupported extensible format version: %u\n",
> + buffer->version);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
Same with version validation. I like the idea of having a driver-specific validation callback, but
if all that's different between the version validation is the macro I think ideally v4l2-params.c
could check it - perhaps we could mandate that new versions of the buffers must be backwards
compatible, and then we could pass a "latest supported version number" to
v4l2_params_buffer_validate() to check?
> +
> +static int
> +rkisp1_ext_params_validate_block(struct device *dev,
> + const struct v4l2_params_block *block)
> +{
> + if ((block->flags & (RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE |
> + RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE)) ==
> + (RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE |
> + RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE)) {
> + dev_dbg(dev, "Invalid parameters block flags\n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
Centrally checking these flags at least would be nice since they're common across all three
implementations.
> +
> static int rkisp1_params_prepare_ext_params(struct rkisp1_params *params,
> struct vb2_buffer *vb)
> {
> struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
> struct rkisp1_params_buffer *params_buf = to_rkisp1_params_buffer(vbuf);
> - size_t header_size = offsetof(struct rkisp1_ext_params_cfg, data);
> struct rkisp1_ext_params_cfg *cfg = params_buf->cfg;
> size_t payload_size = vb2_get_plane_payload(vb, 0);
> struct rkisp1_ext_params_cfg *usr_cfg =
> vb2_plane_vaddr(&vbuf->vb2_buf, 0);
> - size_t block_offset = 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;
>
> - 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 = v4l2_params_buffer_validate(params->rkisp1->dev, vb,
> + params->metafmt->buffersize,
> + rkisp1_ext_params_validate_buffer);
> + if (ret)
> + return ret;
>
> /*
> * Copy the parameters buffer to the internal scratch buffer to avoid
> @@ -2678,71 +2686,11 @@ static int rkisp1_params_prepare_ext_params(struct rkisp1_params *params,
> */
> memcpy(cfg, usr_cfg, payload_size);
>
> - /* Only v1 is supported at the moment. */
> - if (cfg->version != 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 = header_size + cfg->data_size;
> - if (cfg_size != 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 = cfg->data_size;
> - while (cfg_size >= sizeof(struct rkisp1_ext_params_block_header)) {
> - const struct rkisp1_ext_params_block_header *block;
> - const struct rkisp1_ext_params_handler *handler;
> -
> - block = (const struct rkisp1_ext_params_block_header *)
> - &cfg->data[block_offset];
> -
> - if (block->type >= 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)) ==
> - (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 = &rkisp1_ext_params_handlers[block->type];
> - if (block->size != handler->size) {
> - dev_dbg(params->rkisp1->dev,
> - "Invalid parameters block size\n");
> - return -EINVAL;
> - }
> -
> - block_offset += block->size;
> - cfg_size -= 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),
> + rkisp1_ext_params_validate_block);
> }
The end result is really great - makes the driver much simpler!
>
> static int rkisp1_params_vb2_buf_prepare(struct vb2_buffer *vb)
> @@ -2842,7 +2790,7 @@ static int rkisp1_params_ctrl_init(struct rkisp1_params *params)
> v4l2_ctrl_handler_init(¶ms->ctrls, 1);
>
> for (unsigned int i = 0; i < ARRAY_SIZE(rkisp1_ext_params_handlers); i++) {
> - const struct rkisp1_ext_params_handler *block_handler;
> + const struct v4l2_params_handler *block_handler;
>
> block_handler = &rkisp1_ext_params_handlers[i];
> ctrl_config.max |= BIT(i);
>
Powered by blists - more mailing lists