Re: [PATCH] arm/tee: rename variable to address MISRA C Rule 5.3

[Bertrand Marquis <Bertrand.Marquis@xxxxxxx>]

Hi Dmytro,


> On 19 Mar 2026, at 21:16, Dmytro Prokopchuk1 <dmytro_prokopchuk1@xxxxxxxx> 
> wrote:
> 
> The local variable 'ffa_vm_count' shadows the global variable, declared
> in 'xen/arch/arm/tee/ffa_private.h', therefore it is renamed
> 'ffa_vm2vm_count'.

I have a patch in my queue to solve this (I am just removing the ffa_ prefix 
from the local
variables but does the same as yours) and a patch to solve the other misra 
issue in optee
but happy to to use yours if you want instead.

I was waiting for the pending ffa serie to push them (should be merge soon)

This patch will not rebase cleanly on top of that serie which is changing 
ffa_partinfo code.

Do you want to wait and rebase or abandon and use the one in my serie instead ?

I am ok with either solution :-)

Cheers
Bertrand

> 
> No functional change.
> 
> Signed-off-by: Dmytro Prokopchuk <dmytro_prokopchuk1@xxxxxxxx>
> ---
> xen/arch/arm/tee/ffa_partinfo.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinfo.c
> index fdb03dae9a..473507ca3a 100644
> --- a/xen/arch/arm/tee/ffa_partinfo.c
> +++ b/xen/arch/arm/tee/ffa_partinfo.c
> @@ -265,7 +265,7 @@ void ffa_handle_partition_info_get(struct cpu_user_regs 
> *regs)
>     uint32_t dst_size = 0;
>     size_t buf_size;
>     void *dst_buf, *end_buf;
> -    uint32_t ffa_vm_count = 0, ffa_sp_count = 0;
> +    uint32_t ffa_vm2vm_count = 0, ffa_sp_count = 0;
> 
>     ffa_uuid_set(&uuid,
>              get_user_reg(regs, 1),
> @@ -310,7 +310,7 @@ void ffa_handle_partition_info_get(struct cpu_user_regs 
> *regs)
>          */
>         if ( ffa_uuid_is_nil(uuid) )
>         {
> -            ffa_vm_count = get_ffa_vm_count();
> +            ffa_vm2vm_count = get_ffa_vm_count();
> 
>             /*
>              * Workaround for Linux FF-A Driver not accepting to have its own
> @@ -320,7 +320,7 @@ void ffa_handle_partition_info_get(struct cpu_user_regs 
> *regs)
>              * the requester endpoint information should be included or not
>              */
>             if ( ACCESS_ONCE(ctx->guest_vers) < FFA_VERSION_1_2 )
> -                ffa_vm_count -= 1;
> +                ffa_vm2vm_count -= 1;
>         }
> 
>         goto out;
> @@ -355,7 +355,7 @@ void ffa_handle_partition_info_get(struct cpu_user_regs 
> *regs)
>             goto out_rx_release;
>     }
> 
> -    ret = ffa_get_vm_partinfo(uuid, &ffa_vm_count, &dst_buf, end_buf,
> +    ret = ffa_get_vm_partinfo(uuid, &ffa_vm2vm_count, &dst_buf, end_buf,
>                               dst_size);
> 
> out_rx_release:
> @@ -370,7 +370,7 @@ out:
>         if ( flags || ACCESS_ONCE(ctx->guest_vers) == FFA_VERSION_1_0 )
>             dst_size = 0;
> 
> -        ffa_set_regs_success(regs, ffa_sp_count + ffa_vm_count, dst_size);
> +        ffa_set_regs_success(regs, ffa_sp_count + ffa_vm2vm_count, dst_size);
>     }
> }
> 
> -- 
> 2.43.0