Skip to content
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

Jump to bottom

riscv/esp32c3: Fix RT timer issues #3697

Merged
merged 1 commit into from May 16, 2021
Merged

riscv/esp32c3: Fix RT timer issues #3697

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 27 additions & 5 deletions arch/risc-v/src/esp32c3/esp32c3_rt_timer.c
View file
Open in desktop
Expand Up @@ -253,6 +253,7 @@ static void stop_rt_timer(FAR struct rt_timer_s *timer)

static void delete_rt_timer(FAR struct rt_timer_s *timer)
{
int ret;
irqstate_t flags;

flags = enter_critical_section();
Expand All @@ -273,6 +274,14 @@ static void delete_rt_timer(FAR struct rt_timer_s *timer)
list_add_after(&s_toutlist, &timer->list);
timer->state = RT_TIMER_DELETE;

/* Wake up thread to process deleted timers */

ret = nxsem_post(&s_toutsem);
if (ret < 0)
{
tmrerr("ERROR: Failed to post sem ret=%d\n", ret);
}

exit:
leave_critical_section(flags);
}
Expand Down Expand Up @@ -387,20 +396,18 @@ static int rt_timer_thread(int argc, FAR char *argv[])

static int rt_timer_isr(int irq, void *context, void *arg)
{
int ret;
irqstate_t flags;
struct rt_timer_s *timer;
uint64_t alarm;
uint64_t counter;
bool wake = false;
struct esp32c3_tim_dev_s *tim = s_esp32c3_tim_dev;

/* Clear interrupt register status */

ESP32C3_TIM_ACKINT(tim);

/* Wake up thread to process timeout timers */

nxsem_post(&s_toutsem);

flags = enter_critical_section();

/* Check if there is timer running */
Expand Down Expand Up @@ -428,6 +435,7 @@ static int rt_timer_isr(int irq, void *context, void *arg)
list_delete(&timer->list);
timer->state = RT_TIMER_TIMEOUT;
list_add_after(&s_toutlist, &timer->list);
wake = true;

/* Check if thers is timer running */

Expand All @@ -439,9 +447,23 @@ static int rt_timer_isr(int irq, void *context, void *arg)
alarm = timer->alarm;

ESP32C3_TIM_SETALRVL(tim, alarm);
ESP32C3_TIM_SETALRM(tim, true);
}
}

/* If there is timer in list, alarm should be enable */

ESP32C3_TIM_SETALRM(tim, true);
}

if (wake)
{
/* Wake up thread to process timeout timers */

ret = nxsem_post(&s_toutsem);
if (ret < 0)
{
tmrerr("ERROR: Failed to post sem ret=%d\n", ret);
}
}

leave_critical_section(flags);
Expand Down