Skip to content

Cherry-pick fixes for stm32h5 #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+22 −4
Open

Cherry-pick fixes for stm32h5 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
633f39c
platform: stm: fix bl2 without hardware accelerator
stgloorious Aug 22, 2025
7cccb6e
platform: stm: fix parentheses for readability
stgloorious Sep 30, 2025
90dcea3
platform: stm: only use plat_data_ptr with isolation level 2
stgloorious Sep 30, 2025
30e5312
platform: stm: remove gtzc_periph_att when unused
stgloorious Sep 30, 2025
7d5a09c
bl2: add psa_util.c to list of crypto source files
stgloorious Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bl2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,15 @@ list(APPEND BL2_CRYPTO_SRC
$<${build_sha_256}:${MBEDCRYPTO_PATH}/library/sha256.c>
$<${build_sha_384}:${MBEDCRYPTO_PATH}/library/sha512.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/psa_crypto_ecp.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/psa_util.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/ecp.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/ecp_curves.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/ecdsa.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/bignum.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/bignum_core.c>
$<$<AND:${is_ec_signature},$<NOT:${build_p256m}>>:${MBEDCRYPTO_PATH}/library/constant_time.c>
$<${is_rsa_signature}:${MBEDCRYPTO_PATH}/library/psa_crypto_rsa.c>
$<${is_rsa_signature}:${MBEDCRYPTO_PATH}/library/psa_util.c>
$<${is_rsa_signature}:${MBEDCRYPTO_PATH}/library/rsa.c>
$<${is_rsa_signature}:${MBEDCRYPTO_PATH}/library/rsa_alt_helpers.c>
$<${is_rsa_signature}:${MBEDCRYPTO_PATH}/library/bignum.c>
Expand Down
5 changes: 4 additions & 1 deletion platform/ext/target/stm/common/stm32h5xx/bl2/boot_hal_bl2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,9 @@ void boot_platform_start_next_image(struct boot_arm_vector_table *vector)
#ifdef BL2_DATA
TFM_BL2_CopySharedData();
#endif
#ifdef CRYPTO_HW_ACCELERATOR
(void)crypto_hw_accelerator_finish();

#endif

RNG_DeInit();

Expand Down Expand Up @@ -596,10 +597,12 @@ int32_t boot_platform_init(void)
BOOT_LOG_ERR("Error while initializing RNG Ip");
Error_Handler();
}
#ifdef CRYPTO_HW_ACCELERATOR
if (crypto_hw_accelerator_init()){
BOOT_LOG_ERR("Error while initializing HW accelerator Ip");
Error_Handler();
}
#endif
/* Start HW randomization */
fih_delay_init();
/* Apply Run time Protection */
Expand Down
12 changes: 11 additions & 1 deletion platform/ext/target/stm/common/stm32h5xx/secure/target_cfg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,17 @@ static void gtzc_internal_flash_priv(uint32_t offset_start, uint32_t offset_end)

void gtzc_init_cfg(void)
{
#if (defined (MBEDTLS_SHA256_C) && defined (MBEDTLS_SHA256_ALT)) \
|| (defined (MBEDTLS_SHA1_C) && defined (MBEDTLS_SHA1_ALT)) \
|| (defined (MBEDTLS_MD5_C) && defined (MBEDTLS_MD5_ALT)) \
|| (defined (MBEDTLS_ECP_C) && defined (MBEDTLS_ECP_ALT)) \
|| (defined (MBEDTLS_ECDSA_C) && (defined (MBEDTLS_ECDSA_SIGN_ALT) || defined (MBEDTLS_ECDSA_VERIFY_ALT))) \
|| (defined (MBEDTLS_AES_C) && defined (MBEDTLS_AES_ALT)) \
|| (defined (MBEDTLS_GCM_C) && defined (MBEDTLS_GCM_ALT)) \
|| (defined (MBEDTLS_CCM_C) && defined (MBEDTLS_CCM_ALT)) \
|| defined (HW_CRYPTO_DPA_AES) || defined (HW_CRYPTO_DPA_GCM)
uint32_t gtzc_periph_att;
#endif

if (uFlowStage == FLOW_STAGE_CFG)
{
Expand All @@ -487,7 +497,7 @@ void gtzc_init_cfg(void)
FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC_VTOR_LCK, FLOW_CTRL_GTZC_VTOR_LCK);

/* Check PRIS Is enabled */
if(SCB->AIRCR & SCB_AIRCR_PRIS_Msk == 0)
if((SCB->AIRCR & SCB_AIRCR_PRIS_Msk) == 0)
Error_Handler();
FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC_PRIS_EN, FLOW_CTRL_GTZC_PRIS_EN);

Expand Down
2 changes: 1 addition & 1 deletion platform/ext/target/stm/common/stm32h5xx/secure/tfm_hal_isolation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ FIH_RET_TYPE(enum tfm_hal_status_t) tfm_hal_bind_boundary(
bool ns_agent;
uint32_t partition_attrs = 0;
const struct asset_desc_t *p_asset;
struct platform_data_t *plat_data_ptr;
#if TFM_ISOLATION_LEVEL == 2
struct platform_data_t *plat_data_ptr;
struct mpu_armv8m_region_cfg_t localcfg;
#endif

Expand Down
5 changes: 4 additions & 1 deletion platform/ext/target/stm/common/stm32u5xx/bl2/boot_hal_bl2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,9 @@ void boot_platform_start_next_image(struct boot_arm_vector_table *vector)
#ifdef BL2_DATA
TFM_BL2_CopySharedData();
#endif
#ifdef CRYPTO_HW_ACCELERATOR
(void)crypto_hw_accelerator_finish();

#endif

RNG_DeInit();

Expand Down Expand Up @@ -612,10 +613,12 @@ int32_t boot_platform_init(void)
BOOT_LOG_ERR("Error while initializing RNG Ip");
Error_Handler();
}
#ifdef CRYPTO_HW_ACCELERATOR
if (crypto_hw_accelerator_init()){
BOOT_LOG_ERR("Error while initializing HW accelerator Ip");
Error_Handler();
}
#endif
/* Start HW randomization */
fih_delay_init();
/* Apply Run time Protection */
Expand Down