arm: Remove cpuid from pending_irq

Was always set to 0.

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 926819165fb2b351a56979fdb7e368db81157d5c..88024b448edfdb1afe7909bd0d757c92d558d7a0 100644 (file)
--- a/hypervisor/arch/arm/gic-v2.c
+++ b/hypervisor/arch/arm/gic-v2.c
@@ -268,8 +268,6 @@ static int gic_inject_irq(struct per_cpu *cpu_data, struct pending_irq *irq)
        if (!is_sgi(irq->virt_id)) {
                lr |= GICH_LR_HW_BIT;
                lr |= irq->type.irq << GICH_LR_PHYS_ID_SHIFT;
-       } else {
-               lr |= irq->type.sgi.cpuid << GICH_LR_CPUID_SHIFT;
        }
 
        gic_write_lr(first_free, lr);

diff --git a/hypervisor/arch/arm/include/asm/irqchip.h b/hypervisor/arch/arm/include/asm/irqchip.h
index a6d2a0c6210346569076d024bb9fdcfbf08531ea..6d94c19f18d5db4adfed1e25f775e77058e7d5bf 100644 (file)
--- a/hypervisor/arch/arm/include/asm/irqchip.h
+++ b/hypervisor/arch/arm/include/asm/irqchip.h
@@ -67,10 +67,6 @@ struct pending_irq {
        union {
                /* Physical id, when hw is 1 */
                u16 irq;
-               struct {
-                       /* GICv2 needs cpuid for SGIs */
-                       u16 cpuid       : 15;
-               } sgi __attribute__((packed));
        } type;
 
        struct pending_irq *next;

diff --git a/hypervisor/arch/arm/irqchip.c b/hypervisor/arch/arm/irqchip.c
index 72c13641c6d1a3997cb7a48714a7cc4083e0ce77..d2dc44518b7171e0341d9dcb5d7a2f9b4bf48041 100644 (file)
--- a/hypervisor/arch/arm/irqchip.c
+++ b/hypervisor/arch/arm/irqchip.c
@@ -135,9 +135,7 @@ int irqchip_set_pending(struct per_cpu *cpu_data, u32 irq_id, bool try_inject)
 
        pending.virt_id = irq_id;
 
-       if (is_sgi(irq_id)) {
-               pending.type.sgi.cpuid = 0;
-       } else {
+       if (!is_sgi(irq_id)) {
                pending.type.irq = irq_id;
        }