Skip to content

Commit

Permalink
Merge tag 'irq_urgent_for_v6.12_rc7' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…linux/kernel/git/tip/tip

Pull irq fix from Borislav Petkov:

 - Make sure GICv3 controller interrupt activation doesn't race with a
   concurrent deactivation due to propagation delays of the register
   write

* tag 'irq_urgent_for_v6.12_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v3: Force propagation of the active state with a read-back
  • Loading branch information
Linus Torvalds committed Nov 10, 2024
2 parents 28e4319 + 464cb98 commit a9cda7c
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/irqchip/irq-gic-v3.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,13 @@ static int gic_irq_set_irqchip_state(struct irq_data *d,
}

gic_poke_irq(d, reg);

/*
* Force read-back to guarantee that the active state has taken
* effect, and won't race with a guest-driven deactivation.
*/
if (reg == GICD_ISACTIVER)
gic_peek_irq(d, reg);
return 0;
}

Expand Down

0 comments on commit a9cda7c

Please sign in to comment.