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

plat/hisilicon: do not keep mmc_device_info in stack

Browse source 
Create a dedicated static struct mmc_device_info mmc_info mmc_info
instead of having this in stack.
A boot issue has been seen on some platform when applying patch [1].

 [1] 13f3c5166f ("mmc:prevent accessing to the released space in case of wrong usage")

Signed-off-by: Yann Gautier <yann.gautier@foss.st.com>
Change-Id: If5db8857cccec2e677b16a38eb3eeb41628a264c
This commit is contained in:
Yann Gautier 2021-03-22 14:21:15 +01:00
parent 4ecd2417c8
commit 9171ced341
4 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plat/hisilicon/hikey/hikey_bl1_setup.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -27,6 +27,7 @@
/* Data structure which holds the extents of the trusted RAM for BL1 */
static meminfo_t bl1_tzram_layout;
static console_t console;
static struct mmc_device_info mmc_info;
enum {
BOOT_NORMAL = 0,
@ -78,7 +79,6 @@ void bl1_plat_arch_setup(void)
void bl1_platform_setup(void)
{
dw_mmc_params_t params;
struct mmc_device_info info;
assert((HIKEY_BL1_MMC_DESC_BASE >= SRAM_BASE) &&
((SRAM_BASE + SRAM_SIZE) >=
@ -99,8 +99,8 @@ void bl1_platform_setup(void)
params.clk_rate = 24 * 1000 * 1000;
params.bus_width = MMC_BUS_WIDTH_8;
params.flags = MMC_FLAG_CMD23;
info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &info);
mmc_info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &mmc_info);
hikey_io_setup();
}

8
plat/hisilicon/hikey/hikey_bl2_setup.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -33,6 +33,7 @@
static meminfo_t bl2_el3_tzram_layout;
static console_t console;
static struct mmc_device_info mmc_info;
enum {
BOOT_MODE_RECOVERY = 0,
@ -290,7 +291,6 @@ void bl2_el3_plat_arch_setup(void)
void bl2_platform_setup(void)
{
dw_mmc_params_t params;
struct mmc_device_info info;
hikey_sp804_init();
hikey_gpio_init();
@ -322,8 +322,8 @@ void bl2_platform_setup(void)
params.clk_rate = 24 * 1000 * 1000;
params.bus_width = MMC_BUS_WIDTH_8;
params.flags = MMC_FLAG_CMD23;
info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &info);
mmc_info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &mmc_info);
hikey_io_setup();
}

11
plat/hisilicon/poplar/bl1_plat_setup.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -30,6 +30,10 @@ static meminfo_t bl1_tzram_layout;
static meminfo_t bl2_tzram_layout;
static console_t console;
#if !POPLAR_RECOVERY
static struct mmc_device_info mmc_info;
#endif
/*
* Cannot use default weak implementation in bl1_main.c because BL1 RW data is
* not at the top of the secure memory.
@ -90,7 +94,6 @@ void bl1_platform_setup(void)
{
int i;
#if !POPLAR_RECOVERY
struct mmc_device_info info;
dw_mmc_params_t params = EMMC_INIT_PARAMS(POPLAR_EMMC_DESC_BASE);
#endif
@ -103,8 +106,8 @@ void bl1_platform_setup(void)
#if !POPLAR_RECOVERY
/* SoC-specific emmc register are initialized/configured by bootrom */
INFO("BL1: initializing emmc\n");
info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &info);
mmc_info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &mmc_info);
#endif
plat_io_setup();

11
plat/hisilicon/poplar/bl2_plat_setup.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -26,6 +26,9 @@
static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE);
static console_t console;
#if !POPLAR_RECOVERY
static struct mmc_device_info mmc_info;
#endif
/*******************************************************************************
* Transfer SCP_BL2 from Trusted RAM using the SCP Download protocol.
@ -171,8 +174,6 @@ void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1,
{
struct meminfo *mem_layout = (struct meminfo *)arg1;
#if !POPLAR_RECOVERY
struct mmc_device_info info;
dw_mmc_params_t params = EMMC_INIT_PARAMS(POPLAR_EMMC_DESC_BASE);
#endif
@ -187,8 +188,8 @@ void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1,
#if !POPLAR_RECOVERY
/* SoC-specific emmc register are initialized/configured by bootrom */
INFO("BL2: initializing emmc\n");
info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &info);
mmc_info.mmc_dev_type = MMC_IS_EMMC;
dw_mmc_init(&params, &mmc_info);
#endif
plat_io_setup();