[PATCH - 2/2] arm: disable caches based on config option

[Nicolas Pitre]

On Thu, 30 Aug 2012, Murali Karicheri wrote:

> CONFIG_CPU_ICACHE_DISABLE and CONFIG_CPU_DCACHE_DISABLE are available
> to allow disabling of D-Cache and I-Cache. However the compressed version
> of head.S currently doesn't check these variables. This patch will fix
> this issue and is written similar to the uncompressed version of head.S
> 
> Signed-off-by: Murali Karicheri <m-karicheri2 at ti.com>

Acked-by: nicolas Pitre <nico at linaro.org>

You may submit your patch to http://www.arm.linux.org.uk/developer/patches/.


> ---
>  arch/arm/boot/compressed/head.S |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
> index b8c64b8..e1d2124 100644
> --- a/arch/arm/boot/compressed/head.S
> +++ b/arch/arm/boot/compressed/head.S
> @@ -659,6 +659,12 @@ __armv7_mmu_cache_on:
>  #ifdef CONFIG_CPU_ENDIAN_BE8
>  		orr	r0, r0, #1 << 25	@ big-endian page tables
>  #endif
> +#ifdef CONFIG_CPU_DCACHE_DISABLE
> +		bic	r0, r0, #1 << 2
> +#endif
> +#ifdef CONFIG_CPU_ICACHE_DISABLE
> +		bic	r0, r0, #1 << 12
> +#endif
>  		orrne	r0, r0, #1		@ MMU enabled
>  		movne	r1, #0xfffffffd		@ domain 0 = client
>  		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer
> -- 
> 1.7.9.5
>