michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: esp32: fix smp_log usage

Browse source 
smp_log usage should be only used when SMP is enabled.
This is currently causing build issues after the fix
provided by #82377

Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>
This commit is contained in:
Sylvio Alves 2024-12-05 11:44:42 -03:00 • committed by Fabio Baltieri
commit fc7cacc983
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
soc/espressif/esp32/esp32-mp.c
View file

@ -43,7 +43,7 @@ volatile struct cpustart_rec *start_rec;
static void *appcpu_top; static void *appcpu_top;
static bool cpus_active[CONFIG_MP_MAX_NUM_CPUS]; static bool cpus_active[CONFIG_MP_MAX_NUM_CPUS];
static struct k_spinlock loglock; static struct k_spinlock loglock;
#endif
/* Note that the logging done here is ACTUALLY REQUIRED FOR RELIABLE /* Note that the logging done here is ACTUALLY REQUIRED FOR RELIABLE
* OPERATION! At least one particular board will experience spurious * OPERATION! At least one particular board will experience spurious
@ -62,7 +62,6 @@ static struct k_spinlock loglock;
*/ */
void smp_log(const char *msg) void smp_log(const char *msg)
{ {
#ifndef CONFIG_SOC_ESP32_PROCPU
k_spinlock_key_t key = k_spin_lock(&loglock); k_spinlock_key_t key = k_spin_lock(&loglock);
while (*msg) { while (*msg) {
@ -72,10 +71,8 @@ void smp_log(const char *msg)
esp_rom_uart_tx_one_char('\n'); esp_rom_uart_tx_one_char('\n');
k_spin_unlock(&loglock, key); k_spin_unlock(&loglock, key);
#endif
} }
#ifdef CONFIG_SMP
static void appcpu_entry2(void) static void appcpu_entry2(void)
{ {
volatile int ps, ie; volatile int ps, ie;
@ -177,7 +174,7 @@ static void appcpu_entry1(void)
*/ */
void esp_appcpu_start(void *entry_point) void esp_appcpu_start(void *entry_point)
{ {
smp_log("ESP32: starting APPCPU"); ets_printf("ESP32: starting APPCPU");
/* These two calls are wrapped in a "stall_other_cpu" API in /* These two calls are wrapped in a "stall_other_cpu" API in
* esp-idf. But in this context the appcpu is stalled by * esp-idf. But in this context the appcpu is stalled by
@ -223,7 +220,7 @@ void esp_appcpu_start(void *entry_point)
*/ */
esp_rom_ets_set_appcpu_boot_addr((void *)entry_point); esp_rom_ets_set_appcpu_boot_addr((void *)entry_point);
smp_log("ESP32: APPCPU start sequence complete"); ets_printf("ESP32: APPCPU start sequence complete");
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP