summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Hesling <hesling@chromium.org>2020-03-12 18:05:11 (GMT)
committerCommit Bot <commit-bot@chromium.org>2020-03-17 17:48:44 (GMT)
commitc38dc837e444388dd5fdf4aac1cd5c893eb2fa22 (patch)
tree40f55d3068c61ee7c14b62cb265f0f7be57c127f
parent8d1007b2c940c081729cbf43c1fbec857fc85fde (diff)
downloadchrome-ec-firmware-rammus-11275.B.tar.gz
stm32: Fix manual interrupt clearing functionfirmware-rammus-11275.B
This fixes a bug in gpio_clear_pending_interrupt, where all pending interrupts are unintentionally cleared. This is not in the code path for normal gpio interrupt handlers, since the normal interrupt clearing occurs in gpio_interrupt (right below this function). BRANCH=none BUG=chromium:1059520 TEST=none Signed-off-by: Craig Hesling <hesling@chromium.org> Change-Id: I4d6fe7947f4d76cf3b57dfbf3bb926e41851c80c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2101208 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org> (cherry picked from commit c2c2c083fef813e3e3c70f8c13a1418717ba682d) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2107292
-rw-r--r--chip/stm32/gpio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/chip/stm32/gpio.c b/chip/stm32/gpio.c
index a8415cc..21c7a7c 100644
--- a/chip/stm32/gpio.c
+++ b/chip/stm32/gpio.c
@@ -127,7 +127,8 @@ int gpio_clear_pending_interrupt(enum gpio_signal signal)
if (!g->mask || signal >= GPIO_IH_COUNT)
return EC_ERROR_INVAL;
- STM32_EXTI_PR |= g->mask;
+ /* Write 1 to clear interrupt */
+ STM32_EXTI_PR = g->mask;
return EC_SUCCESS;
}
@@ -142,6 +143,7 @@ void __keep gpio_interrupt(void)
uint32_t pending = STM32_EXTI_PR & 0xFFFF;
uint8_t signal;
+ /* Write 1 to clear interrupt */
STM32_EXTI_PR = pending;
while (pending) {