From f83e33399f274a6a781f22727ab17cbc3505f990 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Sat, 25 Nov 2023 12:47:15 +0100 Subject: [PATCH] chore(core): optimize flash usage - tamper on U5 [no changelog] --- core/embed/trezorhal/stm32u5/tamper.c | 78 +++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 11 deletions(-) diff --git a/core/embed/trezorhal/stm32u5/tamper.c b/core/embed/trezorhal/stm32u5/tamper.c index 0ae67f9db5..68bee8da4a 100644 --- a/core/embed/trezorhal/stm32u5/tamper.c +++ b/core/embed/trezorhal/stm32u5/tamper.c @@ -28,7 +28,19 @@ #define TAMP_CR3_ITAMP7NOER_Msk (0x1UL << TAMP_CR3_ITAMP7NOER_Pos) #define TAMP_CR3_ITAMP7NOER TAMP_CR3_ITAMP7NOER_Msk -// more flash efficient function than standard HAL +/* + * This function replaces calls to universal, but flash-wasting + * functions HAL_RCC_OscConfig and HAL_RCCEx_PeriphCLKConfig. + * + * This is the configuration before the optimization: + * osc_init_def.OscillatorType = RCC_OSCILLATORTYPE_LSI; + * osc_init_def.LSIState = RCC_LSI_ON; + * HAL_RCC_OscConfig(&osc_init_def); + * + * clk_init_def.PeriphClockSelection = RCC_PERIPHCLK_RTC; + * clk_init_def.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; + * HAL_RCCEx_PeriphCLKConfig(&clk_init_def); + */ HAL_StatusTypeDef lsi_init(void) { uint32_t tickstart = 0U; @@ -97,6 +109,55 @@ HAL_StatusTypeDef lsi_init(void) { while (READ_BIT(RCC->BDCR, RCC_BDCR_LSIRDY) == 0U) ; + /* Check for RTC Parameters used to output RTCCLK */ + assert_param(IS_RCC_RTCCLKSOURCE(pPeriphClkInit->RTCClockSelection)); + /* Enable Power Clock */ + if (__HAL_RCC_PWR_IS_CLK_DISABLED()) { + __HAL_RCC_PWR_CLK_ENABLE(); + pwrclkchanged = SET; + } + /* Enable write access to Backup domain */ + SET_BIT(PWR->DBPR, PWR_DBPR_DBP); + + /* Wait for Backup domain Write protection disable */ + tickstart = HAL_GetTick(); + + while (HAL_IS_BIT_CLR(PWR->DBPR, PWR_DBPR_DBP)) { + if ((HAL_GetTick() - tickstart) > RCC_DBP_TIMEOUT_VALUE) { + return HAL_TIMEOUT; + } + } + /* Reset the Backup domain only if the RTC Clock source selection is modified + * from default */ + bdcr_temp = READ_BIT(RCC->BDCR, RCC_BDCR_RTCSEL); + + if ((bdcr_temp != RCC_RTCCLKSOURCE_NO_CLK) && + (bdcr_temp != RCC_RTCCLKSOURCE_LSI)) { + /* Store the content of BDCR register before the reset of Backup Domain */ + bdcr_temp = READ_BIT(RCC->BDCR, ~(RCC_BDCR_RTCSEL)); + /* RTC Clock selection can be changed only if the Backup Domain is reset */ + __HAL_RCC_BACKUPRESET_FORCE(); + __HAL_RCC_BACKUPRESET_RELEASE(); + /* Restore the Content of BDCR register */ + RCC->BDCR = bdcr_temp; + } + + /* Wait for LSE reactivation if LSE was enable prior to Backup Domain reset */ + if (HAL_IS_BIT_SET(bdcr_temp, RCC_BDCR_LSEON)) { + /* Get Start Tick*/ + tickstart = HAL_GetTick(); + + /* Wait till LSE is ready */ + while (READ_BIT(RCC->BDCR, RCC_BDCR_LSERDY) == 0U) { + if ((HAL_GetTick() - tickstart) > RCC_LSE_TIMEOUT_VALUE) { + return HAL_TIMEOUT; + } + } + } + + /* Apply new RTC clock source selection */ + __HAL_RCC_RTC_CONFIG(RCC_PERIPHCLK_RTC); + /* Restore clock configuration if changed */ if (pwrclkchanged == SET) { __HAL_RCC_PWR_CLK_DISABLE(); @@ -105,16 +166,9 @@ HAL_StatusTypeDef lsi_init(void) { } void tamper_init(void) { - RCC_PeriphCLKInitTypeDef clk_init_def = {0}; - // Enable LSI clock lsi_init(); - // Select RTC peripheral clock source - clk_init_def.PeriphClockSelection = RCC_PERIPHCLK_RTC; - clk_init_def.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; - HAL_RCCEx_PeriphCLKConfig(&clk_init_def); - // Enable RTC peripheral (tampers are part of it) __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -180,11 +234,13 @@ void tamper_init(void) { // Interrupt handle for all tamper events // It displays an error message void TAMP_IRQHandler(void) { - const char* reason = "UNKNOWN"; - uint32_t sr = TAMP->SR; TAMP->SCR = sr; +#ifdef BOARDLOADER + error_shutdown("INTERNAL TAMPER", ""); +#else + const char* reason = "UNKNOWN"; if (sr & TAMP_SR_TAMP1F) { reason = "INPUT1"; } else if (sr & TAMP_SR_TAMP2F) { @@ -212,6 +268,6 @@ void TAMP_IRQHandler(void) { } else if (sr & TAMP_SR_ITAMP13F) { reason = "ANALOG WDG3"; } - error_shutdown("INTERNAL TAMPER", reason); +#endif }