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

refactor(hisilicon): console runtime switch on bl31 exit

Browse source 
TF-A plans to move the console_flush() and
console_switch_state(CONOSLE_FLAG_RUNTIME) calls to bl31_main() just
before BL31 exits.

For now we are mimicking the generic implementation by calling flush
and changing the console state to runtime at the end of
bl31_plat_runtime_setup() for each platform. This is so that each
platform can test it prior to moving flush and switch to bl31_main().

This patch affects the Hisilicon SoCs (poplar, hikey, hikey960).

Change-Id: I0cbb0644377f663e880310362abb4308e24f0cef
Signed-off-by: Salman Nabi <salman.nabi@arm.com>
This commit is contained in:
Salman Nabi 2024-02-21 12:18:24 +00:00
parent 48932c3c27
commit d51a63260f
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -152,4 +152,6 @@ void bl31_platform_setup(void)
void bl31_plat_runtime_setup(void)
{
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2023, Arm Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -270,4 +270,7 @@ void bl31_plat_runtime_setup(void)
if (rc != 0)
panic();
#endif
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -120,7 +120,8 @@ void bl31_platform_setup(void)
void bl31_plat_runtime_setup(void)
{
/* do nothing */
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}
void bl31_plat_arch_setup(void)