OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arch: xtensa: fix stack dump for exceptions in irq handlers 

Fixes stack dump procedure for exceptions happening in interrupt
handlers. Stack base and size haven't been set to the interrupt's
one in current task context, so when exception happened during
interrupt processing we've got SOF_IPC_PANIC_STACK cause instead
of the real one.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
This commit is contained in:
Tomasz Lauda 2019-09-24 12:18:28 +02:00 committed by Liam Girdwood
parent 84e75633d0
commit 17f2de5599
7 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/xtensa/include/xtensa/xtruntime-frames.h
View File

@ -147,6 +147,8 @@ STRUCT_FIELD(void*,4,XTOS_PTR_TO_,xtos_stack_for_interrupt_2)
STRUCT_FIELD(void*,4,XTOS_PTR_TO_,xtos_stack_for_interrupt_3)
STRUCT_FIELD(void*,4,XTOS_PTR_TO_,xtos_stack_for_interrupt_4)
STRUCT_FIELD(void*,4,XTOS_PTR_TO_,xtos_stack_for_interrupt_5)
STRUCT_FIELD(void*,4,XTOS_PTR_TO_,xtos_interrupt_ctx)
STRUCT_FIELD(void*,4,XTOS_PTR_TO_,xtos_saved_ctx)
STRUCT_FIELD(void*,4,XTOS_PTR_TO_,xtos_saved_sp)
STRUCT_END(xtos_structures_pointers)

1
src/arch/xtensa/init.c
View File

@ -68,6 +68,7 @@ static void initialize_pointers_per_core(void)
core_data = core_data_ptr[core];
p = &core_data->thread_data_ptr->xtos_ptrs;
p->xtos_interrupt_ctx = &core_data->xtos_interrupt_ctx;
p->xtos_saved_sp = &core_data->xtos_saved_sp;
p->xtos_stack_for_interrupt_1 = core_data->xtos_stack_for_interrupt_1;
p->xtos_stack_for_interrupt_2 = core_data->xtos_stack_for_interrupt_2;

34
src/arch/xtensa/xtos/int-medpri-dispatcher.S
View File

@ -152,6 +152,19 @@ no_context:
s32i a1, a13, 0
addi a1, a13, SOF_STACK_SIZE
/* set stack base and size for interrupt context */
xtos_addr_percore a11, xtos_interrupt_ctx
s32i a13, a11, TC_stack_base
movi a13, SOF_STACK_SIZE
s32i a13, a11, TC_stack_size
/* save task context */
xtos_task_ctx_percore a13
xtos_store_percore a13, a14, xtos_saved_ctx
/* set interrupt task context */
xtos_task_ctx_store_percore a11, a14
/* Load the handler from the table, initialize two args (interrupt
* number and exception stack frame), then call the interrupt handler.
* Note: The callx12 preserves the original user task's a4..a15.*/
@ -202,6 +215,19 @@ no_context:
_beqz a15, LABEL(spurious,int)
/* set stack base and size for interrupt context */
xtos_addr_percore a11, xtos_interrupt_ctx
s32i a13, a11, TC_stack_base
movi a13, SOF_STACK_SIZE
s32i a13, a11, TC_stack_size
/* save task context */
xtos_task_ctx_percore a13
xtos_store_percore a13, a14, xtos_saved_ctx
/* set interrupt task context */
xtos_task_ctx_store_percore a11, a14
/* Loop to handle all pending interrupts. */
LABEL(.L1,_loop0):
@ -232,6 +258,14 @@ LABEL(.L1,_loop0):
/* Restore everything, and return. */
/* restore task context if needed */
xtos_task_ctx_percore a11
xtos_addr_percore a12, xtos_interrupt_ctx
bne a11, a12, restore_cp
xtos_addr_percore a12, xtos_saved_ctx
xtos_task_ctx_store_percore a12, a11
restore_cp:
#if __XCC__
#if (XCHAL_CP_MASK & CP0_MASK)
xtos_task_ctx_percore a11

21
src/arch/xtensa/xtos/xea1/int-lowpri-dispatcher.S
View File

@ -146,6 +146,19 @@ no_context:
_beqz a15, LABEL(spurious,int)
/* set stack base and size for interrupt context */
xtos_addr_percore a11, xtos_interrupt_ctx
s32i a13, a11, TC_stack_base
movi a13, SOF_STACK_SIZE
s32i a13, a11, TC_stack_size
/* save task context */
xtos_task_ctx_percore a13
xtos_store_percore a13, a14, xtos_saved_ctx
/* set interrupt task context */
xtos_task_ctx_store_percore a11, a14
/* Loop to handle all pending interrupts. */
LABEL(.L1,_loop0):
@ -174,6 +187,14 @@ LABEL(.L1,_loop0):
/* Restore everything, and return. */
/* restore task context if needed */
xtos_task_ctx_percore a11
xtos_addr_percore a12, xtos_interrupt_ctx
bne a11, a12, restore_cp
xtos_addr_percore a12, xtos_saved_ctx
xtos_task_ctx_store_percore a12, a11
restore_cp:
#if __XCC__
#if (XCHAL_CP_MASK & CP0_MASK)
xtos_task_ctx_percore a11

21
src/arch/xtensa/xtos/xea2/int-lowpri-dispatcher.S
View File

@ -146,6 +146,19 @@ no_context:
_beqz a15, LABEL(spurious,int)
/* set stack base and size for interrupt context */
xtos_addr_percore a11, xtos_interrupt_ctx
s32i a13, a11, TC_stack_base
movi a13, SOF_STACK_SIZE
s32i a13, a11, TC_stack_size
/* save task context */
xtos_task_ctx_percore a13
xtos_store_percore a13, a14, xtos_saved_ctx
/* set interrupt task context */
xtos_task_ctx_store_percore a11, a14
/* Loop to handle all pending interrupts. */
LABEL(.L1,_loop0):
@ -174,6 +187,14 @@ LABEL(.L1,_loop0):
/* Restore everything, and return. */
/* restore task context if needed */
xtos_task_ctx_percore a11
xtos_addr_percore a12, xtos_interrupt_ctx
bne a11, a12, restore_cp
xtos_addr_percore a12, xtos_saved_ctx
xtos_task_ctx_store_percore a12, a11
restore_cp:
#if __XCC__
#if (XCHAL_CP_MASK & CP0_MASK)
xtos_task_ctx_percore a11

2
src/arch/xtensa/xtos/xtos-internal.h
View File

@ -114,7 +114,7 @@
# endif
#endif
#define XTOS_TASK_CONTEXT_OFFSET 40
#define XTOS_TASK_CONTEXT_OFFSET 48
#if defined(_ASMLANGUAGE) || defined(__ASSEMBLER__)
/*********** Useful macros ***********/

1
src/arch/xtensa/xtos/xtos-structs.h
View File

@ -33,6 +33,7 @@ struct xtos_core_data {
uint8_t xtos_stack_for_interrupt_3[SOF_STACK_SIZE];
uint8_t xtos_stack_for_interrupt_4[SOF_STACK_SIZE];
uint8_t xtos_stack_for_interrupt_5[SOF_STACK_SIZE];
xtos_task_context xtos_interrupt_ctx;
uintptr_t xtos_saved_sp;
struct thread_data *thread_data_ptr;
};