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 'bugfix/esp32_hardware_mpi_fix_v5.0' into 'release/v5.0'

Browse Source 
esp32: mpi: add workaround for data corruption issue observed with IDF 5.x toolchain (v5.0)

See merge request espressif/esp-idf!20819
This commit is contained in:
Mahavir Jain 2022-10-27 20:43:11 +08:00
commit 108274f6c0
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,12 @@ void esp_mpi_interrupt_clear( void )
these additional words will be zeroed in the memory buffer.
*/
static inline void mpi_to_mem_block(uint32_t mem_base, const mbedtls_mpi *mpi, size_t hw_words)
/* Please see detailed note inside the function body below.
* Relevant: https://github.com/espressif/esp-idf/issues/8710 and IDF-6029
*/
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)
{
uint32_t *pbase = (uint32_t *)mem_base;
uint32_t copy_words = MIN(hw_words, mpi->MBEDTLS_PRIVATE(n));
@ -81,6 +86,26 @@ static inline void mpi_to_mem_block(uint32_t mem_base, const mbedtls_mpi *mpi, s
for (uint32_t i = copy_words; i < hw_words; i++) {
pbase[i] = 0;
}
#if _INTERNAL_DEBUG_PURPOSE
/*
* With Xtensa GCC 11.2.0 (from ESP-IDF v5.x), it was observed that above zero initialization
* loop gets optimized to `memset` call from the ROM library. This was causing an issue that
* 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.
*
* Please see IDF-6029 for more details.
*/
//for (uint32_t i = copy_words; i < hw_words; i++) { assert(pbase[i] == 0); }
#endif
}
/* Read mbedTLS MPI bignum back from hardware memory block.

7
components/mbedtls/port/esp_bignum.c
View File

@ -642,6 +642,13 @@ static int mpi_mult_mpi_failover_mod_mult( mbedtls_mpi *Z, const mbedtls_mpi *X,
esp_mpi_read_result_hw_op(Z, hw_words);
Z->MBEDTLS_PRIVATE(s) = X->MBEDTLS_PRIVATE(s) * Y->MBEDTLS_PRIVATE(s);
/*
* If this condition fails then most likely hardware peripheral
* has produced an incorrect result for MPI operation. This can
* happen if data fed to the peripheral register was incorrect.
* Relevant: https://github.com/espressif/esp-idf/issues/8710#issuecomment-1249178698
*/
assert(mpi_words(Z) == z_words);
cleanup:
esp_mpi_disable_hardware_hw_op();
return ret;