[PATCH 4/4] arm/cpu/lowlevel: invalidate i-cache before enabling

[Sascha Hauer]

On Thu, Dec 11, 2014 at 10:15:27AM +0100, Uwe Kleine-König wrote:
> Architecturally the cache contents are undefined so it might well
> contain stale data at reset. So better be save than sorry.
> 
> I verifyed that the added instructions are defined for both, ARMv6 and
> ARMv7, using the ARM Architecture Reference Manual, ARMv7-A and ARMv7-R
> edition (ARM DDI 0406C.c).
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> ---
>  arch/arm/cpu/lowlevel.S | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/cpu/lowlevel.S b/arch/arm/cpu/lowlevel.S
> index dd0f75a8802a..af2b0a8ac93a 100644
> --- a/arch/arm/cpu/lowlevel.S
> +++ b/arch/arm/cpu/lowlevel.S
> @@ -11,7 +11,19 @@ ENTRY(arm_cpu_lowlevel_init)
>  	msr	cpsr, r12
>  
>  #if __LINUX_ARM_ARCH__ >= 6
> +/*
> + * Invalidate instruction cache and branch predictor. Even if the
> + * i-cache is off it might contain stale entries that are better
> + * discarded before enabling the cache.
> + */

Please indent like the other comments

> +	/* ICIALLU: Invalidate all instruction caches to PoU */
> +	mcr	p15, 0, r12, c7, c5, 0
> +	/* BPIALL: Invalidate all branch predictors */
> +	mcr	p15, 0, r12, c7, c5, 6
> +	/* DSB, ensure completion of the invalidation */
> +	mcr	p15, 0, r12, c7, c10, 4
>  	/*
> +	 * ISB, ensure instruction fetch path is in sync.

Should this comment be in 2/4?

>  	 * Note that the ARM Architecture Reference Manual, ARMv7-A and ARMv7-R
>  	 * edition (ARM DDI 0406C.c) doesn't define this instruction in the
>  	 * ARMv6 part (D12.7.10). It only has: "Support of additional
> @@ -19,7 +31,7 @@ ENTRY(arm_cpu_lowlevel_init)
>  	 * But an earlier version of the ARMARM (ARM DDI 0100I) does define it
>  	 * as "Flush prefetch buffer (PrefetchFlush)".
>  	 */
> -	mcr	p15, 0, r12, c7, c5, 4		/* ISB */
> +	mcr	p15, 0, r12, c7, c5, 4

This comment was just introduced in 2/4.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |