andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Tegra: memctrl_v2: fix "overflow before widen" coverity issue" into integration

This commit is contained in:
Soby Mathew 2019-09-12 16:10:29 +00:00 committed by TrustedFirmware Code Review
parent f52f73b3ee 36bf55d66c
commit 88b69fccba
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2019, NVIDIA Corporation. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -360,17 +361,15 @@ void tegra_memctrl_videomem_setup(uint64_t phys_base, uint32_t size_in_bytes)
if ((phys_base > vmem_end_old) || (video_mem_base > vmem_end_new)) {
tegra_clear_videomem(video_mem_base,
(uint32_t)video_mem_size_mb << 20U);
video_mem_size_mb << 20U);
} else {
if (video_mem_base < phys_base) {
non_overlap_area_size = phys_base - video_mem_base;
tegra_clear_videomem(video_mem_base,
(uint32_t)non_overlap_area_size);
tegra_clear_videomem(video_mem_base, non_overlap_area_size);
}
if (vmem_end_old > vmem_end_new) {
non_overlap_area_size = vmem_end_old - vmem_end_new;
tegra_clear_videomem(vmem_end_new,
(uint32_t)non_overlap_area_size);
tegra_clear_videomem(vmem_end_new, non_overlap_area_size);
}
}