From 113badeb5a520b7106667f46ad9efc48d75a1dfd Mon Sep 17 00:00:00 2001 From: Harshal Patil Date: Wed, 23 Sep 2026 14:49:09 +0530 Subject: [PATCH] fix(soc): set ESP32-C6 DIS_DOWNLOAD_MSPI capability ESP32-C6 has the SPI_DOWNLOAD_MSPI_DIS eFuse but lacked the capability, so flash-encryption release mode never disabled MSPI access from download mode. C6's WR_DIS.SPI_DOWNLOAD_MSPI_DIS (bit 17) is not shared with any other eFuse, so already-provisioned devices can still burn it. --- components/soc/esp32c6/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c6/include/soc/soc_caps.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in index 40a24ecd143..95f69efe628 100644 --- a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in @@ -923,6 +923,10 @@ config SOC_EFUSE_DIS_ICACHE bool default y +config SOC_EFUSE_DIS_DOWNLOAD_MSPI + bool + default y + config SOC_EFUSE_BLOCK9_KEY_PURPOSE_QUIRK bool default y diff --git a/components/soc/esp32c6/include/soc/soc_caps.h b/components/soc/esp32c6/include/soc/soc_caps.h index 16493cf85fb..85ddff4f5c7 100644 --- a/components/soc/esp32c6/include/soc/soc_caps.h +++ b/components/soc/esp32c6/include/soc/soc_caps.h @@ -383,6 +383,8 @@ #define SOC_EFUSE_DIS_DIRECT_BOOT 1 #define SOC_EFUSE_SOFT_DIS_JTAG 1 #define SOC_EFUSE_DIS_ICACHE 1 +/* Capability to disable the MSPI access in download mode */ +#define SOC_EFUSE_DIS_DOWNLOAD_MSPI 1 #define SOC_EFUSE_BLOCK9_KEY_PURPOSE_QUIRK 1 // XTS-AES key purpose not supported for this block #define SOC_EFUSE_XTS_AES_KEY_128 1