]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
irqchip/gic-v5: Skip deactivate for forwarded PPI interrupts
authorSascha Bischoff <Sascha.Bischoff@arm.com>
Fri, 27 Jun 2025 10:09:01 +0000 (10:09 +0000)
committerOliver Upton <oliver.upton@linux.dev>
Tue, 8 Jul 2025 21:40:58 +0000 (14:40 -0700)
If a PPI interrupt is forwarded to a guest, skip the deactivate and
only EOI. Rely on the guest deactivating both the virtual and physical
interrupts (due to ICH_LRx_EL2.HW being set) later on as part of
handling the injected interrupt. This mimics the behaviour seen on
native GICv3.

This is part of adding support for the GICv3 compatibility mode on a
GICv5 host.

Reviewed-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Co-authored-by: Timothy Hayes <timothy.hayes@arm.com>
Signed-off-by: Timothy Hayes <timothy.hayes@arm.com>
Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com>
Link: https://lore.kernel.org/r/20250627100847.1022515-2-sascha.bischoff@arm.com
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
drivers/irqchip/irq-gic-v5.c

index a9e3e75adb968fd5cba2a62334ec59b342fcc5aa..0e4789818131d9f4cf14025d2df97dcb6d946b0b 100644 (file)
@@ -222,6 +222,12 @@ static void gicv5_hwirq_eoi(u32 hwirq_id, u8 hwirq_type)
 
 static void gicv5_ppi_irq_eoi(struct irq_data *d)
 {
+       /* Skip deactivate for forwarded PPI interrupts */
+       if (irqd_is_forwarded_to_vcpu(d)) {
+               gic_insn(0, CDEOI);
+               return;
+       }
+
        gicv5_hwirq_eoi(d->hwirq, GICV5_HWIRQ_TYPE_PPI);
 }
 
@@ -503,6 +509,16 @@ static bool gicv5_ppi_irq_is_level(irq_hw_number_t hwirq)
        return !!(read_ppi_sysreg_s(hwirq, PPI_HM) & bit);
 }
 
+static int gicv5_ppi_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu)
+{
+       if (vcpu)
+               irqd_set_forwarded_to_vcpu(d);
+       else
+               irqd_clr_forwarded_to_vcpu(d);
+
+       return 0;
+}
+
 static const struct irq_chip gicv5_ppi_irq_chip = {
        .name                   = "GICv5-PPI",
        .irq_mask               = gicv5_ppi_irq_mask,
@@ -510,6 +526,7 @@ static const struct irq_chip gicv5_ppi_irq_chip = {
        .irq_eoi                = gicv5_ppi_irq_eoi,
        .irq_get_irqchip_state  = gicv5_ppi_irq_get_irqchip_state,
        .irq_set_irqchip_state  = gicv5_ppi_irq_set_irqchip_state,
+       .irq_set_vcpu_affinity  = gicv5_ppi_irq_set_vcpu_affinity,
        .flags                  = IRQCHIP_SKIP_SET_WAKE   |
                                  IRQCHIP_MASK_ON_SUSPEND,
 };