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

drivers: counter: counter_ambiq_timer: Enable interrupt in set_alarm

Browse source 
Alarm interrupt is disabled in cancel_alarm, we should re-enable it
in set_alarm, at meanwhile, should reset the compare register in
cancel_alarm to avoid the contention condition in
cancel_alarm & set_alarm in short time.
This change fixes the test case failure at
zephyr\tests\drivers\counter\counter_basic_api.

Signed-off-by: Bryan Zhu <bzhu@ambiq.com>
This commit is contained in:
Bryan Zhu 2023-12-26 14:35:15 +08:00 committed by Carles Cufí
parent c8d22cf13a
commit 6a64bf6b4f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/counter/counter_ambiq_timer.c
View file

@ -43,7 +43,6 @@ static int counter_ambiq_init(const struct device *dev)
tc.ui32PatternLimit = 0;
am_hal_timer_config(0, &tc);
am_hal_timer_interrupt_enable(AM_HAL_TIMER_MASK(0, AM_HAL_TIMER_COMPARE1));
k_spin_unlock(&lock, key);
@ -98,6 +97,10 @@ static int counter_ambiq_set_alarm(const struct device *dev, uint8_t chan_id,
k_spinlock_key_t key = k_spin_lock(&lock);
/* Enable interrupt, due to counter_ambiq_cancel_alarm() disables it*/
am_hal_timer_interrupt_clear(AM_HAL_TIMER_MASK(0, AM_HAL_TIMER_COMPARE1));
am_hal_timer_interrupt_enable(AM_HAL_TIMER_MASK(0, AM_HAL_TIMER_COMPARE1));
if ((alarm_cfg->flags & COUNTER_ALARM_CFG_ABSOLUTE) == 0) {
am_hal_timer_compare1_set(0, now + alarm_cfg->ticks);
} else {
@ -119,6 +122,8 @@ static int counter_ambiq_cancel_alarm(const struct device *dev, uint8_t chan_id)
k_spinlock_key_t key = k_spin_lock(&lock);
am_hal_timer_interrupt_disable(AM_HAL_TIMER_MASK(0, AM_HAL_TIMER_COMPARE1));
/* Reset the compare register */
am_hal_timer_compare1_set(0, 0);
k_spin_unlock(&lock, key);
return 0;