arm: Remove maintenance flag from pending_irq.type.sgi

It was always cleared.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/arch/arm/gic-v2.c b/hypervisor/arch/arm/gic-v2.c
index 9eb6bdebe48f7da35c08414285aaeeaed689390b..65727b0d506f7aedabd300e88f50daff487df37c 100644 (file)
--- a/hypervisor/arch/arm/gic-v2.c
+++ b/hypervisor/arch/arm/gic-v2.c
@@ -270,8 +270,6 @@ static int gic_inject_irq(struct per_cpu *cpu_data, struct pending_irq *irq)
                lr |= irq->type.irq << GICH_LR_PHYS_ID_SHIFT;
        } else {
                lr |= irq->type.sgi.cpuid << GICH_LR_CPUID_SHIFT;
-               if (irq->type.sgi.maintenance)
-                       lr |= GICH_LR_SGI_EOI_BIT;
        }
 
        gic_write_lr(first_free, lr);

diff --git a/hypervisor/arch/arm/gic-v3.c b/hypervisor/arch/arm/gic-v3.c
index 320caf4d0d8e24684a941669d450cf51f257c800..467f22257d0fefa05f626d56fd011abcb3a8fbc0 100644 (file)
--- a/hypervisor/arch/arm/gic-v3.c
+++ b/hypervisor/arch/arm/gic-v3.c
@@ -390,8 +390,6 @@ static int gic_inject_irq(struct per_cpu *cpu_data, struct pending_irq *irq)
        if (irq->hw) {
                lr |= ICH_LR_HW_BIT;
                lr |= (u64)irq->type.irq << ICH_LR_PHYS_ID_SHIFT;
-       } else if (irq->type.sgi.maintenance) {
-               lr |= ICH_LR_SGI_EOI;
        }
 
        gic_write_lr(free_lr, lr);

diff --git a/hypervisor/arch/arm/include/asm/irqchip.h b/hypervisor/arch/arm/include/asm/irqchip.h
index 02da6bba366edd64af34b6cd796cc29ff68097d1..c468b70b5f0dd79a8605a1aa91788b86b3157a16 100644 (file)
--- a/hypervisor/arch/arm/include/asm/irqchip.h
+++ b/hypervisor/arch/arm/include/asm/irqchip.h
@@ -71,8 +71,6 @@ struct pending_irq {
                struct {
                        /* GICv2 needs cpuid for SGIs */
                        u16 cpuid       : 15;
-                       /* EOI generates a maintenance irq */
-                       u16 maintenance : 1;
                } sgi __attribute__((packed));
        } type;
 

diff --git a/hypervisor/arch/arm/irqchip.c b/hypervisor/arch/arm/irqchip.c
index a80577f9d801fe4f27143c864367013cdeb973a9..e0871b1ca1794d40795c5a4af2753e5d63bb3a15 100644 (file)
--- a/hypervisor/arch/arm/irqchip.c
+++ b/hypervisor/arch/arm/irqchip.c
@@ -137,7 +137,6 @@ int irqchip_set_pending(struct per_cpu *cpu_data, u32 irq_id, bool try_inject)
 
        if (is_sgi(irq_id)) {
                pending.hw = 0;
-               pending.type.sgi.maintenance = 0;
                pending.type.sgi.cpuid = 0;
        } else {
                pending.hw = 1;