2021-11-23 20:11:33 +08:00
|
|
|
/*
|
fix(esp_system): reset crypto peripherals before device restart
This change addresses a rare but critical issue observed on certain
ESP32-C3 and ESP32-S3 devices, where secure boot verification
intermittently fails due to improper cleanup of crypto peripherals
during a restart.
Background – Restart Behavior in IDF
------------------------------------
In ESP-IDF, when the device restarts (via `esp_restart()` or due to a
panic/exception), a partial peripheral reset is performed followed by a
CPU reset. However, until now, crypto-related peripherals were not
included in this selective reset sequence.
Problem Scenario
----------------
If a restart occurs while the application is in the middle of a bignum
operation (i.e., using the MPI/Bignum peripheral), the ROM code may
encounter an inconsistent peripheral state during the subsequent boot.
This leads to transient RSA-PSS secure boot verification failures.
Following such a failure, the ROM typically triggers a full-chip reset
via the watchdog timer (WDT). This full reset clears the crypto
peripheral state, allowing secure boot verification to succeed on the
next boot.
Risk with Aggressive Revocation
-------------------------------
If secure boot aggressive revocation is enabled (disabled by default in
IDF), this transient verification failure could mistakenly lead to
revocation of the secure boot digest.
If your product configuration has aggressive revocation enabled,
applying this fix is strongly recommended.
Frequency of Occurrence
-----------------------
The issue is rare and only occurs in corner cases involving
simultaneous use of the MPI peripheral and an immediate CPU reset.
Fix
---
This fix ensures that all crypto peripherals are explicitly reset prior
to any software-triggered restart (including panic scenarios),
guaranteeing a clean peripheral state for the next boot and preventing
incorrect secure boot behavior.
2025-04-14 15:13:40 +05:30
|
|
|
* SPDX-FileCopyrightText: 2018-2025 Espressif Systems (Shanghai) CO LTD
|
2021-11-23 20:11:33 +08:00
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
|
|
*/
|
2020-12-01 20:03:10 +08:00
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include "sdkconfig.h"
|
|
|
|
#include "esp_system.h"
|
|
|
|
#include "esp_private/system_internal.h"
|
|
|
|
#include "esp_attr.h"
|
2021-01-19 19:55:14 +08:00
|
|
|
#include "esp_efuse.h"
|
2020-12-01 20:03:10 +08:00
|
|
|
#include "esp_log.h"
|
2022-07-26 22:07:58 +08:00
|
|
|
#include "riscv/rv_utils.h"
|
2020-12-01 20:03:10 +08:00
|
|
|
#include "esp_rom_uart.h"
|
|
|
|
#include "soc/gpio_reg.h"
|
|
|
|
#include "soc/rtc_cntl_reg.h"
|
|
|
|
#include "soc/timer_group_reg.h"
|
2021-12-14 10:08:15 +05:30
|
|
|
#include "esp_cpu.h"
|
2020-12-01 20:03:10 +08:00
|
|
|
#include "soc/rtc.h"
|
2021-03-11 09:48:30 +08:00
|
|
|
#include "soc/rtc_periph.h"
|
2020-12-01 20:03:10 +08:00
|
|
|
#include "soc/syscon_reg.h"
|
|
|
|
#include "soc/system_reg.h"
|
2021-03-16 00:50:31 +08:00
|
|
|
#include "soc/uart_reg.h"
|
2020-12-01 20:03:10 +08:00
|
|
|
#include "hal/wdt_hal.h"
|
2021-11-23 20:11:33 +08:00
|
|
|
#include "esp_private/cache_err_int.h"
|
2021-03-11 09:48:30 +08:00
|
|
|
|
|
|
|
#include "esp32c3/rom/cache.h"
|
|
|
|
#include "esp32c3/rom/rtc.h"
|
2020-12-01 20:03:10 +08:00
|
|
|
|
2023-05-05 11:19:37 +08:00
|
|
|
void IRAM_ATTR esp_system_reset_modules_on_exit(void)
|
|
|
|
{
|
|
|
|
// Flush any data left in UART FIFOs before reset the UART peripheral
|
|
|
|
esp_rom_uart_tx_wait_idle(0);
|
|
|
|
esp_rom_uart_tx_wait_idle(1);
|
|
|
|
|
|
|
|
// Reset wifi/bluetooth/ethernet/sdio (bb/mac)
|
|
|
|
SET_PERI_REG_MASK(SYSTEM_CORE_RST_EN_REG,
|
|
|
|
SYSTEM_WIFIBB_RST | SYSTEM_FE_RST | SYSTEM_WIFIMAC_RST | SYSTEM_SDIO_RST |
|
|
|
|
SYSTEM_EMAC_RST | SYSTEM_MACPWR_RST | SYSTEM_BTBB_RST | SYSTEM_BTBB_REG_RST |
|
|
|
|
SYSTEM_RW_BTMAC_RST | SYSTEM_RW_BTLP_RST | SYSTEM_RW_BTMAC_REG_RST | SYSTEM_RW_BTLP_REG_RST);
|
|
|
|
REG_WRITE(SYSTEM_CORE_RST_EN_REG, 0);
|
|
|
|
|
|
|
|
// Reset uart0 core first, then reset apb side.
|
|
|
|
// rom will clear this bit, as well as SYSTEM_UART_RST
|
|
|
|
SET_PERI_REG_MASK(UART_CLK_CONF_REG(0), UART_RST_CORE_M);
|
|
|
|
|
|
|
|
// Reset timer/spi/uart
|
|
|
|
SET_PERI_REG_MASK(SYSTEM_PERIP_RST_EN0_REG,
|
|
|
|
SYSTEM_TIMERS_RST | SYSTEM_SPI01_RST | SYSTEM_UART_RST | SYSTEM_SYSTIMER_RST);
|
|
|
|
REG_WRITE(SYSTEM_PERIP_RST_EN0_REG, 0);
|
fix(esp_system): reset crypto peripherals before device restart
This change addresses a rare but critical issue observed on certain
ESP32-C3 and ESP32-S3 devices, where secure boot verification
intermittently fails due to improper cleanup of crypto peripherals
during a restart.
Background – Restart Behavior in IDF
------------------------------------
In ESP-IDF, when the device restarts (via `esp_restart()` or due to a
panic/exception), a partial peripheral reset is performed followed by a
CPU reset. However, until now, crypto-related peripherals were not
included in this selective reset sequence.
Problem Scenario
----------------
If a restart occurs while the application is in the middle of a bignum
operation (i.e., using the MPI/Bignum peripheral), the ROM code may
encounter an inconsistent peripheral state during the subsequent boot.
This leads to transient RSA-PSS secure boot verification failures.
Following such a failure, the ROM typically triggers a full-chip reset
via the watchdog timer (WDT). This full reset clears the crypto
peripheral state, allowing secure boot verification to succeed on the
next boot.
Risk with Aggressive Revocation
-------------------------------
If secure boot aggressive revocation is enabled (disabled by default in
IDF), this transient verification failure could mistakenly lead to
revocation of the secure boot digest.
If your product configuration has aggressive revocation enabled,
applying this fix is strongly recommended.
Frequency of Occurrence
-----------------------
The issue is rare and only occurs in corner cases involving
simultaneous use of the MPI peripheral and an immediate CPU reset.
Fix
---
This fix ensures that all crypto peripherals are explicitly reset prior
to any software-triggered restart (including panic scenarios),
guaranteeing a clean peripheral state for the next boot and preventing
incorrect secure boot behavior.
2025-04-14 15:13:40 +05:30
|
|
|
|
|
|
|
// Reset dma and crypto peripherals. This ensures a clean state for the crypto peripherals after a CPU restart
|
|
|
|
// and hence avoiding any possibility with crypto failure in ROM security workflows.
|
|
|
|
SET_PERI_REG_MASK(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_DMA_RST | SYSTEM_CRYPTO_AES_RST | SYSTEM_CRYPTO_DS_RST |
|
|
|
|
SYSTEM_CRYPTO_HMAC_RST | SYSTEM_CRYPTO_RSA_RST | SYSTEM_CRYPTO_SHA_RST);
|
2023-05-05 11:19:37 +08:00
|
|
|
REG_WRITE(SYSTEM_PERIP_RST_EN1_REG, 0);
|
|
|
|
}
|
|
|
|
|
2020-12-01 20:03:10 +08:00
|
|
|
/* "inner" restart function for after RTOS, interrupts & anything else on this
|
|
|
|
* core are already stopped. Stalls other core, resets hardware,
|
|
|
|
* triggers restart.
|
|
|
|
*/
|
|
|
|
void IRAM_ATTR esp_restart_noos(void)
|
|
|
|
{
|
|
|
|
// Disable interrupts
|
2022-07-26 22:07:58 +08:00
|
|
|
rv_utils_intr_global_disable();
|
2020-12-01 20:03:10 +08:00
|
|
|
// Enable RTC watchdog for 1 second
|
|
|
|
wdt_hal_context_t rtc_wdt_ctx;
|
|
|
|
wdt_hal_init(&rtc_wdt_ctx, WDT_RWDT, 0, false);
|
|
|
|
uint32_t stage_timeout_ticks = (uint32_t)(1000ULL * rtc_clk_slow_freq_get_hz() / 1000ULL);
|
|
|
|
wdt_hal_write_protect_disable(&rtc_wdt_ctx);
|
|
|
|
wdt_hal_config_stage(&rtc_wdt_ctx, WDT_STAGE0, stage_timeout_ticks, WDT_STAGE_ACTION_RESET_SYSTEM);
|
|
|
|
wdt_hal_config_stage(&rtc_wdt_ctx, WDT_STAGE1, stage_timeout_ticks, WDT_STAGE_ACTION_RESET_RTC);
|
|
|
|
//Enable flash boot mode so that flash booting after restart is protected by the RTC WDT.
|
|
|
|
wdt_hal_set_flashboot_en(&rtc_wdt_ctx, true);
|
|
|
|
wdt_hal_write_protect_enable(&rtc_wdt_ctx);
|
|
|
|
|
|
|
|
// Reset and stall the other CPU.
|
|
|
|
// CPU must be reset before stalling, in case it was running a s32c1i
|
|
|
|
// instruction. This would cause memory pool to be locked by arbiter
|
|
|
|
// to the stalled CPU, preventing current CPU from accessing this pool.
|
2022-07-21 19:24:42 +08:00
|
|
|
const uint32_t core_id = esp_cpu_get_core_id();
|
2020-12-01 20:03:10 +08:00
|
|
|
#if !CONFIG_FREERTOS_UNICORE
|
|
|
|
const uint32_t other_core_id = (core_id == 0) ? 1 : 0;
|
|
|
|
esp_cpu_reset(other_core_id);
|
|
|
|
esp_cpu_stall(other_core_id);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Disable TG0/TG1 watchdogs
|
|
|
|
wdt_hal_context_t wdt0_context = {.inst = WDT_MWDT0, .mwdt_dev = &TIMERG0};
|
|
|
|
wdt_hal_write_protect_disable(&wdt0_context);
|
|
|
|
wdt_hal_disable(&wdt0_context);
|
|
|
|
wdt_hal_write_protect_enable(&wdt0_context);
|
|
|
|
|
|
|
|
wdt_hal_context_t wdt1_context = {.inst = WDT_MWDT1, .mwdt_dev = &TIMERG1};
|
|
|
|
wdt_hal_write_protect_disable(&wdt1_context);
|
|
|
|
wdt_hal_disable(&wdt1_context);
|
|
|
|
wdt_hal_write_protect_enable(&wdt1_context);
|
|
|
|
|
|
|
|
// Disable cache
|
|
|
|
Cache_Disable_ICache();
|
|
|
|
|
|
|
|
// 2nd stage bootloader reconfigures SPI flash signals.
|
|
|
|
// Reset them to the defaults expected by ROM.
|
|
|
|
WRITE_PERI_REG(GPIO_FUNC0_IN_SEL_CFG_REG, 0x30);
|
|
|
|
WRITE_PERI_REG(GPIO_FUNC1_IN_SEL_CFG_REG, 0x30);
|
|
|
|
WRITE_PERI_REG(GPIO_FUNC2_IN_SEL_CFG_REG, 0x30);
|
|
|
|
WRITE_PERI_REG(GPIO_FUNC3_IN_SEL_CFG_REG, 0x30);
|
|
|
|
WRITE_PERI_REG(GPIO_FUNC4_IN_SEL_CFG_REG, 0x30);
|
|
|
|
WRITE_PERI_REG(GPIO_FUNC5_IN_SEL_CFG_REG, 0x30);
|
|
|
|
|
2023-05-05 11:19:37 +08:00
|
|
|
esp_system_reset_modules_on_exit();
|
2020-12-23 12:29:57 +08:00
|
|
|
|
2020-12-01 20:03:10 +08:00
|
|
|
// Set CPU back to XTAL source, no PLL, same as hard reset
|
|
|
|
#if !CONFIG_IDF_ENV_FPGA
|
|
|
|
rtc_clk_cpu_freq_set_xtal();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !CONFIG_FREERTOS_UNICORE
|
|
|
|
// Clear entry point for APP CPU
|
|
|
|
REG_WRITE(SYSTEM_CORE_1_CONTROL_1_REG, 0);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Reset CPUs
|
|
|
|
if (core_id == 0) {
|
|
|
|
// Running on PRO CPU: APP CPU is stalled. Can reset both CPUs.
|
|
|
|
#if !CONFIG_FREERTOS_UNICORE
|
|
|
|
esp_cpu_reset(1);
|
|
|
|
#endif
|
|
|
|
esp_cpu_reset(0);
|
|
|
|
}
|
|
|
|
#if !CONFIG_FREERTOS_UNICORE
|
|
|
|
else {
|
|
|
|
// Running on APP CPU: need to reset PRO CPU and unstall it,
|
|
|
|
// then reset APP CPU
|
|
|
|
esp_cpu_reset(0);
|
|
|
|
esp_cpu_unstall(0);
|
|
|
|
esp_cpu_reset(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
while (true) {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
}
|