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

refactor(gicv3): introducing is_valid_interrupt, a new helper utility

Browse source 
In gicv3_main.c the function is_sgi_ppi() returns true when its
sgi/ppi or false when the interrupt number matches an spi interrupt.
Introducing a new API is_valid_interrupt() which validates if
an interrupt number matches SGI/PPI or SPI as a valid interrupt,
any other interrupt number is considered invalid and panics.

Change-Id: Idce8f5432a94c8d300b9408cf5b2502c60e13318
Signed-off-by: Sona Mathew <sonarebecca.mathew@arm.com>
This commit is contained in:
Sona Mathew 2024-01-01 21:00:44 -06:00
parent ce19ebd264
commit 8d449929e5
1 changed files with 48 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
drivers/arm/gic/v3/gicv3_main.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2023, Arm Limited and Contributors. All rights reserved. * Copyright (c) 2015-2024, Arm Limited and Contributors. All rights reserved.
* Copyright (c) 2023, NVIDIA Corporation. All rights reserved. * Copyright (c) 2023, NVIDIA Corporation. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
@ -34,8 +34,8 @@ static spinlock_t gic_lock;
#pragma weak gicv3_rdistif_off #pragma weak gicv3_rdistif_off
#pragma weak gicv3_rdistif_on #pragma weak gicv3_rdistif_on
/* Check interrupt ID for SGI/(E)PPI and (E)SPIs */ /* Check for valid SGI/PPI or SPI interrupt ID */
static bool is_sgi_ppi(unsigned int id); static bool is_valid_interrupt(unsigned int id);
/* /*
* Helper macros to save and restore GICR and GICD registers * Helper macros to save and restore GICR and GICD registers
@ -447,8 +447,12 @@ unsigned int gicv3_get_interrupt_group(unsigned int id, unsigned int proc_num)
return INTR_GROUP1NS; return INTR_GROUP1NS;
} }
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* SGIs: 0-15, PPIs: 16-31, EPPIs: 1056-1119 */ /* SGIs: 0-15, PPIs: 16-31, EPPIs: 1056-1119 */
assert(gicv3_driver_data->rdistif_base_addrs != NULL); assert(gicv3_driver_data->rdistif_base_addrs != NULL);
gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num]; gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num];
@ -942,8 +946,11 @@ unsigned int gicv3_get_interrupt_active(unsigned int id, unsigned int proc_num)
assert(proc_num < gicv3_driver_data->rdistif_num); assert(proc_num < gicv3_driver_data->rdistif_num);
assert(gicv3_driver_data->rdistif_base_addrs != NULL); assert(gicv3_driver_data->rdistif_base_addrs != NULL);
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */ /* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */
return gicr_get_isactiver( return gicr_get_isactiver(
gicv3_driver_data->rdistif_base_addrs[proc_num], id); gicv3_driver_data->rdistif_base_addrs[proc_num], id);
@ -973,9 +980,11 @@ void gicv3_enable_interrupt(unsigned int id, unsigned int proc_num)
* interrupt trigger are observed before enabling interrupt. * interrupt trigger are observed before enabling interrupt.
*/ */
dsbishst(); dsbishst();
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */ /* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */
gicr_set_isenabler( gicr_set_isenabler(
gicv3_driver_data->rdistif_base_addrs[proc_num], id); gicv3_driver_data->rdistif_base_addrs[proc_num], id);
@ -1004,9 +1013,11 @@ void gicv3_disable_interrupt(unsigned int id, unsigned int proc_num)
* Disable interrupt, and ensure that any shared variable updates * Disable interrupt, and ensure that any shared variable updates
* depending on out of band interrupt trigger are observed afterwards. * depending on out of band interrupt trigger are observed afterwards.
*/ */
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */ /* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */
gicr_set_icenabler( gicr_set_icenabler(
gicv3_driver_data->rdistif_base_addrs[proc_num], id); gicv3_driver_data->rdistif_base_addrs[proc_num], id);
@ -1041,8 +1052,11 @@ void gicv3_set_interrupt_priority(unsigned int id, unsigned int proc_num,
assert(proc_num < gicv3_driver_data->rdistif_num); assert(proc_num < gicv3_driver_data->rdistif_num);
assert(gicv3_driver_data->rdistif_base_addrs != NULL); assert(gicv3_driver_data->rdistif_base_addrs != NULL);
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */ /* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */
gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num]; gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num];
gicr_set_ipriorityr(gicr_base, id, priority); gicr_set_ipriorityr(gicr_base, id, priority);
@ -1088,8 +1102,11 @@ void gicv3_set_interrupt_group(unsigned int id, unsigned int proc_num,
break; break;
} }
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */ /* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */
gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num]; gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num];
@ -1228,12 +1245,14 @@ void gicv3_clear_interrupt_pending(unsigned int id, unsigned int proc_num)
* Clear pending interrupt, and ensure that any shared variable updates * Clear pending interrupt, and ensure that any shared variable updates
* depending on out of band interrupt trigger are observed afterwards. * depending on out of band interrupt trigger are observed afterwards.
*/ */
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */ /* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */
gicr_set_icpendr( gicr_set_icpendr(
gicv3_driver_data->rdistif_base_addrs[proc_num], id); gicv3_driver_data->rdistif_base_addrs[proc_num], id);
} else { } else {
/* For SPIs: 32-1019 and ESPIs: 4096-5119 */ /* For SPIs: 32-1019 and ESPIs: 4096-5119 */
gicd_base = gicv3_get_multichip_base(id, gicv3_driver_data->gicd_base); gicd_base = gicv3_get_multichip_base(id, gicv3_driver_data->gicd_base);
@ -1263,8 +1282,12 @@ void gicv3_set_interrupt_pending(unsigned int id, unsigned int proc_num)
*/ */
dsbishst(); dsbishst();
if (!is_valid_interrupt(id)) {
panic();
}
/* Check interrupt ID */ /* Check interrupt ID */
if (is_sgi_ppi(id)) { if (IS_SGI_PPI(id)) {
/* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */ /* For SGIs: 0-15, PPIs: 16-31 and EPPIs: 1056-1119 */
gicr_set_ispendr( gicr_set_ispendr(
gicv3_driver_data->rdistif_base_addrs[proc_num], id); gicv3_driver_data->rdistif_base_addrs[proc_num], id);
@ -1371,21 +1394,19 @@ int gicv3_rdistif_probe(const uintptr_t gicr_frame)
} }
/****************************************************************************** /******************************************************************************
* This function checks the interrupt ID and returns true for SGIs and (E)PPIs * This function checks the interrupt ID and returns true for SGIs, (E)PPIs
* and false for (E)SPIs IDs. * and (E)SPIs IDs. Any interrupt ID outside the range is invalid and returns
* false.
*****************************************************************************/ *****************************************************************************/
static bool is_sgi_ppi(unsigned int id) static bool is_valid_interrupt(unsigned int id)
{ {
/* SGIs: 0-15, PPIs: 16-31, EPPIs: 1056-1119 */ /* Valid interrupts:
if (IS_SGI_PPI(id)) { * SGIs: 0-15, PPIs: 16-31, EPPIs: 1056-1119
* SPIs: 32-1019, ESPIs: 4096-5119
*/
if ((IS_SGI_PPI(id)) || (IS_SPI(id))) {
return true; return true;
} }
/* SPIs: 32-1019, ESPIs: 4096-5119 */ return false;
if (IS_SPI(id)) {
return false;
}
assert(false);
panic();
} }