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

refactor(console): consolidate console runtime switch

Browse source 
Refactor console_flush() and console_switch_state(CONSOLE_FLAG_RUNTIME)
to bl31_main(). This has been done per the recommendation in TF-A
mailing list. These calls need to be the last calls, after any runtime
initialization has been done, before BL31 exits.

All platforms that override the generic implementation of
bl31_plat_runtime_setup() have been refactored. The console_flush()
and console_switch_state() calls have been removed as they become
part of bl31_main() function.

Any platform that don't need to make any change to the generic (weak)
implementation of bl31_plat_runtime_setup() don't need to override it
in their platforms.

Change-Id: I6d04d6daa9353daeaa7e3df9e9adf6f322a917b8
Signed-off-by: Salman Nabi <salman.nabi@arm.com>
This commit is contained in:
Salman Nabi 2024-02-21 17:07:24 +00:00
parent 92752355f5
commit af3e8e63b4
18 changed files with 4 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bl31/bl31_main.c
View file

@ -212,8 +212,6 @@ void bl31_main(void)
*/ */
bl31_prepare_next_image_entry(); bl31_prepare_next_image_entry();
console_flush();
/* /*
* Perform any platform specific runtime setup prior to cold boot exit * Perform any platform specific runtime setup prior to cold boot exit
* from BL31 * from BL31
@ -221,9 +219,12 @@ void bl31_main(void)
bl31_plat_runtime_setup(); bl31_plat_runtime_setup();
#if ENABLE_RUNTIME_INSTRUMENTATION #if ENABLE_RUNTIME_INSTRUMENTATION
PMF_CAPTURE_TIMESTAMP(bl_svc, BL31_EXIT, PMF_CACHE_MAINT);
console_flush(); console_flush();
PMF_CAPTURE_TIMESTAMP(bl_svc, BL31_EXIT, PMF_CACHE_MAINT);
#endif #endif
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
/******************************************************************************* /*******************************************************************************

3
plat/allwinner/common/sunxi_bl31_setup.c
View file

@ -186,9 +186,6 @@ void bl31_plat_runtime_setup(void)
{ {
/* Change the DTB if the configuration requires so. */ /* Change the DTB if the configuration requires so. */
sunxi_prepare_dtb(fdt); sunxi_prepare_dtb(fdt);
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)

3
plat/brcm/common/brcm_bl31_setup.c
View file

