2 files changed, 4 insertions, 0 deletions

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index f1fd5f44d1d4..586929d072ca 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -7,6 +7,7 @@ config ARM_GIC
         select IRQ_DOMAIN
         select IRQ_DOMAIN_HIERARCHY
         select MULTI_IRQ_HANDLER
+        select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 
 config ARM_GIC_PM
         bool
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 1b1df4f770bd..20dd2ba3d603 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -344,6 +344,8 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
         writel_relaxed(val | bit, reg);
         gic_unlock_irqrestore(flags);
 
+        irq_data_update_effective_affinity(d, cpumask_of(cpu));
+
         return IRQ_SET_MASK_OK_DONE;
 }
 #endif
@@ -966,6 +968,7 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq,
                 irq_domain_set_info(d, irq, hw, &gic->chip, d->host_data,
                                     handle_fasteoi_irq, NULL, NULL);
                 irq_set_probe(irq);
+                irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(irq)));
         }
         return 0;
 }