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

refactor(stm32mp1): move stm32_save_boot_interface()

Browse source 
The function stm32_save_boot_interface()is moved to stm32mp1_private.c
file. The files stm32mp1_context.{c,h} are removed.
As return is always 0, change the function to return void.
Call it earlier, to be able to use it when configuring console.

Change-Id: I8986e1257dc8e8708eab044a51ea1f2426b16597
Signed-off-by: Yann Gautier <yann.gautier@foss.st.com>
This commit is contained in:
Yann Gautier 2021-12-10 17:04:40 +01:00
parent d7176f0319
commit 4dc77a35e3
6 changed files with 25 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,4 +115,7 @@ int stm32mp_check_header(boot_api_image_header_t *header, uintptr_t buffer);
int stm32mp_map_ddr_non_cacheable(void); int stm32mp_map_ddr_non_cacheable(void);
int stm32mp_unmap_ddr(void); int stm32mp_unmap_ddr(void);
/* Function to save boot peripheral info */
void stm32_save_boot_interface(uint32_t interface, uint32_t instance);
#endif /* STM32MP_COMMON_H */ #endif /* STM32MP_COMMON_H */

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

@ -32,7 +32,6 @@
#include <lib/xlat_tables/xlat_tables_v2.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <stm32mp1_context.h>
#include <stm32mp1_dbgmcu.h> #include <stm32mp1_dbgmcu.h>
#define RESET_TIMEOUT_US_1MS 1000U #define RESET_TIMEOUT_US_1MS 1000U
@ -248,6 +247,9 @@ void bl2_el3_plat_arch_setup(void)
stm32mp1_syscfg_init(); stm32mp1_syscfg_init();
stm32_save_boot_interface(boot_context->boot_interface_selected,
boot_context->boot_interface_instance);
#if STM32MP_USB_PROGRAMMER #if STM32MP_USB_PROGRAMMER
/* Deconfigure all UART RX pins configured by ROM code */ /* Deconfigure all UART RX pins configured by ROM code */
stm32mp1_deconfigure_uart_pins(); stm32mp1_deconfigure_uart_pins();
@ -319,12 +321,6 @@ skip_console_init:
INFO("IWDG2 freeze error : %i\n", result); INFO("IWDG2 freeze error : %i\n", result);
} }
if (stm32_save_boot_interface(boot_context->boot_interface_selected,
boot_context->boot_interface_instance) !=
0) {
ERROR("Cannot save boot interface\n");
}
stm32mp1_auth_ops.check_key = boot_context->bootrom_ecdsa_check_key; stm32mp1_auth_ops.check_key = boot_context->bootrom_ecdsa_check_key;
stm32mp1_auth_ops.verify_signature = stm32mp1_auth_ops.verify_signature =
boot_context->bootrom_ecdsa_verify_signature; boot_context->bootrom_ecdsa_verify_signature;

14
plat/st/stm32mp1/include/stm32mp1_context.h
View file

@ -1,14 +0,0 @@
/*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef STM32MP1_CONTEXT_H
#define STM32MP1_CONTEXT_H
#include <stdint.h>
int stm32_save_boot_interface(uint32_t interface, uint32_t instance);
#endif /* STM32MP1_CONTEXT_H */

1
plat/st/stm32mp1/platform.mk
View file

@ -202,7 +202,6 @@ PLAT_BL_COMMON_SOURCES += drivers/arm/tzc/tzc400.c \
drivers/st/pmic/stpmic1.c \ drivers/st/pmic/stpmic1.c \
drivers/st/reset/stm32mp1_reset.c \ drivers/st/reset/stm32mp1_reset.c \
plat/st/common/stm32mp_dt.c \ plat/st/common/stm32mp_dt.c \
plat/st/stm32mp1/stm32mp1_context.c \
plat/st/stm32mp1/stm32mp1_dbgmcu.c \ plat/st/stm32mp1/stm32mp1_dbgmcu.c \
plat/st/stm32mp1/stm32mp1_helper.S \ plat/st/stm32mp1/stm32mp1_helper.S \
plat/st/stm32mp1/stm32mp1_syscfg.c plat/st/stm32mp1/stm32mp1_syscfg.c

35
plat/st/stm32mp1/stm32mp1_context.c
View file

@ -1,35 +0,0 @@
/*
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <errno.h>
#include <platform_def.h>
#include <drivers/st/stm32mp1_clk.h>
#include <dt-bindings/clock/stm32mp1-clks.h>
#include <lib/mmio.h>
#include <stm32mp1_context.h>
#define TAMP_BOOT_ITF_BACKUP_REG_ID U(20)
#define TAMP_BOOT_ITF_MASK U(0x0000FF00)
#define TAMP_BOOT_ITF_SHIFT 8
int stm32_save_boot_interface(uint32_t interface, uint32_t instance)
{
uint32_t bkpr_itf_idx = tamp_bkpr(TAMP_BOOT_ITF_BACKUP_REG_ID);
stm32mp_clk_enable(RTCAPB);
mmio_clrsetbits_32(bkpr_itf_idx,
TAMP_BOOT_ITF_MASK,
((interface << 4) | (instance & 0xFU)) <<
TAMP_BOOT_ITF_SHIFT);
stm32mp_clk_disable(RTCAPB);
return 0;
}

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

@ -9,6 +9,7 @@
#include <drivers/st/stm32_gpio.h> #include <drivers/st/stm32_gpio.h>
#include <drivers/st/stm32_iwdg.h> #include <drivers/st/stm32_iwdg.h>
#include <libfdt.h> #include <libfdt.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_v2.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <platform_def.h> #include <platform_def.h>
@ -34,6 +35,10 @@
BOARD_ID_VARFG_SHIFT) BOARD_ID_VARFG_SHIFT)
#define BOARD_ID2BOM(_id) ((_id) & BOARD_ID_BOM_MASK) #define BOARD_ID2BOM(_id) ((_id) & BOARD_ID_BOM_MASK)
#define TAMP_BOOT_MODE_BACKUP_REG_ID U(20)
#define TAMP_BOOT_MODE_ITF_MASK U(0x0000FF00)
#define TAMP_BOOT_MODE_ITF_SHIFT 8
#if defined(IMAGE_BL2) #if defined(IMAGE_BL2)
#define MAP_SEC_SYSRAM MAP_REGION_FLAT(STM32MP_SYSRAM_BASE, \ #define MAP_SEC_SYSRAM MAP_REGION_FLAT(STM32MP_SYSRAM_BASE, \
STM32MP_SYSRAM_SIZE, \ STM32MP_SYSRAM_SIZE, \
@ -556,3 +561,17 @@ uint32_t stm32mp_get_ddr_ns_size(void)
return ddr_ns_size; return ddr_ns_size;
} }
#endif /* STM32MP_USE_STM32IMAGE */ #endif /* STM32MP_USE_STM32IMAGE */
void stm32_save_boot_interface(uint32_t interface, uint32_t instance)
{
uint32_t bkpr_itf_idx = tamp_bkpr(TAMP_BOOT_MODE_BACKUP_REG_ID);
stm32mp_clk_enable(RTCAPB);
mmio_clrsetbits_32(bkpr_itf_idx,
TAMP_BOOT_MODE_ITF_MASK,
((interface << 4) | (instance & 0xFU)) <<
TAMP_BOOT_MODE_ITF_SHIFT);
stm32mp_clk_disable(RTCAPB);
}