Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-07-21 21:11:12 +02:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

esp32/machine_timer: Do not free interrupt from ISR.

Browse Source 
esp_intr_free is not safe to call from the timer ISR because it requires
the current task (the one the ISR interrupted) to be pinned to the same
core as the interrupt was allocated on. Merely disabling the ISR however is
safe since that only requires that we're currently running on the same core
(which the ISR always is), regardless of the current task.

This was causing deadlocks in machine_uart when the ISR happened to
interrupt a task that was not pinned to a specific core.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
This commit is contained in:
Daniël van de Giessen
2025-04-22 17:12:26 +02:00
committed by Damien George
parent 5b340b12b8
commit bf909303ff
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ports/esp32/machine_timer.c
View File

@@ -50,12 +50,13 @@
const mp_obj_type_t machine_timer_type; const mp_obj_type_t machine_timer_type;
static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args); static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
static mp_obj_t machine_timer_deinit(mp_obj_t self_in);
void machine_timer_deinit_all(void) { void machine_timer_deinit_all(void) {
// Disable, deallocate and remove all timers from list // Disable, deallocate and remove all timers from list
machine_timer_obj_t **t = &MP_STATE_PORT(machine_timer_obj_head); machine_timer_obj_t **t = &MP_STATE_PORT(machine_timer_obj_head);
while (*t != NULL) { while (*t != NULL) {
machine_timer_disable(*t); machine_timer_deinit(*t);
machine_timer_obj_t *next = (*t)->next; machine_timer_obj_t *next = (*t)->next;
m_del_obj(machine_timer_obj_t, *t); m_del_obj(machine_timer_obj_t, *t);
*t = next; *t = next;
@@ -96,6 +97,7 @@ machine_timer_obj_t *machine_timer_create(mp_uint_t timer) {
self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type); self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type);
self->group = group; self->group = group;
self->index = index; self->index = index;
self->handle = NULL;
// Add the timer to the linked-list of timers // Add the timer to the linked-list of timers
self->next = MP_STATE_PORT(machine_timer_obj_head); self->next = MP_STATE_PORT(machine_timer_obj_head);
@@ -131,9 +133,8 @@ void machine_timer_disable(machine_timer_obj_t *self) {
} }
if (self->handle) { if (self->handle) {
// Free the interrupt handler. // Disable the interrupt
esp_intr_free(self->handle); ESP_ERROR_CHECK(esp_intr_disable(self->handle));
self->handle = NULL;
} }
// We let the disabled timer stay in the list, as it might be // We let the disabled timer stay in the list, as it might be
@@ -167,6 +168,10 @@ void machine_timer_enable(machine_timer_obj_t *self, void (*timer_isr)) {
// Allocate and enable the alarm interrupt. // Allocate and enable the alarm interrupt.
timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), false); timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), false);
timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index)); timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
if (self->handle) {
ESP_ERROR_CHECK(esp_intr_free(self->handle));
self->handle = NULL;
}
ESP_ERROR_CHECK( ESP_ERROR_CHECK(
esp_intr_alloc(timer_group_periph_signals.groups[self->group].timer_irq_id[self->index], esp_intr_alloc(timer_group_periph_signals.groups[self->group].timer_irq_id[self->index],
TIMER_FLAGS, timer_isr, self, &self->handle) TIMER_FLAGS, timer_isr, self, &self->handle)
@@ -233,7 +238,13 @@ static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
} }
static mp_obj_t machine_timer_deinit(mp_obj_t self_in) { static mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
machine_timer_disable(self_in); machine_timer_obj_t *self = self_in;
machine_timer_disable(self);
if (self->handle) {
ESP_ERROR_CHECK(esp_intr_free(self->handle));
self->handle = NULL;
}
return mp_const_none; return mp_const_none;
} }