mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-08 04:02:27 +00:00
Merge branch 'master' into feature/menuconfig_cpu_frequency_option
* master: (57 commits) components/lwip: fix grammar components/lwip: make SO_REUSE configurable via menuconfig bootloader: remove trailing newlines from log messages components/freertos: override per-task __cleanup handler to close stdin, stdout, stderr components/esp32: move peripheral symbols to separate ld script components/log: regroup macros for better readability gitlab-ci: allow running tests for branches, triggered via API components/log: fix timestamp calculation components/log: set default runtime log level to ESP_LOG_VERBOSE components/log: fix error when using ESP_LOGx from C++ code components/log: fix bugs, add options to override log level for files, components, and bootloader fix ledc and spi typo remove prefix and postfix Enable SO_REUSEADDR in LWIP freertos: fix memory debug macro issue Define configENABLE_MEMORY_DEBUG according to CONFIG_ENABLE_MEMORY_DEBUG peripheral structure headers: move volatile keyword from members to typedef Adding -fstrict-volatile-bitfields to the CFLAGS/CXXFLAGS. Without this, gcc tries to access bitfields using the smallest possible methods (eg l8i to grab an 8-bit field from a 32-bit). Our hardware does not like that. This flag tells gcc that if a bitfield is volatile, it should always use the type the field is defined at (uint32_t in our case) to size its access to the field. This fixes accessing the hardware through the xxx_struct.h headers. add peripheral module struct headers build system docs: Add note about no spaces in component names Docs: Add note about unusual submodule messages when cloning on Windows ... # Conflicts: # components/esp32/cpu_start.c # components/esp32/include/soc/cpu.h
This commit is contained in:
Ivan Grokhotkov
@@ -20,9 +20,10 @@
|
||||
#include "rom/ets_sys.h"
|
||||
#include "rom/uart.h"
|
||||
|
||||
#include "soc/cpu.h"
|
||||
#include "soc/dport_reg.h"
|
||||
#include "soc/io_mux_reg.h"
|
||||
#include "soc/cpu.h"
|
||||
#include "soc/rtc_cntl_reg.h"
|
||||
|
||||
#include "freertos/FreeRTOS.h"
|
||||
#include "freertos/task.h"
|
||||
@@ -40,196 +41,132 @@
|
||||
#include "esp_event.h"
|
||||
#include "esp_spi_flash.h"
|
||||
#include "esp_ipc.h"
|
||||
#include "esp_log.h"
|
||||
|
||||
static void IRAM_ATTR user_start_cpu0(void);
|
||||
static void IRAM_ATTR call_user_start_cpu1();
|
||||
static void IRAM_ATTR user_start_cpu1(void);
|
||||
void Cache_Read_Enable();
|
||||
extern void ets_setup_syscalls(void);
|
||||
extern esp_err_t app_main(void *ctx);
|
||||
|
||||
|
||||
extern int __cpu1_entry_point;
|
||||
extern int _bss_start;
|
||||
extern int _bss_end;
|
||||
extern int _init_start;
|
||||
extern int _init_end;
|
||||
extern int _iram_romjumptable_start;
|
||||
extern int _iram_romjumptable_end;
|
||||
extern int _iram_text_start;
|
||||
extern int _iram_text_end;
|
||||
|
||||
/*
|
||||
We arrive here after the bootloader finished loading the program from flash. The hardware is mostly uninitialized,
|
||||
flash cache is down and the app CPU is in reset. We do have a stack, so we can do the initialization in C.
|
||||
*/
|
||||
|
||||
static bool app_cpu_started = false;
|
||||
|
||||
void IRAM_ATTR call_user_start_cpu0() {
|
||||
//Kill wdt
|
||||
REG_CLR_BIT(0x3ff4808c, BIT(10)); //RTCCNTL+8C RTC_WDTCONFIG0 RTC_
|
||||
REG_CLR_BIT(0x6001f048, BIT(14)); //DR_REG_BB_BASE+48
|
||||
|
||||
//Move exception vectors to IRAM
|
||||
asm volatile (\
|
||||
"wsr %0, vecbase\n" \
|
||||
::"r"(&_init_start));
|
||||
|
||||
uartAttach();
|
||||
ets_install_uart_printf();
|
||||
|
||||
//Make page 0 access raise an exception
|
||||
//Also some other unused pages so we can catch weirdness
|
||||
//ToDo: this but nicer.
|
||||
asm volatile (\
|
||||
"movi a4,0x00000000\n" \
|
||||
"movi a5,0xf\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0x80000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0xa0000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0xc0000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0xe0000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0x20000000\n" \
|
||||
"movi a5,0x0\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0x40000000\n" \
|
||||
"movi a5,0x2\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"isync\n" \
|
||||
:::"a4","a5");
|
||||
|
||||
memset(&_bss_start, 0, (&_bss_end - &_bss_start) * sizeof(_bss_start));
|
||||
|
||||
//Initialize heap allocator
|
||||
heap_alloc_caps_init();
|
||||
|
||||
ets_printf("Pro cpu up.\n");
|
||||
|
||||
#ifndef CONFIG_FREERTOS_UNICORE
|
||||
ets_printf("Starting app cpu, entry point is %p\n", call_user_start_cpu1);
|
||||
|
||||
SET_PERI_REG_MASK(DPORT_APPCPU_CTRL_B_REG, DPORT_APPCPU_CLKGATE_EN);
|
||||
CLEAR_PERI_REG_MASK(DPORT_APPCPU_CTRL_C_REG, DPORT_APPCPU_RUNSTALL);
|
||||
SET_PERI_REG_MASK(DPORT_APPCPU_CTRL_A_REG, DPORT_APPCPU_RESETTING);
|
||||
CLEAR_PERI_REG_MASK(DPORT_APPCPU_CTRL_A_REG, DPORT_APPCPU_RESETTING);
|
||||
ets_set_appcpu_boot_addr((uint32_t)call_user_start_cpu1);
|
||||
|
||||
while (!app_cpu_started) {
|
||||
ets_delay_us(100);
|
||||
}
|
||||
#else
|
||||
CLEAR_PERI_REG_MASK(DPORT_APPCPU_CTRL_B_REG, DPORT_APPCPU_CLKGATE_EN);
|
||||
#endif
|
||||
ets_printf("Pro cpu start user code\n");
|
||||
user_start_cpu0();
|
||||
}
|
||||
|
||||
|
||||
extern int _init_start;
|
||||
|
||||
void IRAM_ATTR call_user_start_cpu1() {
|
||||
asm volatile (\
|
||||
"wsr %0, vecbase\n" \
|
||||
::"r"(&_init_start));
|
||||
|
||||
//Make page 0 access raise an exception
|
||||
//Also some other unused pages so we can catch weirdness
|
||||
//ToDo: this but nicer.
|
||||
asm volatile (\
|
||||
"movi a4,0x00000000\n" \
|
||||
"movi a5,0xf\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0x80000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0xa0000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0xc0000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0xe0000000\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0x20000000\n" \
|
||||
"movi a5,0x0\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"movi a4,0x40000000\n" \
|
||||
"movi a5,0x2\n" \
|
||||
"wdtlb a5,a4\n" \
|
||||
"witlb a5,a4\n" \
|
||||
"isync\n" \
|
||||
:::"a4","a5");
|
||||
|
||||
ets_printf("App cpu up.\n");
|
||||
app_cpu_started = 1;
|
||||
user_start_cpu1();
|
||||
}
|
||||
|
||||
extern volatile int port_xSchedulerRunning[2];
|
||||
|
||||
void IRAM_ATTR user_start_cpu1(void) {
|
||||
// Wait for FreeRTOS initialization to finish on PRO CPU
|
||||
while (port_xSchedulerRunning[0] == 0) {
|
||||
;
|
||||
}
|
||||
ets_printf("Starting scheduler on APP CPU.\n");
|
||||
xPortStartScheduler();
|
||||
}
|
||||
|
||||
extern void (*__init_array_start)(void);
|
||||
extern void (*__init_array_end)(void);
|
||||
extern volatile int port_xSchedulerRunning[2];
|
||||
|
||||
static void do_global_ctors(void) {
|
||||
void (**p)(void);
|
||||
for(p = &__init_array_start; p != &__init_array_end; ++p)
|
||||
(*p)();
|
||||
static const char* TAG = "cpu_start";
|
||||
static bool app_cpu_started = false;
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
void IRAM_ATTR call_user_start_cpu0()
|
||||
{
|
||||
//Kill wdt
|
||||
REG_CLR_BIT(RTC_CNTL_WDTCONFIG0_REG, RTC_CNTL_WDT_FLASHBOOT_MOD_EN);
|
||||
REG_CLR_BIT(0x6001f048, BIT(14)); //DR_REG_BB_BASE+48
|
||||
|
||||
cpu_configure_region_protection();
|
||||
|
||||
//Move exception vectors to IRAM
|
||||
asm volatile (\
|
||||
"wsr %0, vecbase\n" \
|
||||
::"r"(&_init_start));
|
||||
|
||||
uartAttach();
|
||||
ets_install_uart_printf();
|
||||
|
||||
memset(&_bss_start, 0, (&_bss_end - &_bss_start) * sizeof(_bss_start));
|
||||
|
||||
// Initialize heap allocator
|
||||
heap_alloc_caps_init();
|
||||
|
||||
ESP_EARLY_LOGI(TAG, "Pro cpu up.");
|
||||
|
||||
#ifndef CONFIG_FREERTOS_UNICORE
|
||||
ESP_EARLY_LOGI(TAG, "Starting app cpu, entry point is %p", call_user_start_cpu1);
|
||||
|
||||
SET_PERI_REG_MASK(DPORT_APPCPU_CTRL_B_REG, DPORT_APPCPU_CLKGATE_EN);
|
||||
CLEAR_PERI_REG_MASK(DPORT_APPCPU_CTRL_C_REG, DPORT_APPCPU_RUNSTALL);
|
||||
SET_PERI_REG_MASK(DPORT_APPCPU_CTRL_A_REG, DPORT_APPCPU_RESETTING);
|
||||
CLEAR_PERI_REG_MASK(DPORT_APPCPU_CTRL_A_REG, DPORT_APPCPU_RESETTING);
|
||||
ets_set_appcpu_boot_addr((uint32_t)call_user_start_cpu1);
|
||||
|
||||
while (!app_cpu_started) {
|
||||
ets_delay_us(100);
|
||||
}
|
||||
#else
|
||||
ESP_EARLY_LOGI(TAG, "Single core mode");
|
||||
CLEAR_PERI_REG_MASK(DPORT_APPCPU_CTRL_B_REG, DPORT_APPCPU_CLKGATE_EN);
|
||||
#endif
|
||||
ESP_EARLY_LOGI(TAG, "Pro cpu start user code");
|
||||
user_start_cpu0();
|
||||
}
|
||||
|
||||
extern esp_err_t app_main(void *ctx);
|
||||
|
||||
void user_start_cpu0(void) {
|
||||
esp_set_cpu_freq(); // set CPU frequency configured in menuconfig
|
||||
uart_div_modify(0, (APB_CLK_FREQ << 4) / 115200);
|
||||
ets_setup_syscalls();
|
||||
do_global_ctors();
|
||||
esp_ipc_init();
|
||||
spi_flash_init();
|
||||
void IRAM_ATTR call_user_start_cpu1()
|
||||
{
|
||||
asm volatile (\
|
||||
"wsr %0, vecbase\n" \
|
||||
::"r"(&_init_start));
|
||||
|
||||
cpu_configure_region_protection();
|
||||
|
||||
ESP_EARLY_LOGI(TAG, "App cpu up.");
|
||||
app_cpu_started = 1;
|
||||
user_start_cpu1();
|
||||
}
|
||||
|
||||
void IRAM_ATTR user_start_cpu1(void)
|
||||
{
|
||||
// Wait for FreeRTOS initialization to finish on PRO CPU
|
||||
while (port_xSchedulerRunning[0] == 0) {
|
||||
;
|
||||
}
|
||||
ESP_LOGI(TAG, "Starting scheduler on APP CPU.");
|
||||
xPortStartScheduler();
|
||||
}
|
||||
|
||||
static void do_global_ctors(void)
|
||||
{
|
||||
void (**p)(void);
|
||||
for (p = &__init_array_start; p != &__init_array_end; ++p) {
|
||||
(*p)();
|
||||
}
|
||||
}
|
||||
|
||||
void user_start_cpu0(void)
|
||||
{
|
||||
esp_set_cpu_freq(); // set CPU frequency configured in menuconfig
|
||||
uart_div_modify(0, (APB_CLK_FREQ << 4) / 115200);
|
||||
ets_setup_syscalls();
|
||||
do_global_ctors();
|
||||
esp_ipc_init();
|
||||
spi_flash_init();
|
||||
|
||||
#if CONFIG_WIFI_ENABLED
|
||||
esp_err_t ret = nvs_flash_init(5, 3);
|
||||
if (ret != ESP_OK) {
|
||||
printf("nvs_flash_init failed, ret=%d\n", ret);
|
||||
ESP_LOGE(TAG, "nvs_flash_init failed, ret=%d", ret);
|
||||
}
|
||||
|
||||
system_init();
|
||||
|
||||
esp_event_init(NULL, NULL);
|
||||
|
||||
tcpip_adapter_init();
|
||||
#endif
|
||||
|
||||
#if CONFIG_WIFI_ENABLED && CONFIG_WIFI_AUTO_STARTUP
|
||||
#include "esp_wifi.h"
|
||||
esp_wifi_startup(app_main, NULL);
|
||||
esp_wifi_startup(app_main, NULL);
|
||||
#else
|
||||
app_main(NULL);
|
||||
app_main(NULL);
|
||||
#endif
|
||||
|
||||
ets_printf("Starting scheduler on PRO CPU.\n");
|
||||
vTaskStartScheduler();
|
||||
ESP_LOGI(TAG, "Starting scheduler on PRO CPU.");
|
||||
vTaskStartScheduler();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user