Skip to content

drivers: counter: esp32: Fix alarm stops working #93538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2025
+11 −7
Merged

drivers: counter: esp32: Fix alarm stops working #93538

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions drivers/counter/counter_esp32_tmr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ static int counter_esp32_set_alarm(const struct device *dev, uint8_t chan_id,
uint32_t ticks = alarm_cfg->ticks;
uint32_t top = data->top_data.ticks;
uint32_t max_rel_val = data->top_data.ticks;
uint32_t now;
uint64_t now;
uint64_t target;
uint32_t diff;
int err = 0;
bool irq_on_late = 0;
Expand All @@ -161,19 +162,22 @@ static int counter_esp32_set_alarm(const struct device *dev, uint8_t chan_id,
data->alarm_cfg.callback = alarm_cfg->callback;
data->alarm_cfg.user_data = alarm_cfg->user_data;

counter_esp32_get_value(dev, &now);
counter_esp32_get_value_64(dev, &now);

if (absolute == 0) {
ticks += now;
timer_ll_set_alarm_value(data->hal_ctx.dev, data->hal_ctx.timer_id, ticks);
target = now + ticks;
} else {
irq_on_late = alarm_cfg->flags & COUNTER_ALARM_CFG_EXPIRE_WHEN_LATE;
max_rel_val = top - data->top_data.guard_period;
timer_ll_set_alarm_value(data->hal_ctx.dev, data->hal_ctx.timer_id,
alarm_cfg->ticks);
target = (now & ~0xFFFFFFFFULL) | ticks;
if (target < now) {
target += (1ULL << 32);
}
}

diff = (alarm_cfg->ticks - now);
timer_ll_set_alarm_value(data->hal_ctx.dev, data->hal_ctx.timer_id, target);

diff = (alarm_cfg->ticks - (uint32_t)now);
if (diff > max_rel_val) {
if (absolute) {
err = -ETIME;
Expand Down