riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12794 from gschorcht/cpu/esp32/cpu_clk_workaround

Browse Source 
cpu/esp32: workaround for UART problems
This commit is contained in:
benpicco 2019-11-28 13:57:23 +01:00 committed by GitHub
commit 40a419baef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/esp32/periph/uart.c
View File

@ -281,6 +281,8 @@ static void _uart_config (uart_t uart)
/* setup the baudrate */ /* setup the baudrate */
if (uart == UART_DEV(0) || uart == UART_DEV(1)) { if (uart == UART_DEV(0) || uart == UART_DEV(1)) {
/* wait until TX FIFO is empty */
while (_uarts[uart].regs->status.txfifo_cnt) { }
/* for UART0 and UART1, we can us the ROM function */ /* for UART0 and UART1, we can us the ROM function */
uart_div_modify(uart, (UART_CLK_FREQ << 4) / _uarts[uart].baudrate); uart_div_modify(uart, (UART_CLK_FREQ << 4) / _uarts[uart].baudrate);
} }

22
cpu/esp32/startup.c
View File

@ -197,8 +197,8 @@ static void IRAM system_clk_init (void)
rtc_init_module(rtc_cfg); rtc_init_module(rtc_cfg);
/* configure main crystal frequency if necessary */ /* configure main crystal frequency if necessary */
if (CONFIG_ESP32_XTAL_FREQ != RTC_XTAL_FREQ_AUTO if (CONFIG_ESP32_XTAL_FREQ != RTC_XTAL_FREQ_AUTO &&
&& CONFIG_ESP32_XTAL_FREQ != rtc_clk_xtal_freq_get()) { CONFIG_ESP32_XTAL_FREQ != rtc_clk_xtal_freq_get()) {
bootloader_clock_configure(); bootloader_clock_configure();
} }
@ -208,10 +208,10 @@ static void IRAM system_clk_init (void)
/* set SLOW_CLK to internal low power clock of 150 kHz */ /* set SLOW_CLK to internal low power clock of 150 kHz */
rtc_select_slow_clk(RTC_SLOW_FREQ_RTC); rtc_select_slow_clk(RTC_SLOW_FREQ_RTC);
ets_printf("Switching system clocks can lead to some unreadable characters\n");
/* wait until UART is idle to avoid losing output */ /* wait until UART is idle to avoid losing output */
uart_tx_wait_idle(CONFIG_CONSOLE_UART_NUM); uart_tx_wait_idle(CONFIG_CONSOLE_UART_NUM);
ets_printf("Switching system clocks can lead to some unreadable characters\n");
ets_printf("This message is usually not visible at the console\n");
/* determine configured CPU clock frequency from sdk_conf.h */ /* determine configured CPU clock frequency from sdk_conf.h */
rtc_cpu_freq_t freq; rtc_cpu_freq_t freq;
@ -230,12 +230,14 @@ static void IRAM system_clk_init (void)
uint32_t freq_before = rtc_clk_cpu_freq_value(rtc_clk_cpu_freq_get()) / MHZ ; uint32_t freq_before = rtc_clk_cpu_freq_value(rtc_clk_cpu_freq_get()) / MHZ ;
/* set configured CPU frequency */ if (freq_before != CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ) {
rtc_clk_cpu_freq_set(freq); /* set configured CPU frequency */
rtc_clk_cpu_freq_set(freq);
/* Recalculate the ccount to make time calculation correct. */ /* Recalculate the ccount to make time calculation correct. */
uint32_t freq_after = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ; uint32_t freq_after = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
XTHAL_SET_CCOUNT( XTHAL_GET_CCOUNT() * freq_after / freq_before ); XTHAL_SET_CCOUNT( XTHAL_GET_CCOUNT() * freq_after / freq_before );
}
} }
extern void IRAM_ATTR thread_yield_isr(void* arg); extern void IRAM_ATTR thread_yield_isr(void* arg);
@ -340,7 +342,7 @@ static NORETURN void IRAM system_init (void)
esp_event_handler_init(); esp_event_handler_init();
/* starting RIOT */ /* starting RIOT */
ets_printf("Starting RIOT kernel on PRO cpu\n"); printf("Starting RIOT kernel on PRO cpu\n");
kernel_init(); kernel_init();
UNREACHABLE(); UNREACHABLE();
} }