dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

ARM: align MVBAR on 32 byte boundary

Browse Source 
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: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Andre Przywara <andre.przywara@linaro.org>
Acked-by: Andre Przywara <andre.przywara@linaro.org>
This commit is contained in:
Masahiro Yamada
2013-10-07 11:46:56 +09:00
committed by Albert ARIBAUD
parent 375a4496ff
commit 3064d599af
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/nonsec_virt.S
View File

@@ -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:
* 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