minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Blackfin: use scratch pad for exception stack

Browse Source 
If the memory layout pushes the stack out of the default DCPLB coverage,
the exception handler may trigger a double fault by trying to push onto
the uncovered stack.  So handle the exception stack similar to the kernel
by using the top of the scratch pad SRAM.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2009-08-24 20:48:04 -04:00
parent 69a25ce357
commit 9c46e71af2
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpu/blackfin/interrupt.S
View File

@ -5,6 +5,7 @@
* Licensed under the GPL-2 or later. * Licensed under the GPL-2 or later.
*/ */
#include <config.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include <asm/entry.h> #include <asm/entry.h>
@ -12,12 +13,16 @@
/* default entry point for exceptions */ /* default entry point for exceptions */
ENTRY(_trap) ENTRY(_trap)
CONFIG_BFIN_SCRATCH_REG = sp;
sp.l = LO(L1_SRAM_SCRATCH_END - 20);
sp.h = HI(L1_SRAM_SCRATCH_END - 20);
SAVE_ALL_SYS SAVE_ALL_SYS
r0 = sp; /* stack frame pt_regs pointer argument ==> r0 */ r0 = sp; /* stack frame pt_regs pointer argument ==> r0 */
sp += -12; sp += -12;
call _trap_c; call _trap_c;
sp += 12; sp += 12;
RESTORE_ALL_SYS RESTORE_ALL_SYS
sp = CONFIG_BFIN_SCRATCH_REG;
rtx; rtx;
ENDPROC(_trap) ENDPROC(_trap)

4
include/asm-blackfin/config.h
View File

@ -14,6 +14,10 @@
# error CONFIG_BFIN_CPU: your board config needs to define this # error CONFIG_BFIN_CPU: your board config needs to define this
#endif #endif
#ifndef CONFIG_BFIN_SCRATCH_REG
# define CONFIG_BFIN_SCRATCH_REG retn
#endif
/* Make sure the structure is properly aligned */ /* Make sure the structure is properly aligned */
#if ((CONFIG_SYS_GBL_DATA_ADDR & -4) != CONFIG_SYS_GBL_DATA_ADDR) #if ((CONFIG_SYS_GBL_DATA_ADDR & -4) != CONFIG_SYS_GBL_DATA_ADDR)
# error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned # error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned