From 61820f5b307813cad5b1c02c5b3f2e9c442d1ca1 Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Mon, 11 Oct 2021 20:47:27 +0530 Subject: [PATCH] cpu_start: let individual core clear its interrupt matrix There was race condition where interrupt entries set by APP cpu core could have been cleared during PRO cpu startup. This was observed while setting up "cache access error" interrupt in SMP mode for ESP32-S3. This fix allows to NOT modify or clear any entries set by other core (APP or PRO) and thus avoiding any race conditions during startup code. --- components/esp_system/port/cpu_start.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c index e936223c08..bfa8e48ed9 100644 --- a/components/esp_system/port/cpu_start.c +++ b/components/esp_system/port/cpu_start.c @@ -137,6 +137,15 @@ static volatile bool s_resume_cores; // If CONFIG_SPIRAM_IGNORE_NOTFOUND is set and external RAM is not found or errors out on testing, this is set to false. bool g_spiram_ok = true; +static void intr_matrix_clear(void) +{ + uint32_t core_id = cpu_hal_get_core_id(); + + for (int i = 0; i < ETS_MAX_INTR_SOURCE; i++) { + intr_matrix_set(core_id, i, ETS_INVALID_INUM); + } +} + #if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE void startup_resume_other_cores(void) { @@ -170,6 +179,9 @@ void IRAM_ATTR call_start_cpu1(void) s_cpu_up[1] = true; ESP_EARLY_LOGI(TAG, "App cpu up."); + // Clear interrupt matrix for APP CPU core + intr_matrix_clear(); + //Take care putting stuff here: if asked, FreeRTOS will happily tell you the scheduler //has started, but it isn't active *on this CPU* yet. esp_cache_err_int_init(); @@ -244,16 +256,6 @@ static void start_other_core(void) } #endif // !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE -static void intr_matrix_clear(void) -{ - for (int i = 0; i < ETS_MAX_INTR_SOURCE; i++) { - intr_matrix_set(0, i, ETS_INVALID_INUM); -#if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE - intr_matrix_set(1, i, ETS_INVALID_INUM); -#endif - } -} - /* * We arrive here after the bootloader finished loading the program from flash. The hardware is mostly uninitialized, * and the app CPU is in reset. We do have a stack, so we can do the initialization in C. @@ -525,6 +527,7 @@ void IRAM_ATTR call_start_cpu0(void) // and default RTC-backed system time provider. g_startup_time = esp_rtc_get_time_us(); + // Clear interrupt matrix for PRO CPU core intr_matrix_clear(); #ifndef CONFIG_IDF_ENV_FPGA // TODO: on FPGA it should be possible to configure this, not currently working with APB_CLK_FREQ changed