[U-Boot] [PATCH] Nokia RX-51: Do not call secure PPA routine on non secure devices

[Pavel Machek]

On Thu 2015-01-08 10:11:40, Pali Rohár wrote:
> Since commit 41623c91b09a0c865fab41acdaff30f060f29ad6 u-boot running in qemu is
> crashing in function do_omap3_emu_romcode_call(). RX-51 board uses this function
> for Cortex-A8 errata 430973 workaround (Set IBE bit in ACR) which is needed only
> on real secure device and not in qemu.
> 
> This board patch just disable calling secure PPA routine on non secure devices.
> Qemu implements GP device and with this patch u-boot is working in qemu again.
> 
> Signed-off-by: Pali Rohár <pali.rohar at gmail.com>

Acked-by: Pavel Machek <pavel at ucw.cz>

> ---
>  board/nokia/rx51/rx51.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
> index b6b8ad6..08fcaf2 100644
> --- a/board/nokia/rx51/rx51.c
> +++ b/board/nokia/rx51/rx51.c
> @@ -422,8 +422,12 @@ int misc_init_r(void)
>  	/*
>  	 * Cortex-A8(r1p0..r1p2) errata 430973 workaround
>  	 * Set IBE bit in Auxiliary Control Register
> +	 *
> +	 * Call this routine only on real secure device
> +	 * Qemu does not implement secure PPA and crash
>  	 */
> -	omap3_update_aux_cr_secure_rx51(1 << 6, 0);
> +	if (get_device_type() == HS_DEVICE)
> +		omap3_update_aux_cr_secure_rx51(1 << 6, 0);
>  
>  	return 0;
>  }

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html