tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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/

authored by

Inochi Amaoto and committed by
Thomas Gleixner adecf78d b92ff23b

+4 -2
+4 -2
drivers/irqchip/irq-sifive-plic.c
··· 179 179 if (cpu >= nr_cpu_ids) 180 180 return -EINVAL; 181 181 182 - plic_irq_disable(d); 182 + /* Invalidate the original routing entry */ 183 + plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 0); 183 184 184 185 irq_data_update_effective_affinity(d, cpumask_of(cpu)); 185 186 187 + /* Setting the new routing entry if irq is enabled */ 186 188 if (!irqd_irq_disabled(d)) 187 - plic_irq_enable(d); 189 + plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 1); 188 190 189 191 return IRQ_SET_MASK_OK_DONE; 190 192 }