patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

arch: arm: aarch32: Fix spurious interrupt handling

Browse source 
The GIC can return 0x3ff to indicate a spurious interrupt.  Other
interrupt controllers could return something different.  Check that the
pending interrupt is valid in order to avoid indexing past the end of
the isr_table.

This fixes #30465 and is based on the aarch64 fix in 9dd2731d.

Signed-off-by: Bradley Bolen <bbolen@lexmark.com>
This commit is contained in:
Bradley Bolen 2021-04-19 11:16:18 -04:00 committed by Anas Nashif
parent a186fabb56
commit 6734c6e874
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/core/aarch32/isr_wrapper.S
View file

@ -183,6 +183,14 @@ _idle_state_cleared:
* interface function.
*/
cpsie i
/*
* Skip calling the isr if it is a spurious interrupt.
*/
mov r1, #CONFIG_NUM_IRQS
lsl r1, r1, #3
cmp r0, r1
bge spurious_continue
#endif /* !CONFIG_CPU_CORTEX_M */
ldr r1, =_sw_isr_table
@ -193,6 +201,7 @@ _idle_state_cleared:
blx r3 /* call ISR */
#if defined(CONFIG_CPU_CORTEX_R)
spurious_continue:
/* Signal end-of-interrupt */
pop {r0, r1}
#if !defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)