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

fix(gicv3): map generic interrupt type to GICv3 group

Browse source 
The generic interrupt controller identifies an interrupt based on its
type whereas the GIC uses the notion of groups to identify an
interrupt.

Currently, they are used interchangeably in GICv3 driver. It did not
cause any functional issues since the matching type and group had the
same value for corresponding macros. This patch makes the necessary
fixes.

The generic interrupt controller APIs, such as
plat_ic_set_interrupt_type map interrupt type to interrupt group
supported by the GICv3 IP. Similarly, other generic interrupt
controller APIs map interrupt group to interrupt type as needed.

This patch also changes the name of the helper functions to use group
rather than type for handling interrupts.

Change-Id: Ie2d88a3260c71e4ab9c8baacde24cc21e551de3d
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
This commit is contained in:
Madhukar Pappireddy 2023-08-03 14:17:54 -05:00
parent ab80cf35e7
commit 632e5ffeb8
3 changed files with 48 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2022, Arm Limited and Contributors. All rights reserved. * Copyright (c) 2015-2023, 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
@ -421,16 +421,15 @@ unsigned int gicv3_get_pending_interrupt_type(void)
} }
/******************************************************************************* /*******************************************************************************
* This function returns the type of the interrupt id depending upon the group * This function returns the group that has been configured under by the
* this interrupt has been configured under by the interrupt controller i.e. * interrupt controller for the given interrupt id i.e. either group0 or group1
* group0 or group1 Secure / Non Secure. The return value can be one of the * Secure / Non Secure. The return value can be one of the following :
* following :
* INTR_GROUP0 : The interrupt type is a Secure Group 0 interrupt * INTR_GROUP0 : The interrupt type is a Secure Group 0 interrupt
* INTR_GROUP1S : The interrupt type is a Secure Group 1 secure interrupt * INTR_GROUP1S : The interrupt type is a Secure Group 1 secure interrupt
* INTR_GROUP1NS: The interrupt type is a Secure Group 1 non secure * INTR_GROUP1NS: The interrupt type is a Secure Group 1 non secure
* interrupt. * interrupt.
******************************************************************************/ ******************************************************************************/
unsigned int gicv3_get_interrupt_type(unsigned int id, unsigned int proc_num) unsigned int gicv3_get_interrupt_group(unsigned int id, unsigned int proc_num)
{ {
unsigned int igroup, grpmodr; unsigned int igroup, grpmodr;
uintptr_t gicr_base; uintptr_t gicr_base;
@ -1059,8 +1058,8 @@ void gicv3_set_interrupt_priority(unsigned int id, unsigned int proc_num,
* is used if the interrupt is SGI or (E)PPI, and programs the corresponding * is used if the interrupt is SGI or (E)PPI, and programs the corresponding
* Redistributor interface. The group can be any of GICV3_INTR_GROUP* * Redistributor interface. The group can be any of GICV3_INTR_GROUP*
******************************************************************************/ ******************************************************************************/
void gicv3_set_interrupt_type(unsigned int id, unsigned int proc_num, void gicv3_set_interrupt_group(unsigned int id, unsigned int proc_num,
unsigned int type) unsigned int group)
{ {
bool igroup = false, grpmod = false; bool igroup = false, grpmod = false;
uintptr_t gicr_base; uintptr_t gicr_base;
@ -1071,7 +1070,7 @@ void gicv3_set_interrupt_type(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);
switch (type) { switch (group) {
case INTR_GROUP1S: case INTR_GROUP1S:
igroup = false; igroup = false;
grpmod = true; grpmod = true;

8
include/drivers/arm/gicv3.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2022, Arm Limited and Contributors. All rights reserved. * Copyright (c) 2015-2023, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -556,7 +556,7 @@ void gicv3_cpuif_enable(unsigned int proc_num);
void gicv3_cpuif_disable(unsigned int proc_num); void gicv3_cpuif_disable(unsigned int proc_num);
unsigned int gicv3_get_pending_interrupt_type(void); unsigned int gicv3_get_pending_interrupt_type(void);
unsigned int gicv3_get_pending_interrupt_id(void); unsigned int gicv3_get_pending_interrupt_id(void);
unsigned int gicv3_get_interrupt_type(unsigned int id, unsigned int gicv3_get_interrupt_group(unsigned int id,
unsigned int proc_num); unsigned int proc_num);
void gicv3_distif_init_restore(const gicv3_dist_ctx_t * const dist_ctx); void gicv3_distif_init_restore(const gicv3_dist_ctx_t * const dist_ctx);
void gicv3_distif_save(gicv3_dist_ctx_t * const dist_ctx); void gicv3_distif_save(gicv3_dist_ctx_t * const dist_ctx);
@ -579,8 +579,8 @@ void gicv3_enable_interrupt(unsigned int id, unsigned int proc_num);
void gicv3_disable_interrupt(unsigned int id, unsigned int proc_num); void gicv3_disable_interrupt(unsigned int id, unsigned int proc_num);
void gicv3_set_interrupt_priority(unsigned int id, unsigned int proc_num, void gicv3_set_interrupt_priority(unsigned int id, unsigned int proc_num,
unsigned int priority); unsigned int priority);
void gicv3_set_interrupt_type(unsigned int id, unsigned int proc_num, void gicv3_set_interrupt_group(unsigned int id, unsigned int proc_num,
unsigned int type); unsigned int group);
void gicv3_raise_sgi(unsigned int sgi_num, gicv3_irq_group_t group, void gicv3_raise_sgi(unsigned int sgi_num, gicv3_irq_group_t group,
u_register_t target); u_register_t target);
void gicv3_set_spi_routing(unsigned int id, unsigned int irm, void gicv3_set_spi_routing(unsigned int id, unsigned int irm,

44
plat/common/plat_gicv3.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2023, Arm Limited and Contributors. All rights reserved.
* Portions copyright (c) 2021-2022, ProvenRun S.A.S. All rights reserved. * Portions copyright (c) 2021-2022, ProvenRun S.A.S. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
@ -47,10 +47,6 @@
#pragma weak plat_ic_set_interrupt_pending #pragma weak plat_ic_set_interrupt_pending
#pragma weak plat_ic_clear_interrupt_pending #pragma weak plat_ic_clear_interrupt_pending
CASSERT((INTR_TYPE_S_EL1 == INTR_GROUP1S) &&
(INTR_TYPE_NS == INTR_GROUP1NS) &&
(INTR_TYPE_EL3 == INTR_GROUP0), assert_interrupt_type_mismatch);
/* /*
* This function returns the highest priority pending interrupt at * This function returns the highest priority pending interrupt at
* the Interrupt controller * the Interrupt controller
@ -116,12 +112,26 @@ uint32_t plat_ic_acknowledge_interrupt(void)
/* /*
* This function returns the type of the interrupt `id`, depending on how * This function returns the type of the interrupt `id`, depending on how
* the interrupt has been configured in the interrupt controller * the interrupt has been configured in the interrupt controller.
*/ */
uint32_t plat_ic_get_interrupt_type(uint32_t id) uint32_t plat_ic_get_interrupt_type(uint32_t id)
{ {
unsigned int group;
assert(IS_IN_EL3()); assert(IS_IN_EL3());
return gicv3_get_interrupt_type(id, plat_my_core_pos()); group = gicv3_get_interrupt_group(id, plat_my_core_pos());
switch (group) {
case INTR_GROUP0:
return INTR_TYPE_EL3;
case INTR_GROUP1S:
return INTR_TYPE_S_EL1;
case INTR_GROUP1NS:
return INTR_TYPE_NS;
default:
assert(false); /* Unreachable */
return INTR_TYPE_EL3;
}
} }
/* /*
@ -234,7 +244,25 @@ int plat_ic_has_interrupt_type(unsigned int type)
void plat_ic_set_interrupt_type(unsigned int id, unsigned int type) void plat_ic_set_interrupt_type(unsigned int id, unsigned int type)
{ {
gicv3_set_interrupt_type(id, plat_my_core_pos(), type); unsigned int group;
switch (type) {
case INTR_TYPE_EL3:
group = INTR_GROUP0;
break;
case INTR_TYPE_S_EL1:
group = INTR_GROUP1S;
break;
case INTR_TYPE_NS:
group = INTR_GROUP1NS;
break;
default:
assert(false); /* Unreachable */
group = INTR_GROUP0;
break;
}
gicv3_set_interrupt_group(id, plat_my_core_pos(), group);
} }
void plat_ic_raise_el3_sgi(int sgi_num, u_register_t target) void plat_ic_raise_el3_sgi(int sgi_num, u_register_t target)