[U-Boot] [PATCH] ARM: HYP/non-sec: Make a variable as a local one

Albert ARIBAUD albert.u.boot at aribaud.net
Thu Sep 18 11:43:50 CEST 2014


Hi Tang,

Please fix subject / commit summary to indicate which variable is to be
made local.

On Thu, 18 Sep 2014 17:12:34 +0800, Tang Yuantian
<Yuantian.Tang at freescale.com> wrote:

> Defining variable gic_dist_addr as a globe one prevents some
> functions, which use this variable, from being used before relocation
> which happened in the deep sleep resume process on Freescale SoC
> platforms.
> 
> Signed-off-by: Tang Yuantian <Yuantian.Tang at freescale.com>
> ---
>  arch/arm/cpu/armv7/virt-v7.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
> index 651ca40..b69fd37 100644
> --- a/arch/arm/cpu/armv7/virt-v7.c
> +++ b/arch/arm/cpu/armv7/virt-v7.c
> @@ -15,8 +15,6 @@
>  #include <asm/io.h>
>  #include <asm/secure.h>
>  
> -unsigned long gic_dist_addr;
> -
>  static unsigned int read_id_pfr1(void)
>  {
>  	unsigned int reg;
> @@ -68,6 +66,12 @@ static void kick_secondary_cpus_gic(unsigned long gicdaddr)
>  
>  void __weak smp_kick_all_cpus(void)
>  {
> +	unsigned long gic_dist_addr;
> +
> +	gic_dist_addr = get_gicd_base_address();
> +	if (gic_dist_addr == -1)
> +		return;
> +
>  	kick_secondary_cpus_gic(gic_dist_addr);
>  }
>  
> @@ -75,6 +79,7 @@ int armv7_init_nonsec(void)
>  {
>  	unsigned int reg;
>  	unsigned itlinesnr, i;
> +	unsigned long gic_dist_addr;
>  
>  	/* check whether the CPU supports the security extensions */
>  	reg = read_id_pfr1();

Did you check that the global was not used as a common variable between
the functions?

Amicalement,
-- 
Albert.


More information about the U-Boot mailing list