Was always set to 0.
Signed-off-by: Jan Kiszka <[email protected]>
---
hypervisor/arch/arm/gic-v2.c | 2 --
hypervisor/arch/arm/include/asm/irqchip.h | 4 ----
hypervisor/arch/arm/irqchip.c | 4 +---
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/hypervisor/arch/arm/gic-v2.c b/hypervisor/arch/arm/gic-v2.c
index 9268191..88024b4 100644
--- 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 a6d2a0c..6d94c19 100644
--- 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 72c1364..d2dc445 100644
--- 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;
}
--
2.1.4
--
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.
