Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 23:04:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "feat(stm32mp1): save boot auth status and partition info" into integration

Browse source
This commit is contained in:
Manish Pandey 2022-06-28 10:53:01 +02:00 • committed by TrustedFirmware Code Review
commit caca0e57b8
3 changed files with 24 additions and 3 deletions

3
plat/st/common/include/stm32mp_common.h
View file

@ -127,6 +127,9 @@ int stm32mp_unmap_ddr(void);
void stm32_save_boot_interface(uint32_t interface, uint32_t instance);
void stm32_get_boot_interface(uint32_t *interface, uint32_t *instance);
/* Functions to save and get boot authentication status and partition used */
void stm32_save_boot_auth(uint32_t auth_status, uint32_t boot_partition);
#if !STM32MP_USE_STM32IMAGE && PSA_FWU_SUPPORT
void stm32mp1_fwu_set_boot_idx(void);
uint32_t stm32_get_and_dec_fwu_trial_boot_cnt(void);

2
plat/st/stm32mp1/bl2_plat_setup.c
View file

@ -316,6 +316,8 @@ void bl2_el3_plat_arch_setup(void)
stm32_save_boot_interface(boot_context->boot_interface_selected,
boot_context->boot_interface_instance);
stm32_save_boot_auth(boot_context->auth_status,
boot_context->boot_partition_used_toboot);
#if STM32MP_USB_PROGRAMMER && STM32MP15
/* Deconfigure all UART RX pins configured by ROM code */

22
plat/st/stm32mp1/stm32mp1_private.c
View file

@ -43,8 +43,10 @@
#if STM32MP15
#define TAMP_BOOT_MODE_BACKUP_REG_ID U(20)
#endif
#define TAMP_BOOT_MODE_ITF_MASK U(0x0000FF00)
#define TAMP_BOOT_MODE_ITF_MASK GENMASK(15, 8)
#define TAMP_BOOT_MODE_ITF_SHIFT 8
#define TAMP_BOOT_MODE_AUTH_MASK GENMASK(23, 16)
#define TAMP_BOOT_MODE_AUTH_SHIFT 16
/*
* Backup register to store fwu update information.
@ -52,9 +54,9 @@
* (so it should be in Zone 2).
*/
#define TAMP_BOOT_FWU_INFO_REG_ID U(10)
#define TAMP_BOOT_FWU_INFO_IDX_MSK U(0xF)
#define TAMP_BOOT_FWU_INFO_IDX_MSK GENMASK(3, 0)
#define TAMP_BOOT_FWU_INFO_IDX_OFF U(0)
#define TAMP_BOOT_FWU_INFO_CNT_MSK U(0xF0)
#define TAMP_BOOT_FWU_INFO_CNT_MSK GENMASK(7, 4)
#define TAMP_BOOT_FWU_INFO_CNT_OFF U(4)
#if defined(IMAGE_BL2)
@ -746,6 +748,20 @@ void stm32_get_boot_interface(uint32_t *interface, uint32_t *instance)
*instance = itf & 0xFU;
}
void stm32_save_boot_auth(uint32_t auth_status, uint32_t boot_partition)
{
uint32_t boot_status = tamp_bkpr(TAMP_BOOT_MODE_BACKUP_REG_ID);
clk_enable(RTCAPB);
mmio_clrsetbits_32(boot_status,
TAMP_BOOT_MODE_AUTH_MASK,
((auth_status << 4) | (boot_partition & 0xFU)) <<
TAMP_BOOT_MODE_AUTH_SHIFT);
clk_disable(RTCAPB);
}
#if !STM32MP_USE_STM32IMAGE && PSA_FWU_SUPPORT
void stm32mp1_fwu_set_boot_idx(void)
{