irqchip/sifive-plic: Respect mask state when setting affinity

[ Upstream commit adecf78df945f4c7a1d29111b0002827f487df51 ]

plic_set_affinity() always calls plic_irq_enable(), which clears up the
priority setting even the interrupt is only masked. This unmasks the
interrupt unexpectly.

Replace the plic_irq_enable/disable() with plic_irq_toggle() to avoid
changing the priority setting.

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Nam Cao <namcao@linutronix.de> # VisionFive 2
Tested-by: Chen Wang <unicorn_wang@outlook.com> # Pioneerbox
Reviewed-by: Nam Cao <namcao@linutronix.de>
Reviewed-by: Chen Wang <unicorn_wang@outlook.com>
Link: https://lore.kernel.org/all/20250811002633.55275-1-inochiama@gmail.com
Link: https://lore.kernel.org/lkml/20250722224513.22125-1-inochiama@gmail.com/
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index 9c4af7d58846318a66eb29c2fd9000f04603a7ca..c0cf4fed13e094cae596e34feaf484d810aa99a1 100644 (file)
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -179,12 +179,14 @@ static int plic_set_affinity(struct irq_data *d,
        if (cpu >= nr_cpu_ids)
                return -EINVAL;
 
-       plic_irq_disable(d);
+       /* Invalidate the original routing entry */
+       plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 0);
 
        irq_data_update_effective_affinity(d, cpumask_of(cpu));
 
+       /* Setting the new routing entry if irq is enabled */
        if (!irqd_irq_disabled(d))
-               plic_irq_enable(d);
+               plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 1);
 
        return IRQ_SET_MASK_OK_DONE;
 }