riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/stm32/gpio: fix EXTI flag clearing

Browse Source 
In case a non-gpio EXTI (>= 16) is pending, the isr_exti() used to clear
the flag and try to call a callback, which was out-of-bouds, thus
generating a hard fault.
This fixes it by masking the pending_isr variables with 0xFFFF.
This commit is contained in:
Vincent Dupont 2021-02-01 13:20:58 +01:00
parent 0903952564
commit 3e8e109e8b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpu/stm32/periph/gpio_all.c
View File

@ -36,6 +36,7 @@
* @brief The STM32F0 family has 16 external interrupt lines * @brief The STM32F0 family has 16 external interrupt lines
*/ */
#define EXTI_NUMOF (16U) #define EXTI_NUMOF (16U)
#define EXTI_MASK (0xFFFF)
/** /**
* @brief Allocate memory for one callback and argument per EXTI channel * @brief Allocate memory for one callback and argument per EXTI channel
@ -338,8 +339,8 @@ void isr_exti(void)
#if defined(CPU_FAM_STM32G0) || defined(CPU_FAM_STM32L5) || \ #if defined(CPU_FAM_STM32G0) || defined(CPU_FAM_STM32L5) || \
defined(CPU_FAM_STM32MP1) defined(CPU_FAM_STM32MP1)
/* only generate interrupts against lines which have their IMR set */ /* only generate interrupts against lines which have their IMR set */
uint32_t pending_rising_isr = (EXTI->RPR1 & EXTI_REG_IMR); uint32_t pending_rising_isr = (EXTI->RPR1 & EXTI_REG_IMR & EXTI_MASK);
uint32_t pending_falling_isr = (EXTI->FPR1 & EXTI_REG_IMR); uint32_t pending_falling_isr = (EXTI->FPR1 & EXTI_REG_IMR & EXTI_MASK);
/* clear by writing a 1 */ /* clear by writing a 1 */
EXTI->RPR1 = pending_rising_isr; EXTI->RPR1 = pending_rising_isr;
@ -348,7 +349,7 @@ void isr_exti(void)
uint32_t pending_isr = pending_rising_isr | pending_falling_isr; uint32_t pending_isr = pending_rising_isr | pending_falling_isr;
#else #else
/* only generate interrupts against lines which have their IMR set */ /* only generate interrupts against lines which have their IMR set */
uint32_t pending_isr = (EXTI_REG_PR & EXTI_REG_IMR); uint32_t pending_isr = (EXTI_REG_PR & EXTI_REG_IMR & EXTI_MASK);
/* clear by writing a 1 */ /* clear by writing a 1 */
EXTI_REG_PR = pending_isr; EXTI_REG_PR = pending_isr;