[U-Boot] [PATCH 1/9] ARM: HYP/non-sec: fix alignment requirements for vectors

Andre Przywara
2013-11-21T22:24:59Z

On 11/21/2013 09:59 AM, Marc Zyngier wrote:
> Make sure the vectors are aligned on a 32 byte boundary, not
> the code that deals with it...

I think that patch was posted before, and I already acked it, but it
didn't make it into some tree.
Albert, can you please take this?
Also a candidate for the stable tree.

>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

Acked-by: Andre Przywara <andre.przywara@linaro.org>

Regards,
Andre.

> ---
> arch/arm/cpu/armv7/nonsec_virt.S | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
> index 24b4c18..29987cd 100644
> --- a/arch/arm/cpu/armv7/nonsec_virt.S
> +++ b/arch/arm/cpu/armv7/nonsec_virt.S
> @@ -14,6 +14,8 @@
> .arch_extension sec
> .arch_extension virt
>
> + .align 5 @ Minimal alignment for vectors
> +
> /* the vector table for secure state and HYP mode */
> _monitor_vectors:
> .word 0 /* reset */
> @@ -32,7 +34,6 @@ _monitor_vectors:
> * to non-secure state.
> * We use only r0 and r1 here, due to constraints in the caller.
> */
> - .align 5
> _secure_monitor:
> mrc p15, 0, r1, c1, c1, 0 @ read SCR
> bic r1, r1, #0x4e @ clear IRQ, FIQ, EA, nET bits
>