@ -237,9 +237,6 @@ void brcm_bl31_plat_runtime_setup(void)
{ {
/* Initialize the runtime console */ /* Initialize the runtime console */
bcm_console_runtime_init(); bcm_console_runtime_init();
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
void bl31_platform_setup(void) void bl31_platform_setup(void)

2
plat/common/aarch64/plat_common.c
View file

@ -35,8 +35,6 @@
void bl31_plat_runtime_setup(void) void bl31_plat_runtime_setup(void)
{ {
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
/* /*

6
plat/hisilicon/hikey/hikey_bl31_setup.c
View file

@ -149,9 +149,3 @@ void bl31_platform_setup(void)
hisi_ipc_init(); hisi_ipc_init();
hisi_pwrc_setup(); hisi_pwrc_setup();
} }
void bl31_plat_runtime_setup(void)
{
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}

3
plat/hisilicon/hikey960/hikey960_bl31_setup.c
View file

@ -270,7 +270,4 @@ void bl31_plat_runtime_setup(void)
if (rc != 0) if (rc != 0)
panic(); panic();
#endif #endif
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }

6
plat/hisilicon/poplar/bl31_plat_setup.c
View file

@ -118,12 +118,6 @@ void bl31_platform_setup(void)
hisi_tzpc_sec_init(); hisi_tzpc_sec_init();
} }
void bl31_plat_runtime_setup(void)
{
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}
void bl31_plat_arch_setup(void) void bl31_plat_arch_setup(void)
{ {
plat_configure_mmu_el3(BL31_BASE, plat_configure_mmu_el3(BL31_BASE,

6
plat/imx/imx8qm/imx8qm_bl31_setup.c
View file

@ -408,9 +408,3 @@ unsigned int plat_get_syscnt_freq2(void)
{ {
return COUNTER_FREQUENCY; return COUNTER_FREQUENCY;
} }
void bl31_plat_runtime_setup(void)
{
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}

6
plat/imx/imx8qx/imx8qx_bl31_setup.c
View file

@ -386,9 +386,3 @@ unsigned int plat_get_syscnt_freq2(void)
{ {
return COUNTER_FREQUENCY; return COUNTER_FREQUENCY;
} }
void bl31_plat_runtime_setup(void)
{
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}

6
plat/imx/imx93/imx93_bl31_setup.c
View file

@ -136,12 +136,6 @@ void bl31_platform_setup(void)
plat_gic_init(); plat_gic_init();
} }
void bl31_plat_runtime_setup(void)
{
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}
entry_point_info_t *bl31_plat_get_next_image_ep_info(unsigned int type) entry_point_info_t *bl31_plat_get_next_image_ep_info(unsigned int type)
{ {
if (type == NON_SECURE) { if (type == NON_SECURE) {

3
plat/marvell/armada/common/marvell_bl31_setup.c
View file

@ -183,9 +183,6 @@ void marvell_bl31_plat_runtime_setup(void)
{ {
/* Initialize the runtime console */ /* Initialize the runtime console */
marvell_console_runtime_init(); marvell_console_runtime_init();
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
void bl31_platform_setup(void) void bl31_platform_setup(void)

3
plat/mediatek/common/mtk_bl31_setup.c
View file

@ -166,9 +166,6 @@ void bl31_platform_setup(void)
void bl31_plat_runtime_setup(void) void bl31_plat_runtime_setup(void)
{ {
mtk_init_one_level(MTK_INIT_LVL_PLAT_RUNTIME); mtk_init_one_level(MTK_INIT_LVL_PLAT_RUNTIME);
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
unsigned int plat_get_syscnt_freq2(void) unsigned int plat_get_syscnt_freq2(void)

3
plat/nvidia/tegra/common/tegra_bl31_setup.c
View file

@ -258,9 +258,6 @@ void bl31_plat_runtime_setup(void)
*/ */
boot_profiler_add_record("[TF] bl31 exit"); boot_profiler_add_record("[TF] bl31 exit");
boot_profiler_deinit(); boot_profiler_deinit();
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
/******************************************************************************* /*******************************************************************************

3
plat/nxp/common/setup/ls_bl31_setup.c
View file

@ -186,9 +186,6 @@ void bl31_plat_runtime_setup(void)
ls_el3_interrupt_config(); ls_el3_interrupt_config();
#endif #endif
soc_runtime_setup(); soc_runtime_setup();
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
/******************************************************************************* /*******************************************************************************

3
plat/socionext/synquacer/sq_bl31_setup.c
View file

@ -209,9 +209,6 @@ void bl31_plat_runtime_setup(void)
struct draminfo *di = (struct draminfo *)(unsigned long)DRAMINFO_BASE; struct draminfo *di = (struct draminfo *)(unsigned long)DRAMINFO_BASE;
sq_scp_get_draminfo(di); sq_scp_get_draminfo(di);
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
void bl31_plat_arch_setup(void) void bl31_plat_arch_setup(void)

3
plat/xilinx/versal/bl31_versal_setup.c
View file

@ -206,9 +206,6 @@ void bl31_plat_runtime_setup(void)
if (rc != 0) { if (rc != 0) {
panic(); panic();
} }
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
/* /*

3
plat/xilinx/versal_net/bl31_versal_net_setup.c
View file

@ -231,9 +231,6 @@ void bl31_plat_runtime_setup(void)
if (rc != 0) { if (rc != 0) {
panic(); panic();
} }
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
/* /*

3
plat/xilinx/zynqmp/bl31_zynqmp_setup.c
View file

@ -190,9 +190,6 @@ void bl31_plat_runtime_setup(void)
#endif #endif
custom_runtime_setup(); custom_runtime_setup();
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
} }
/* /*