Commit 5fee0daf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Borislav Petkov:

 - Restore the original buslock locking in a couple of places in the irq
   core subsystem after a rework

* tag 'irq_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq/manage: Add buslock back in to enable_irq()
  genirq/manage: Add buslock back in to __disable_irq_nosync()
  genirq/chip: Add buslock back in to irq_set_handler()
parents af815951 ef3330b9

kernel/irq/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle, 
void __irq_set_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,

		       const char *name)

{

	scoped_irqdesc_get_and_lock(irq, 0)

	scoped_irqdesc_get_and_buslock(irq, 0)

		__irq_do_set_handler(scoped_irqdesc, handle, is_chained, name);

}

EXPORT_SYMBOL_GPL(__irq_set_handler);

kernel/irq/manage.c

+2 −2
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ void __disable_irq(struct irq_desc *desc) 


static int __disable_irq_nosync(unsigned int irq)

{

	scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {

	scoped_irqdesc_get_and_buslock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {

		__disable_irq(scoped_irqdesc);

		return 0;

	}
@@ -789,7 +789,7 @@ void __enable_irq(struct irq_desc *desc) 
 */

void enable_irq(unsigned int irq)

{

	scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {

	scoped_irqdesc_get_and_buslock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {

		struct irq_desc *desc = scoped_irqdesc;



		if (WARN(!desc->irq_data.chip, "enable_irq before setup/request_irq: irq %u\n", irq))