From e8bcbbc5d38f918702f939e03a4b786d17893f1b Mon Sep 17 00:00:00 2001 From: Filipe Cavalcanti Date: Thu, 9 Apr 2026 13:37:34 -0300 Subject: [PATCH] arch/risc-v: register Wi-Fi IRQs in non_iram mask for SPI flash Wi-Fi used a locally allocated vector_desc, so those CPU interrupt lines were never recorded in the HAL non_iram_int_mask. During SPI flash, esp_intr_noniram_disable() therefore did not mask them, and Wi-Fi ISRs could still run with the cache off. Now, Wi-Fi IRQs are treated as non-IRAM and get masked while flash/cache is suspended. Signed-off-by: Filipe Cavalcanti --- arch/risc-v/src/esp32c3/esp_wifi_adapter.c | 26 ++++++++++++++++------ arch/risc-v/src/esp32c6/esp_wifi_adapter.c | 25 +++++++++++++++------ 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/arch/risc-v/src/esp32c3/esp_wifi_adapter.c b/arch/risc-v/src/esp32c3/esp_wifi_adapter.c index 0ddc7f1c85b..e51504592a8 100644 --- a/arch/risc-v/src/esp32c3/esp_wifi_adapter.c +++ b/arch/risc-v/src/esp32c3/esp_wifi_adapter.c @@ -40,6 +40,7 @@ #include "esp_hr_timer.h" #include "esp_log.h" +#include "esp_intr_alloc.h" #include "esp_mac.h" #include "esp_random.h" #include "esp_private/wifi_os_adapter.h" @@ -85,6 +86,12 @@ struct vector_desc_t vector_desc_t *next; }; +/* From esp_hw_support/intr_alloc.c: returns a pointer to a HAL-owned + * vector descriptor for some intno and cpu. + */ + +extern vector_desc_t *get_desc_for_int(int intno, int cpu); + /**************************************************************************** * Private Function Prototypes ****************************************************************************/ @@ -532,7 +539,9 @@ static void wifi_delete_queue_wrapper(void *queue) * Name: set_intr_wrapper * * Description: - * Do nothing + * Route the Wi-Fi interrupt source and attach a handle that uses the HAL + * global vector descriptor list. Mark the CPU line as non-IRAM so + * esp_intr_noniram_disable() masks it while SPI flash holds the cache off. * * Input Parameters: * cpu_no - The CPU which the interrupt number belongs. @@ -550,6 +559,7 @@ static void set_intr_wrapper(int32_t cpu_no, uint32_t intr_source, { intr_handle_t handle; int irq = ESP_SOURCE2IRQ(intr_source); + esp_err_t err; wlinfo("cpu_no=%" PRId32 ", intr_source=%" PRIu32 ", intr_num=%" PRIu32 ", intr_prio=%" PRId32 "\n", @@ -566,22 +576,24 @@ static void set_intr_wrapper(int32_t cpu_no, uint32_t intr_source, return; } - handle->vector_desc = kmm_calloc(1, sizeof(vector_desc_t)); + handle->vector_desc = get_desc_for_int(intr_num, cpu_no); if (handle->vector_desc == NULL) { - wlerr("Failed to kmm_calloc\n"); + wlerr("get_desc_for_int failed\n"); kmm_free(handle); return; } - handle->vector_desc->intno = intr_num; - handle->vector_desc->cpu = cpu_no; handle->vector_desc->source = intr_source; - handle->vector_desc->shared_vec_info = NULL; - handle->vector_desc->next = NULL; handle->shared_vector_desc = NULL; esp_set_handle(cpu_no, irq, handle); + + err = esp_intr_set_in_iram(handle, false); + if (err != ESP_OK) + { + wlerr("esp_intr_set_in_iram failed: %d\n", err); + } } /**************************************************************************** diff --git a/arch/risc-v/src/esp32c6/esp_wifi_adapter.c b/arch/risc-v/src/esp32c6/esp_wifi_adapter.c index 862af21cebf..77896f311b5 100644 --- a/arch/risc-v/src/esp32c6/esp_wifi_adapter.c +++ b/arch/risc-v/src/esp32c6/esp_wifi_adapter.c @@ -121,6 +121,12 @@ struct vector_desc_t vector_desc_t *next; }; +/* From esp_hw_support/intr_alloc.c: returns a pointer to a HAL-owned + * vector descriptor for some intno and cpu. + */ + +extern vector_desc_t *get_desc_for_int(int intno, int cpu); + /**************************************************************************** * Private Function Prototypes ****************************************************************************/ @@ -566,7 +572,9 @@ static void wifi_delete_queue_wrapper(void *queue) * Name: set_intr_wrapper * * Description: - * Do nothing + * Route the Wi-Fi interrupt source and attach a handle that uses the HAL + * global vector descriptor list. Mark the CPU line as non-IRAM so + * esp_intr_noniram_disable() masks it while SPI flash holds the cache off. * * Input Parameters: * cpu_no - The CPU which the interrupt number belongs. @@ -584,6 +592,7 @@ static void set_intr_wrapper(int32_t cpu_no, uint32_t intr_source, { intr_handle_t handle; int irq = ESP_SOURCE2IRQ(intr_source); + esp_err_t err; wlinfo("cpu_no=%" PRId32 ", intr_source=%" PRIu32 ", intr_num=%" PRIu32 ", intr_prio=%" PRId32 "\n", @@ -600,22 +609,24 @@ static void set_intr_wrapper(int32_t cpu_no, uint32_t intr_source, return; } - handle->vector_desc = kmm_calloc(1, sizeof(vector_desc_t)); + handle->vector_desc = get_desc_for_int(intr_num, cpu_no); if (handle->vector_desc == NULL) { - wlerr("Failed to kmm_calloc\n"); + wlerr("get_desc_for_int failed\n"); kmm_free(handle); return; } - handle->vector_desc->intno = intr_num; - handle->vector_desc->cpu = cpu_no; handle->vector_desc->source = intr_source; - handle->vector_desc->shared_vec_info = NULL; - handle->vector_desc->next = NULL; handle->shared_vector_desc = NULL; esp_set_handle(cpu_no, irq, handle); + + err = esp_intr_set_in_iram(handle, false); + if (err != ESP_OK) + { + wlerr("esp_intr_set_in_iram failed: %d\n", err); + } } /****************************************************************************