diff options
| author | Harrison Mutai <harrison.mutai@arm.com> | 2026-06-30 15:42:49 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2026-06-30 15:42:49 +0000 |
| commit | 599baaa539b3996067b9ce8f0f225c8baa6e0757 (patch) | |
| tree | c3f0344f46879c0dd70ef0b00a3283bd6fee44d7 | |
| parent | 55e1d9beaed61abe77e554bccf03d6cd8a6ee3ea (diff) | |
| parent | df0ee912fee0f07cd533889dd3c410636625b8ff (diff) | |
| download | arm-trusted-firmware-599baaa539b3996067b9ce8f0f225c8baa6e0757.tar.gz arm-trusted-firmware-599baaa539b3996067b9ce8f0f225c8baa6e0757.zip | |
Merge "fix(platforms): check MIN_SGI_ID at compile time" into integration
| -rw-r--r-- | drivers/arm/gic/v3/gicv3_main.c | 2 | ||||
| -rw-r--r-- | plat/common/plat_gicv2.c | 4 | ||||
| -rw-r--r-- | plat/common/plat_gicv3.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c index baaca5fca..7ef5559f2 100644 --- a/drivers/arm/gic/v3/gicv3_main.c +++ b/drivers/arm/gic/v3/gicv3_main.c @@ -1144,7 +1144,7 @@ void gicv3_raise_sgi(unsigned int sgi_num, gicv3_irq_group_t group, uint64_t sgi_val; /* Verify interrupt number is in the SGI range */ - assert((sgi_num >= MIN_SGI_ID) && (sgi_num < MIN_PPI_ID)); + assert(sgi_num < MIN_PPI_ID); /* Extract affinity fields from target */ aff0 = (unsigned int)MPIDR_AFFLVL0_VAL(target); diff --git a/plat/common/plat_gicv2.c b/plat/common/plat_gicv2.c index 1edccd144..694142a15 100644 --- a/plat/common/plat_gicv2.c +++ b/plat/common/plat_gicv2.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2023, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2026, Arm Limited and Contributors. All rights reserved. * Portions copyright (c) 2021-2022, ProvenRun S.A.S. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -177,7 +177,7 @@ bool plat_ic_is_ppi(unsigned int id) bool plat_ic_is_sgi(unsigned int id) { - return (id >= MIN_SGI_ID) && (id < MIN_PPI_ID); + return (id < MIN_PPI_ID); } unsigned int plat_ic_get_interrupt_active(unsigned int id) diff --git a/plat/common/plat_gicv3.c b/plat/common/plat_gicv3.c index d4ba9ac5f..939efeb58 100644 --- a/plat/common/plat_gicv3.c +++ b/plat/common/plat_gicv3.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2024, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2026, Arm Limited and Contributors. All rights reserved. * Portions copyright (c) 2021-2022, ProvenRun S.A.S. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -214,7 +214,7 @@ bool plat_ic_is_ppi(unsigned int id) bool plat_ic_is_sgi(unsigned int id) { - return (id >= MIN_SGI_ID) && (id < MIN_PPI_ID); + return (id < MIN_PPI_ID); } unsigned int plat_ic_get_interrupt_active(unsigned int id) |