summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-v7m.S
diff options
context:
space:
mode:
authorVladimir Murzin <vladimir.murzin@arm.com>2019-01-25 15:18:37 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2019-02-01 21:44:19 +0000
commit72cd4064fccaae15ab84d40d4be23667402df4ed (patch)
treedbd4813fa104ed4e0359e5a546acee47fb5ef613 /arch/arm/kernel/entry-v7m.S
parenteb7ff9023e4f2998d527b37bffe794759800332a (diff)
downloadlinux-72cd4064fccaae15ab84d40d4be23667402df4ed.tar.bz2
ARM: 8830/1: NOMMU: Toggle only bits in EXC_RETURN we are really care of
ARMv8M introduces support for Security extension to M class, among other things it affects exception handling, especially, encoding of EXC_RETURN. The new bits have been added: Bit [6] Secure or Non-secure stack Bit [5] Default callee register stacking Bit [0] Exception Secure which conflicts with hard-coded value of EXC_RETURN: In fact, we only care of few bits: Bit [3] Mode (0 - Handler, 1 - Thread) Bit [2] Stack pointer selection (0 - Main, 1 - Process) We can toggle only those bits and left other bits as they were on exception entry. It is basically, what patch does - saves EXC_RETURN when we do transition form Thread to Handler mode (it is first svc), so later saved value is used instead of EXC_RET_THREADMODE_PROCESSSTACK. Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-v7m.S')
-rw-r--r--arch/arm/kernel/entry-v7m.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S
index abcf47848525..19d2dcd6530d 100644
--- a/arch/arm/kernel/entry-v7m.S
+++ b/arch/arm/kernel/entry-v7m.S
@@ -146,3 +146,7 @@ ENTRY(vector_table)
.rept CONFIG_CPU_V7M_NUM_IRQ
.long __irq_entry @ External Interrupts
.endr
+ .align 2
+ .globl exc_ret
+exc_ret:
+ .space 4