Re: [PATCH 1/7] clk: sunxi: Store the array sizes in the CCU descriptor

[Andre Przywara <andre.przywara@arm.com>]

On Mon,  9 May 2022 00:29:31 -0500
Samuel Holland <samuel@sholland.org> wrote:

> The reset array size is currently used for bounds checking in the reset
> driver. The same bounds check should really be done in the clock driver.
> 
> Currently, the array size is provided to the reset driver separately
> from the CCU descriptor, which is a bit strange. Let's do this the usual
> way, with the array sizes next to the arrays themselves.

Checked for typos, all fine. Added the F1C100s on the way.

> 
> Signed-off-by: Samuel Holland <samuel@sholland.org>

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Thanks,
Andre

> ---
> 
>  drivers/clk/sunxi/clk_a10.c   | 2 ++
>  drivers/clk/sunxi/clk_a10s.c  | 2 ++
>  drivers/clk/sunxi/clk_a23.c   | 2 ++
>  drivers/clk/sunxi/clk_a31.c   | 2 ++
>  drivers/clk/sunxi/clk_a31_r.c | 2 ++
>  drivers/clk/sunxi/clk_a64.c   | 2 ++
>  drivers/clk/sunxi/clk_a80.c   | 4 ++++
>  drivers/clk/sunxi/clk_a83t.c  | 2 ++
>  drivers/clk/sunxi/clk_h3.c    | 2 ++
>  drivers/clk/sunxi/clk_h6.c    | 2 ++
>  drivers/clk/sunxi/clk_h616.c  | 2 ++
>  drivers/clk/sunxi/clk_h6_r.c  | 2 ++
>  drivers/clk/sunxi/clk_r40.c   | 2 ++
>  drivers/clk/sunxi/clk_v3s.c   | 2 ++
>  include/clk/sunxi.h           | 2 ++
>  15 files changed, 32 insertions(+)
> 
> diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
> index 90b929d3d3..6b58cffc8a 100644
> --- a/drivers/clk/sunxi/clk_a10.c
> +++ b/drivers/clk/sunxi/clk_a10.c
> @@ -65,6 +65,8 @@ static struct ccu_reset a10_resets[] = {
>  static const struct ccu_desc a10_ccu_desc = {
>  	.gates = a10_gates,
>  	.resets = a10_resets,
> +	.num_gates = ARRAY_SIZE(a10_gates),
> +	.num_resets = ARRAY_SIZE(a10_resets),
>  };
>  
>  static int a10_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
> index addf4f4d5c..81b146ce1e 100644
> --- a/drivers/clk/sunxi/clk_a10s.c
> +++ b/drivers/clk/sunxi/clk_a10s.c
> @@ -50,6 +50,8 @@ static struct ccu_reset a10s_resets[] = {
>  static const struct ccu_desc a10s_ccu_desc = {
>  	.gates = a10s_gates,
>  	.resets = a10s_resets,
> +	.num_gates = ARRAY_SIZE(a10s_gates),
> +	.num_resets = ARRAY_SIZE(a10s_resets),
>  };
>  
>  static int a10s_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
> index c45d2c3529..c7c78bc7d8 100644
> --- a/drivers/clk/sunxi/clk_a23.c
> +++ b/drivers/clk/sunxi/clk_a23.c
> @@ -69,6 +69,8 @@ static struct ccu_reset a23_resets[] = {
>  static const struct ccu_desc a23_ccu_desc = {
>  	.gates = a23_gates,
>  	.resets = a23_resets,
> +	.num_gates = ARRAY_SIZE(a23_gates),
> +	.num_resets = ARRAY_SIZE(a23_resets),
>  };
>  
>  static int a23_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
> index 251fc3b705..c8c7f4ecf5 100644
> --- a/drivers/clk/sunxi/clk_a31.c
> +++ b/drivers/clk/sunxi/clk_a31.c
> @@ -90,6 +90,8 @@ static struct ccu_reset a31_resets[] = {
>  static const struct ccu_desc a31_ccu_desc = {
>  	.gates = a31_gates,
>  	.resets = a31_resets,
> +	.num_gates = ARRAY_SIZE(a31_gates),
> +	.num_resets = ARRAY_SIZE(a31_resets),
>  };
>  
>  static int a31_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_a31_r.c b/drivers/clk/sunxi/clk_a31_r.c
> index 1f08ea956f..7bf1c4578c 100644
> --- a/drivers/clk/sunxi/clk_a31_r.c
> +++ b/drivers/clk/sunxi/clk_a31_r.c
> @@ -31,6 +31,8 @@ static struct ccu_reset a31_r_resets[] = {
>  static const struct ccu_desc a31_r_ccu_desc = {
>  	.gates = a31_r_gates,
>  	.resets = a31_r_resets,
> +	.num_gates = ARRAY_SIZE(a31_r_gates),
> +	.num_resets = ARRAY_SIZE(a31_r_resets),
>  };
>  
>  static int a31_r_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
> index 1004a79503..6da861ddc1 100644
> --- a/drivers/clk/sunxi/clk_a64.c
> +++ b/drivers/clk/sunxi/clk_a64.c
> @@ -76,6 +76,8 @@ static const struct ccu_reset a64_resets[] = {
>  static const struct ccu_desc a64_ccu_desc = {
>  	.gates = a64_gates,
>  	.resets = a64_resets,
> +	.num_gates = ARRAY_SIZE(a64_gates),
> +	.num_resets = ARRAY_SIZE(a64_resets),
>  };
>  
>  static int a64_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
> index 8a0834d83a..7025d3cbe6 100644
> --- a/drivers/clk/sunxi/clk_a80.c
> +++ b/drivers/clk/sunxi/clk_a80.c
> @@ -75,11 +75,15 @@ static const struct ccu_reset a80_mmc_resets[] = {
>  static const struct ccu_desc a80_ccu_desc = {
>  	.gates = a80_gates,
>  	.resets = a80_resets,
> +	.num_gates = ARRAY_SIZE(a80_gates),
> +	.num_resets = ARRAY_SIZE(a80_resets),
>  };
>  
>  static const struct ccu_desc a80_mmc_clk_desc = {
>  	.gates = a80_mmc_gates,
>  	.resets = a80_mmc_resets,
> +	.num_gates = ARRAY_SIZE(a80_mmc_gates),
> +	.num_resets = ARRAY_SIZE(a80_mmc_resets),
>  };
>  
>  static int a80_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
> index 8c6043f51e..c50d253f84 100644
> --- a/drivers/clk/sunxi/clk_a83t.c
> +++ b/drivers/clk/sunxi/clk_a83t.c
> @@ -73,6 +73,8 @@ static struct ccu_reset a83t_resets[] = {
>  static const struct ccu_desc a83t_ccu_desc = {
>  	.gates = a83t_gates,
>  	.resets = a83t_resets,
> +	.num_gates = ARRAY_SIZE(a83t_gates),
> +	.num_resets = ARRAY_SIZE(a83t_resets),
>  };
>  
>  static int a83t_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
> index 59afba53ee..22c2b236a8 100644
> --- a/drivers/clk/sunxi/clk_h3.c
> +++ b/drivers/clk/sunxi/clk_h3.c
> @@ -89,6 +89,8 @@ static struct ccu_reset h3_resets[] = {
>  static const struct ccu_desc h3_ccu_desc = {
>  	.gates = h3_gates,
>  	.resets = h3_resets,
> +	.num_gates = ARRAY_SIZE(h3_gates),
> +	.num_resets = ARRAY_SIZE(h3_resets),
>  };
>  
>  static int h3_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
> index 4a53788352..6521811215 100644
> --- a/drivers/clk/sunxi/clk_h6.c
> +++ b/drivers/clk/sunxi/clk_h6.c
> @@ -90,6 +90,8 @@ static struct ccu_reset h6_resets[] = {
>  static const struct ccu_desc h6_ccu_desc = {
>  	.gates = h6_gates,
>  	.resets = h6_resets,
> +	.num_gates = ARRAY_SIZE(h6_gates),
> +	.num_resets = ARRAY_SIZE(h6_resets),
>  };
>  
>  static int h6_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_h616.c b/drivers/clk/sunxi/clk_h616.c
> index af97d3bb9f..26f74c0fa0 100644
> --- a/drivers/clk/sunxi/clk_h616.c
> +++ b/drivers/clk/sunxi/clk_h616.c
> @@ -108,6 +108,8 @@ static struct ccu_reset h616_resets[] = {
>  static const struct ccu_desc h616_ccu_desc = {
>  	.gates = h616_gates,
>  	.resets = h616_resets,
> +	.num_gates = ARRAY_SIZE(h616_gates),
> +	.num_resets = ARRAY_SIZE(h616_resets),
>  };
>  
>  static int h616_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_h6_r.c b/drivers/clk/sunxi/clk_h6_r.c
> index b9e527e16a..fee9604551 100644
> --- a/drivers/clk/sunxi/clk_h6_r.c
> +++ b/drivers/clk/sunxi/clk_h6_r.c
> @@ -35,6 +35,8 @@ static struct ccu_reset h6_r_resets[] = {
>  static const struct ccu_desc h6_r_ccu_desc = {
>  	.gates = h6_r_gates,
>  	.resets = h6_r_resets,
> +	.num_gates = ARRAY_SIZE(h6_r_gates),
> +	.num_resets = ARRAY_SIZE(h6_r_resets),
>  };
>  
>  static int h6_r_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
> index 4d5b69a976..456a38a159 100644
> --- a/drivers/clk/sunxi/clk_r40.c
> +++ b/drivers/clk/sunxi/clk_r40.c
> @@ -100,6 +100,8 @@ static struct ccu_reset r40_resets[] = {
>  static const struct ccu_desc r40_ccu_desc = {
>  	.gates = r40_gates,
>  	.resets = r40_resets,
> +	.num_gates = ARRAY_SIZE(r40_gates),
> +	.num_resets = ARRAY_SIZE(r40_resets),
>  };
>  
>  static int r40_clk_bind(struct udevice *dev)
> diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
> index cce5c658ca..ab21cd791b 100644
> --- a/drivers/clk/sunxi/clk_v3s.c
> +++ b/drivers/clk/sunxi/clk_v3s.c
> @@ -50,6 +50,8 @@ static struct ccu_reset v3s_resets[] = {
>  static const struct ccu_desc v3s_ccu_desc = {
>  	.gates = v3s_gates,
>  	.resets = v3s_resets,
> +	.num_gates = ARRAY_SIZE(v3s_gates),
> +	.num_resets = ARRAY_SIZE(v3s_resets),
>  };
>  
>  static int v3s_clk_bind(struct udevice *dev)
> diff --git a/include/clk/sunxi.h b/include/clk/sunxi.h
> index a2239b990b..5471b9c831 100644
> --- a/include/clk/sunxi.h
> +++ b/include/clk/sunxi.h
> @@ -65,6 +65,8 @@ struct ccu_reset {
>  struct ccu_desc {
>  	const struct ccu_clk_gate *gates;
>  	const struct ccu_reset *resets;
> +	u8 num_gates;
> +	u8 num_resets;
>  };
>  
>  /**