alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/esp32_hw_mpi_data_corruption' into 'master'

Browse Source 
esp32/mpi: Added alternate workaround for MPI data corruption issue

Closes IDFGH-8991

See merge request espressif/esp-idf!22139
This commit is contained in:
Mahavir Jain 2023-02-22 16:33:51 +08:00
commit b6588eb99c
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/idf_test/include/esp32/idf_performance_target.h
View File

@ -22,11 +22,11 @@
#define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB 4500
#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 19000
#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 420000
#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 450000
#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 33000
#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 950000
#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP 90000
#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 1700000
#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 1900000
#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING 15
#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA 15

21
components/mbedtls/port/esp32/bignum.c
View File

@ -69,22 +69,22 @@ void esp_mpi_interrupt_clear( void )
*/
/* Please see detailed note inside the function body below.
* Relevant: https://github.com/espressif/esp-idf/issues/8710 and IDF-6029
* Relevant: IDF-6029
https://github.com/espressif/esp-idf/issues/8710
https://github.com/espressif/esp-idf/issues/10403
*/
static inline void __attribute__((optimize("-fno-tree-loop-distribute-patterns")))
mpi_to_mem_block(uint32_t mem_base, const mbedtls_mpi *mpi, size_t hw_words)
static inline void mpi_to_mem_block(uint32_t mem_base, const mbedtls_mpi *mpi, size_t hw_words)
{
uint32_t *pbase = (uint32_t *)mem_base;
uint32_t copy_words = MIN(hw_words, mpi->MBEDTLS_PRIVATE(n));
/* Copy MPI data to memory block registers */
for (uint32_t i = 0; i < copy_words; i++) {
pbase[i] = mpi->MBEDTLS_PRIVATE(p[i]);
DPORT_REG_WRITE(mem_base + i * 4, mpi->MBEDTLS_PRIVATE(p[i]));
}
/* Zero any remaining memory block data */
for (uint32_t i = copy_words; i < hw_words; i++) {
pbase[i] = 0;
DPORT_REG_WRITE(mem_base + i * 4, 0);
}
#if _INTERNAL_DEBUG_PURPOSE
@ -94,14 +94,9 @@ static inline void __attribute__((optimize("-fno-tree-loop-distribute-patterns")
* specific write (store) operation to the MPI peripheral block was getting lost erroneously.
* Following data re-verify loop could catch it during runtime.
*
* As a workaround, we are disabling loop distribute patterns for this function and hence
* compiler does not enforce usage of `memset` (or `memcpy`) calls for this routine. It
* appears that `-ftree-loop-distribute-patterns` was enabled with O2/Os starting from
* GCC-10.x. It is quite possible that there is some issue with DPORT write with sequence of
* store instructions as generated by `memset` call, but for now this should serve as good
* interim workaround without any impact on the performance.
* As a workaround, we are using DPORT_WRITE_REG (volatile writes) wrappers to write to
* the MPI peripheral.
*
* Please see IDF-6029 for more details.
*/
//for (uint32_t i = copy_words; i < hw_words; i++) { assert(pbase[i] == 0); }

29
components/mbedtls/test_apps/pytest_mbedtls_ut.py
View File

@ -8,9 +8,20 @@ from pytest_embedded import Dut
@pytest.mark.supported_targets
@pytest.mark.generic
def test_mbedtls(dut: Dut) -> None:
dut.expect_exact('Press ENTER to see the list of tests')
dut.write('*')
dut.expect_unity_test_output(timeout=120)
dut.run_all_single_board_cases()
@pytest.mark.esp32
@pytest.mark.generic
@pytest.mark.parametrize(
'config',
[
'perf_esp32',
],
indirect=True,
)
def test_mbedtls_esp32_compiler_perf_opt(dut: Dut) -> None:
dut.run_all_single_board_cases()
@pytest.mark.esp32
@ -26,9 +37,7 @@ def test_mbedtls(dut: Dut) -> None:
indirect=True,
)
def test_mbedtls_aes_no_hw(dut: Dut) -> None:
dut.expect_exact('Press ENTER to see the list of tests')
dut.write('*')
dut.expect_unity_test_output(timeout=120)
dut.run_all_single_board_cases()
@pytest.mark.esp32
@ -43,9 +52,7 @@ def test_mbedtls_aes_no_hw(dut: Dut) -> None:
indirect=True,
)
def test_mbedtls_psram(dut: Dut) -> None:
dut.expect_exact('Press ENTER to see the list of tests')
dut.write('*')
dut.expect_unity_test_output(timeout=120)
dut.run_all_single_board_cases()
@pytest.mark.esp32
@ -59,6 +66,4 @@ def test_mbedtls_psram(dut: Dut) -> None:
indirect=True,
)
def test_mbedtls_psram_esp32(dut: Dut) -> None:
dut.expect_exact('Press ENTER to see the list of tests')
dut.write('*')
dut.expect_unity_test_output(timeout=120)
dut.run_all_single_board_cases()

1
components/mbedtls/test_apps/sdkconfig.ci.perf_esp32 Normal file
View File

@ -0,0 +1 @@
CONFIG_COMPILER_OPTIMIZATION_PERF=y