diff options
| author | GUI <[email protected]> | 2022-03-07 22:41:56 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-07 22:41:56 +0800 |
| commit | 0a8dd10b0bb73a8c52b7c9132bdb9ce8202a18bb (patch) | |
| tree | e3d9e3fde5c8b9ba6a5f6ba8578ccfd956e0c110 /libcpu/aarch64/common/stack.c | |
| parent | 532d898e71adf13eb880e7bfb598c35cc7b0f92a (diff) | |
[libcpu/aarch64] add gtimer frq set and stack align (#5642)
* [libcpu/aarch64] add smp support
* [libcpu/aarch64] rt_hw_trap_irq get irq instead of iar when using gicv2
* [libcpu/aarch64] disable irq/fiq when switch thread
* [libcpu/aarch64] add gtimer frq set and stack align
Diffstat (limited to 'libcpu/aarch64/common/stack.c')
| -rw-r--r-- | libcpu/aarch64/common/stack.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/libcpu/aarch64/common/stack.c b/libcpu/aarch64/common/stack.c index a0ec935e5d..2743fd3eee 100644 --- a/libcpu/aarch64/common/stack.c +++ b/libcpu/aarch64/common/stack.c @@ -13,10 +13,6 @@ #include <rtthread.h> #include <armv8.h> -#define INITIAL_SPSR_EL3 (PSTATE_EL3 | SP_ELx) -#define INITIAL_SPSR_EL2 (PSTATE_EL2 | SP_ELx) -#define INITIAL_SPSR_EL1 (PSTATE_EL1 | SP_ELx) - /** * This function will initialize thread stack * @@ -29,10 +25,14 @@ */ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *stack_addr, void *texit) { - rt_ubase_t *stk; - rt_ubase_t current_el; - - stk = (rt_ubase_t*)stack_addr; + static const rt_ubase_t initial_spsr[] = + { + [1] = PSTATE_EL1 | SP_ELx, + [2] = PSTATE_EL2 | SP_ELx, + [3] = PSTATE_EL3 | SP_ELx + }; + /* The AAPCS64 requires 128-bit (16 byte) stack alignment */ + rt_ubase_t *stk = (rt_ubase_t*)RT_ALIGN_DOWN((rt_ubase_t)stack_addr, 16); *(--stk) = (rt_ubase_t) 0; /* Q0 */ *(--stk) = (rt_ubase_t) 0; /* Q0 */ @@ -102,21 +102,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *stack_ad *(--stk) = ( rt_ubase_t ) 0; /* XZR - has no effect, used so there are an even number of registers. */ *(--stk) = ( rt_ubase_t ) texit; /* X30 - procedure call link register. */ - current_el = rt_hw_get_current_el(); - - if(current_el == 3) - { - *(--stk) = INITIAL_SPSR_EL3; - } - else if(current_el == 2) - { - *(--stk) = INITIAL_SPSR_EL2; - } - else - { - *(--stk) = INITIAL_SPSR_EL1; - } - + *(--stk) = initial_spsr[rt_hw_get_current_el()]; *(--stk) = ( rt_ubase_t ) tentry; /* Exception return address. */ /* return task's current stack address */ |
