Currently, gic_read_iar is only used to read the irqn. Additionally, gic_read_iar implementation for arm applies a mask that hides some bits of the IAR register.
Let's rename gic_read_iar to gic_read_iar_irqn to make it more obvious what this function actually does. Signed-off-by: Ralf Ramsauer <[email protected]> --- hypervisor/arch/arm-common/include/asm/gic_v2.h | 2 +- hypervisor/arch/arm-common/irqchip.c | 2 +- hypervisor/arch/arm/include/asm/gic_v3.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hypervisor/arch/arm-common/include/asm/gic_v2.h b/hypervisor/arch/arm-common/include/asm/gic_v2.h index ab9bea87..d710ab7a 100644 --- a/hypervisor/arch/arm-common/include/asm/gic_v2.h +++ b/hypervisor/arch/arm-common/include/asm/gic_v2.h @@ -114,7 +114,7 @@ static inline void gic_write_lr(unsigned int i, u32 value) mmio_write32(gich_base + GICH_LR_BASE + i * 4, value); } -static inline u32 gic_read_iar(void) +static inline u32 gic_read_iar_irqn(void) { extern void *gicc_base; diff --git a/hypervisor/arch/arm-common/irqchip.c b/hypervisor/arch/arm-common/irqchip.c index 642f126a..de864e8c 100644 --- a/hypervisor/arch/arm-common/irqchip.c +++ b/hypervisor/arch/arm-common/irqchip.c @@ -238,7 +238,7 @@ void irqchip_handle_irq(struct per_cpu *cpu_data) while (1) { /* Read IAR1: set 'active' state */ - irq_id = gic_read_iar(); + irq_id = gic_read_iar_irqn(); if (irq_id == 0x3ff) /* Spurious IRQ */ break; diff --git a/hypervisor/arch/arm/include/asm/gic_v3.h b/hypervisor/arch/arm/include/asm/gic_v3.h index d1b9346d..650a81d4 100644 --- a/hypervisor/arch/arm/include/asm/gic_v3.h +++ b/hypervisor/arch/arm/include/asm/gic_v3.h @@ -255,7 +255,7 @@ static inline void gic_write_lr(unsigned int n, u64 val) } } -static inline u32 gic_read_iar(void) +static inline u32 gic_read_iar_irqn(void) { u32 irq_id; -- 2.14.1 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
