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

Merge branch 'change/ecdsa_does_not_use_mpi_esp32h2_eco5_v5.3' into 'release/v5.3'

Browse Source 
The ECDSA module of ESP32-H2 ECO5 does not use the MPI module (v5.3)

See merge request espressif/esp-idf!41220
This commit is contained in:
Mahavir Jain
2025-08-19 20:10:15 +05:30
parent f6d764dafb 2bfecc9638
commit 6efa12ce3e
6 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/esp_hw_support/port/esp32h2/esp_crypto_lock.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -7,6 +7,7 @@
#include <sys/lock.h>
#include "esp_crypto_lock.h"
#include "hal/ecdsa_ll.h"
/* Lock overview:
SHA: peripheral independent, but DMA is shared with AES
@@ -96,12 +97,18 @@ void esp_crypto_ecdsa_lock_acquire(void)
{
_lock_acquire(&s_crypto_ecdsa_lock);
esp_crypto_ecc_lock_acquire();
esp_crypto_mpi_lock_acquire();
if (ecdsa_ll_is_mpi_required()) {
esp_crypto_mpi_lock_acquire();
}
}
void esp_crypto_ecdsa_lock_release(void)
{
esp_crypto_mpi_lock_release();
if (ecdsa_ll_is_mpi_required()) {
esp_crypto_mpi_lock_release();
}
esp_crypto_ecc_lock_release();
_lock_release(&s_crypto_ecdsa_lock);
}

13
components/esp_hw_support/port/esp32p4/esp_crypto_lock.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
*/
@@ -7,6 +7,7 @@
#include <sys/lock.h>
#include "esp_crypto_lock.h"
#include "hal/ecdsa_ll.h"
/* Lock overview:
SHA: peripheral independent, but DMA is shared with AES
@@ -99,12 +100,18 @@ void esp_crypto_ecdsa_lock_acquire(void)
{
_lock_acquire(&s_crypto_ecdsa_lock);
esp_crypto_ecc_lock_acquire();
esp_crypto_mpi_lock_acquire();
if (ecdsa_ll_is_mpi_required()) {
esp_crypto_mpi_lock_acquire();
}
}
void esp_crypto_ecdsa_lock_release(void)
{
esp_crypto_mpi_lock_release();
if (ecdsa_ll_is_mpi_required()) {
esp_crypto_mpi_lock_release();
}
esp_crypto_ecc_lock_release();
_lock_release(&s_crypto_ecdsa_lock);
}

8
components/hal/esp32h2/include/hal/ecdsa_ll.h
View File

@@ -418,6 +418,14 @@ static inline bool ecdsa_ll_is_deterministic_mode_supported(void)
return ESP_CHIP_REV_ABOVE(efuse_hal_chip_revision(), 102);
}
/**
* @brief Check if the ECDSA peripheral uses MPI module's memory
*/
static inline bool ecdsa_ll_is_mpi_required(void)
{
return !ESP_CHIP_REV_ABOVE(efuse_hal_chip_revision(), 102);
}
#ifdef __cplusplus
}
#endif

10
components/hal/esp32p4/include/hal/ecdsa_ll.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -432,6 +432,14 @@ static inline int ecdsa_ll_check_k_value(void)
return REG_GET_BIT(ECDSA_RESULT_REG, ECDSA_K_VALUE_WARNING);
}
/**
* @brief Check if the ECDSA peripheral uses MPI module's memory
*/
static inline bool ecdsa_ll_is_mpi_required(void)
{
return true; // TODO: IDF-13523
}
#ifdef __cplusplus
}
#endif

14
components/hal/test_apps/crypto/main/ecdsa/test_ecdsa.c
View File

@@ -43,9 +43,11 @@ static void ecdsa_enable_and_reset(void)
}
#ifdef SOC_ECDSA_USES_MPI
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(true);
mpi_ll_reset_register();
if (ecdsa_ll_is_mpi_required()) {
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(true);
mpi_ll_reset_register();
}
}
#endif
}
@@ -53,8 +55,10 @@ static void ecdsa_enable_and_reset(void)
static void ecdsa_disable(void)
{
#ifdef SOC_ECDSA_USES_MPI
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(false);
if (ecdsa_ll_is_mpi_required()) {
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(false);
}
}
#endif

14
components/mbedtls/port/ecdsa/ecdsa_alt.c
View File

@@ -68,9 +68,11 @@ static void esp_ecdsa_acquire_hardware(void)
/* We need to reset the MPI peripheral because ECDSA peripheral
* of some targets use the MPI peripheral as well.
*/
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(true);
mpi_ll_reset_register();
if (ecdsa_ll_is_mpi_required()) {
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(true);
mpi_ll_reset_register();
}
}
#endif /* SOC_ECDSA_USES_MPI */
}
@@ -87,8 +89,10 @@ static void esp_ecdsa_release_hardware(void)
}
#ifdef SOC_ECDSA_USES_MPI
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(false);
if (ecdsa_ll_is_mpi_required()) {
MPI_RCC_ATOMIC() {
mpi_ll_enable_bus_clock(false);
}
}
#endif /* SOC_ECDSA_USES_MPI */