Skip to content

cpu/esp32: fixes for boot issues and crashes on ESP32 [backport 2023.1] #19196

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
bors merged 2 commits into from
Jan 25, 2023
Merged

cpu/esp32: fixes for boot issues and crashes on ESP32 [backport 2023.1] #19196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a9b5c
cpu/esp32: Make sure heap is initialized early enough
Flole998 Jan 24, 2023
14db253
cpu/esp_common/freertos: Handle NULL being passed to vTaskDelete
Flole998 Jan 24, 2023
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
16 changes: 8 additions & 8 deletions cpu/esp32/startup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ static NORETURN void IRAM system_startup_cpu0(void)
puf_sram_init((uint8_t *)&_sheap, SEED_RAM_LEN);
#endif

#if IS_USED(MODULE_ESP_IDF_HEAP)
/* init heap */
heap_caps_init();
if (IS_ACTIVE(ENABLE_DEBUG)) {
ets_printf("Heap free: %u byte\n", get_free_heap_size());
}
#endif

/* initialize system call tables of ESP32x rom and newlib */
syscalls_init();

Expand Down Expand Up @@ -206,14 +214,6 @@ static NORETURN void IRAM system_startup_cpu0(void)

LOG_STARTUP("PRO cpu is up (single core mode, only PRO cpu is used)\n");

#if IS_USED(MODULE_ESP_IDF_HEAP)
/* init heap */
heap_caps_init();
if (IS_ACTIVE(ENABLE_DEBUG)) {
ets_printf("Heap free: %u byte\n", get_free_heap_size());
}
#endif

/* init esp_timer implementation */
esp_timer_early_init();

Expand Down
3 changes: 3 additions & 0 deletions cpu/esp_common/freertos/task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ void vTaskDelete(TaskHandle_t xTaskToDelete)
DEBUG("%s pid=%d task=%p\n", __func__, thread_getpid(), xTaskToDelete);

uint32_t pid = (uint32_t)xTaskToDelete;
if (pid == 0) {
pid = thread_getpid();
}
assert(pid_is_valid(pid));

/* remove the task from scheduling */
Expand Down