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

Merge changes I84e257b3,I1317e482 into integration

Browse source 
* changes:
  fix(layerscape): fix coverity issue
  fix(nxp-ddr): fix coverity issue
This commit is contained in:
Joanna Farley 2022-03-30 09:38:52 +02:00 • committed by TrustedFirmware Code Review
commit f78cb61a11
3 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/nxp/ddr/phy-gen2/phy.c
View file

@ -2216,10 +2216,14 @@ static int load_fw(uint16_t **phy_ptr,
size = PHY_GEN2_MAX_IMAGE_SIZE; size = PHY_GEN2_MAX_IMAGE_SIZE;
image_buf = (uintptr_t)phy_gen2_fw_img_buf; image_buf = (uintptr_t)phy_gen2_fw_img_buf;
mmap_add_dynamic_region(phy_gen2_fw_img_buf, ret = mmap_add_dynamic_region(phy_gen2_fw_img_buf,
phy_gen2_fw_img_buf, phy_gen2_fw_img_buf,
PHY_GEN2_MAX_IMAGE_SIZE, PHY_GEN2_MAX_IMAGE_SIZE,
MT_MEMORY | MT_RW | MT_SECURE); MT_MEMORY | MT_RW | MT_SECURE);
if (ret != 0) {
ERROR("Failed to add dynamic memory region.\n");
return ret;
}
ret = img_loadr(imem_id, &image_buf, &size); ret = img_loadr(imem_id, &image_buf, &size);
if (ret != 0) { if (ret != 0) {
ERROR("Failed to load %d firmware.\n", imem_id); ERROR("Failed to load %d firmware.\n", imem_id);

8
plat/nxp/common/img_loadr/load_img.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2018-2020 NXP * Copyright 2018-2022 NXP
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
@ -49,10 +49,14 @@ int load_img(unsigned int image_id, uintptr_t *image_base,
/* Create MMU entry for the CSF header */ /* Create MMU entry for the CSF header */
#if PLAT_XLAT_TABLES_DYNAMIC #if PLAT_XLAT_TABLES_DYNAMIC
#ifdef CSF_HEADER_PREPENDED #ifdef CSF_HEADER_PREPENDED
mmap_add_dynamic_region(img_info.image_info.image_base, err = mmap_add_dynamic_region(img_info.image_info.image_base,
img_info.image_info.image_base, img_info.image_info.image_base,
CSF_HDR_SZ, CSF_HDR_SZ,
MT_MEMORY | MT_RW | MT_SECURE); MT_MEMORY | MT_RW | MT_SECURE);
if (err != 0) {
ERROR("Failed to add dynamic memory region.\n");
return err;
}
#endif #endif
#endif #endif

23
plat/nxp/common/setup/ls_common.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2018-2021 NXP * Copyright 2018-2022 NXP
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
@ -113,7 +113,8 @@ static void mmap_add_ddr_regions_statically(void)
#if defined(PLAT_XLAT_TABLES_DYNAMIC) #if defined(PLAT_XLAT_TABLES_DYNAMIC)
void mmap_add_ddr_region_dynamically(void) void mmap_add_ddr_region_dynamically(void)
{ {
int i = 0; int ret, i = 0;
dram_regions_info_t *info_dram_regions = get_dram_regions_info(); dram_regions_info_t *info_dram_regions = get_dram_regions_info();
/* MMU map for Non-Secure DRAM Regions */ /* MMU map for Non-Secure DRAM Regions */
VERBOSE("DRAM Region %d: %p - %p\n", i, VERBOSE("DRAM Region %d: %p - %p\n", i,
@ -121,10 +122,14 @@ void mmap_add_ddr_region_dynamically(void)
(void *) (info_dram_regions->region[i].addr (void *) (info_dram_regions->region[i].addr
+ info_dram_regions->region[i].size + info_dram_regions->region[i].size
- 1)); - 1));
mmap_add_dynamic_region(info_dram_regions->region[i].addr, ret = mmap_add_dynamic_region(info_dram_regions->region[i].addr,
info_dram_regions->region[i].addr, info_dram_regions->region[i].addr,
info_dram_regions->region[i].size, info_dram_regions->region[i].size,
MT_MEMORY | MT_RW | MT_NS); MT_MEMORY | MT_RW | MT_NS);
if (ret != 0) {
ERROR("Failed to add dynamic memory region\n");
panic();
}
/* MMU map for Secure DDR Region on DRAM-0 */ /* MMU map for Secure DDR Region on DRAM-0 */
if (info_dram_regions->region[i].size > if (info_dram_regions->region[i].size >
@ -137,12 +142,16 @@ void mmap_add_ddr_region_dynamically(void)
+ NXP_SECURE_DRAM_SIZE + NXP_SECURE_DRAM_SIZE
+ NXP_SP_SHRD_DRAM_SIZE + NXP_SP_SHRD_DRAM_SIZE
- 1)); - 1));
mmap_add_dynamic_region((info_dram_regions->region[i].addr ret = mmap_add_dynamic_region((info_dram_regions->region[i].addr
+ info_dram_regions->region[i].size), + info_dram_regions->region[i].size),
(info_dram_regions->region[i].addr (info_dram_regions->region[i].addr
+ info_dram_regions->region[i].size), + info_dram_regions->region[i].size),
(NXP_SECURE_DRAM_SIZE + NXP_SP_SHRD_DRAM_SIZE), (NXP_SECURE_DRAM_SIZE + NXP_SP_SHRD_DRAM_SIZE),
MT_MEMORY | MT_RW | MT_SECURE); MT_MEMORY | MT_RW | MT_SECURE);
if (ret != 0) {
ERROR("Failed to add dynamic memory region\n");
panic();
}
} }
#ifdef IMAGE_BL31 #ifdef IMAGE_BL31
@ -155,10 +164,14 @@ void mmap_add_ddr_region_dynamically(void)
(void *) (info_dram_regions->region[i].addr (void *) (info_dram_regions->region[i].addr
+ info_dram_regions->region[i].size + info_dram_regions->region[i].size
- 1)); - 1));
mmap_add_dynamic_region(info_dram_regions->region[i].addr, ret = mmap_add_dynamic_region(info_dram_regions->region[i].addr,
info_dram_regions->region[i].addr, info_dram_regions->region[i].addr,
info_dram_regions->region[i].size, info_dram_regions->region[i].size,
MT_MEMORY | MT_RW | MT_NS); MT_MEMORY | MT_RW | MT_NS);
if (ret != 0) {
ERROR("Failed to add dynamic memory region\n");
panic();
}
} }
#endif #endif
} }