mirrors/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-08-29 18:31:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Fix casting bug in gicv2_main.c" into integration

Browse Source
This commit is contained in:
Madhukar Pappireddy 2020-10-12 18:20:53 +00:00 committed by TrustedFirmware Code Review
commit cc392dd858
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/arm/gic/v2/gicv2_main.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -296,8 +296,8 @@ void gicv2_set_pe_target_mask(unsigned int proc_num)
assert(driver_data != NULL); assert(driver_data != NULL);
assert(driver_data->gicd_base != 0U); assert(driver_data->gicd_base != 0U);
assert(driver_data->target_masks != NULL); assert(driver_data->target_masks != NULL);
assert((unsigned int)proc_num < GICV2_MAX_TARGET_PE); assert(proc_num < GICV2_MAX_TARGET_PE);
assert((unsigned int)proc_num < driver_data->target_masks_num); assert(proc_num < driver_data->target_masks_num);
/* Return if the target mask is already populated */ /* Return if the target mask is already populated */
if (driver_data->target_masks[proc_num] != 0U) if (driver_data->target_masks[proc_num] != 0U)
@ -422,7 +422,8 @@ void gicv2_raise_sgi(int sgi_num, int proc_num)
unsigned int sgir_val, target; unsigned int sgir_val, target;
assert(driver_data != NULL); assert(driver_data != NULL);
assert((unsigned int)proc_num < GICV2_MAX_TARGET_PE); assert(proc_num >= 0);
assert(proc_num < (int)GICV2_MAX_TARGET_PE);
assert(driver_data->gicd_base != 0U); assert(driver_data->gicd_base != 0U);
/* /*
@ -430,7 +431,7 @@ void gicv2_raise_sgi(int sgi_num, int proc_num)
* should be valid. * should be valid.
*/ */
assert(driver_data->target_masks != NULL); assert(driver_data->target_masks != NULL);
assert((unsigned int)proc_num < driver_data->target_masks_num); assert(proc_num < (int)driver_data->target_masks_num);
/* Don't raise SGI if the mask hasn't been populated */ /* Don't raise SGI if the mask hasn't been populated */
target = driver_data->target_masks[proc_num]; target = driver_data->target_masks[proc_num];
@ -466,8 +467,9 @@ void gicv2_set_spi_routing(unsigned int id, int proc_num)
* should be valid. * should be valid.
*/ */
assert(driver_data->target_masks != NULL); assert(driver_data->target_masks != NULL);
assert((unsigned int)proc_num < GICV2_MAX_TARGET_PE); assert(proc_num < (int)GICV2_MAX_TARGET_PE);
assert((unsigned int)proc_num < driver_data->target_masks_num); assert(driver_data->target_masks_num < INT_MAX);
assert(proc_num < (int)driver_data->target_masks_num);
if (proc_num < 0) { if (proc_num < 0) {
/* Target all PEs */ /* Target all PEs */