diff options
author | Georges Savoundararadj <savoundg@gmail.com> | 2014-10-28 23:16:12 +0100 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-10-29 09:03:28 -0400 |
commit | 571bdf16a78e9e116a93d46f4809c4f8a3f2adb6 (patch) | |
tree | 1b73704d59f071d4bebcc104dbc308dd3f758e38 /arch | |
parent | 3ff46cc42b9d73d01c86df904425704410958470 (diff) | |
download | u-boot-imx-571bdf16a78e9e116a93d46f4809c4f8a3f2adb6.zip u-boot-imx-571bdf16a78e9e116a93d46f4809c4f8a3f2adb6.tar.gz u-boot-imx-571bdf16a78e9e116a93d46f4809c4f8a3f2adb6.tar.bz2 |
arm: interrupt_init: set sp in IRQ/FIQ modes
Before this commit, the stack addresses for IRQ and FIQ modes,
IRQ_STACK_START and FIQ_STACK_START, were computed in interrupt_init but
they were not used.
This commit sets the stack pointers for IRQ and FIQ modes.
Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/lib/interrupts.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 9019736..4dacfd9 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -28,6 +28,8 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_USE_IRQ int interrupt_init (void) { + unsigned long cpsr; + /* * setup up stacks if necessary */ @@ -35,6 +37,31 @@ int interrupt_init (void) IRQ_STACK_START_IN = gd->irq_sp + 8; FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ; + + __asm__ __volatile__("mrs %0, cpsr\n" + : "=r" (cpsr) + : + : "memory"); + + __asm__ __volatile__("msr cpsr_c, %0\n" + "mov sp, %1\n" + : + : "r" (IRQ_MODE | I_BIT | F_BIT | (cpsr & ~FIQ_MODE)), + "r" (IRQ_STACK_START) + : "memory"); + + __asm__ __volatile__("msr cpsr_c, %0\n" + "mov sp, %1\n" + : + : "r" (FIQ_MODE | I_BIT | F_BIT | (cpsr & ~IRQ_MODE)), + "r" (FIQ_STACK_START) + : "memory"); + + __asm__ __volatile__("msr cpsr_c, %0" + : + : "r" (cpsr) + : "memory"); + return arch_interrupt_init(); } |