espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-02 18:10:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/esp_efuse_enable_rom_secure_download_mode' into 'master'

Browse Source 
fix(efuse): Fix enabling ROM secure download mode

See merge request espressif/esp-idf!41541
This commit is contained in:
Konstantin Kondrashov
2025-10-01 01:38:16 +08:00
parent b9cf9ea31f be280d3431
commit a249714f3b
13 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/efuse/esp32c2/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -46,8 +46,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32c3/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -46,8 +46,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32c5/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -48,8 +48,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32c6/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -46,8 +46,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32c61/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -48,8 +48,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32h2/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -46,8 +46,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

6
components/efuse/esp32h21/esp_efuse_fields.c
View File

@@ -46,8 +46,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

6
components/efuse/esp32h4/esp_efuse_fields.c
View File

@@ -48,8 +48,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32p4/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -47,8 +47,8 @@ esp_err_t esp_efuse_disable_rom_download_mode(void)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32s2/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -45,8 +45,8 @@ esp_err_t esp_efuse_set_rom_log_scheme(esp_efuse_rom_log_scheme_t log_scheme)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

8
components/efuse/esp32s3/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -45,8 +45,8 @@ esp_err_t esp_efuse_set_rom_log_scheme(esp_efuse_rom_log_scheme_t log_scheme)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }

7
components/efuse/include/esp_efuse.h
View File

@@ -367,11 +367,12 @@ esp_err_t esp_efuse_set_rom_log_scheme(esp_efuse_rom_log_scheme_t log_scheme);
* *
* @note If Secure Download mode is already enabled, this function does nothing and returns success. * @note If Secure Download mode is already enabled, this function does nothing and returns success.
* *
* @note Disabling the ROM Download Mode also disables Secure Download Mode. * @note If UART DL mode is completely disabled then Secure Download mode can not be enabled
* and this API simply returns success.
* *
* @return * @return
* - ESP_OK If the eFuse was successfully burned, or had already been burned. * - ESP_OK If the eFuse was successfully burned, or had already been burned, or UART DL mode is already disabled.
* - ESP_ERR_INVALID_STATE ROM Download Mode has been disabled via eFuse, so Secure Download mode is unavailable. * - Other errors If an error occurred while burning ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD.
*/ */
esp_err_t esp_efuse_enable_rom_secure_download_mode(void); esp_err_t esp_efuse_enable_rom_secure_download_mode(void);
#endif #endif

8
components/efuse/linux/esp_efuse_fields.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -45,8 +45,8 @@ esp_err_t esp_efuse_set_rom_log_scheme(esp_efuse_rom_log_scheme_t log_scheme)
esp_err_t esp_efuse_enable_rom_secure_download_mode(void) esp_err_t esp_efuse_enable_rom_secure_download_mode(void)
{ {
if (esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) { if (!esp_efuse_read_field_bit(ESP_EFUSE_DIS_DOWNLOAD_MODE)) {
return ESP_ERR_INVALID_STATE;
}
return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD); return esp_efuse_write_field_bit(ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD);
}
return ESP_OK;
} }