Skip to content
Snippets Groups Projects
Commit 3064d599 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Albert ARIBAUD
Browse files

ARM: align MVBAR on 32 byte boundary


The lower 5 bit of MVBAR is UNK/SBZP.
So, Monitor Vector Base Address must be 32-byte aligned.
On the other hand, the secure monitor handler does not need
32-byte alignment.

This commit moves ".algin 5" directive to the correct place.

Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Andre Przywara <andre.przywara@linaro.org>
Acked-by: default avatarAndre Przywara <andre.przywara@linaro.org>
parent 375a4496
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
.arch_extension sec .arch_extension sec
.arch_extension virt .arch_extension virt
.align 5
/* the vector table for secure state and HYP mode */ /* the vector table for secure state and HYP mode */
_monitor_vectors: _monitor_vectors:
.word 0 /* reset */ .word 0 /* reset */
...@@ -32,7 +33,6 @@ _monitor_vectors: ...@@ -32,7 +33,6 @@ _monitor_vectors:
* to non-secure state. * to non-secure state.
* We use only r0 and r1 here, due to constraints in the caller. * We use only r0 and r1 here, due to constraints in the caller.
*/ */
.align 5
_secure_monitor: _secure_monitor:
mrc p15, 0, r1, c1, c1, 0 @ read SCR mrc p15, 0, r1, c1, c1, 0 @ read SCR
bic r1, r1, #0x4e @ clear IRQ, FIQ, EA, nET bits bic r1, r1, #0x4e @ clear IRQ, FIQ, EA, nET bits
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment