From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 5 Oct 2012 20:23:14 +0200
Subject: [U-Boot] [PATCH v2] arm1136: Fix enable_caches()
In-Reply-To: <2073292623.6157135.1349381042411.JavaMail.root@advansee.com>
References: <616950058.2399354.1344950229125.JavaMail.root@advansee.com>
	<2073292623.6157135.1349381042411.JavaMail.root@advansee.com>
Message-ID: <20121005202314.22af6462@lilith>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

 Beno?t,

On Thu, 4 Oct 2012 22:04:02 +0200 (CEST), Beno?t Th?baudeau
<benoit.thebaudeau@advansee.com> wrote:

> enable_caches() did not enable icache if CONFIG_SYS_ICACHE_OFF was not defined
> but CONFIG_SYS_DCACHE_OFF was.
> 
> Signed-off-by: Beno?t Th?baudeau <benoit.thebaudeau@advansee.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> ---
> This patch supersedes http://patchwork.ozlabs.org/patch/177263/ .
> 
> Changes for v2:
>  - Move enable_caches() outside of the main #if in order to fix this icache
>    issue rather than doing only #if cosmetic cleanup.
> 
>  .../arch/arm/cpu/arm1136/cpu.c                     |   22 +++++++++++---------
>  1 file changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git u-boot-arm-1dfc916.orig/arch/arm/cpu/arm1136/cpu.c u-boot-arm-1dfc916/arch/arm/cpu/arm1136/cpu.c
> index b98e3d9..32a4c24 100644
> --- u-boot-arm-1dfc916.orig/arch/arm/cpu/arm1136/cpu.c
> +++ u-boot-arm-1dfc916/arch/arm/cpu/arm1136/cpu.c
> @@ -141,16 +141,6 @@ void flush_cache(unsigned long start, unsigned long size)
>  	flush_dcache_range(start, start + size);
>  }
>  
> -void enable_caches(void)
> -{
> -#ifndef CONFIG_SYS_ICACHE_OFF
> -	icache_enable();
> -#endif
> -#ifndef CONFIG_SYS_DCACHE_OFF
> -	dcache_enable();
> -#endif
> -}
> -
>  #else /* #ifndef CONFIG_SYS_DCACHE_OFF */
>  void invalidate_dcache_all(void)
>  {
> @@ -172,3 +162,15 @@ void flush_cache(unsigned long start, unsigned long size)
>  {
>  }
>  #endif /* #ifndef CONFIG_SYS_DCACHE_OFF */
> +
> +#if !defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF)
> +void enable_caches(void)
> +{
> +#ifndef CONFIG_SYS_ICACHE_OFF
> +	icache_enable();
> +#endif
> +#ifndef CONFIG_SYS_DCACHE_OFF
> +	dcache_enable();
> +#endif
> +}
> +#endif
> 

Applied to u-boot-arm/next, thanks!

Amicalement,
-- 
Albert.