Commit 148311d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fix from Ingo Molnar.

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Allow irq chips to mark themself oneshot safe
parents d97e1dcd dc9b229a

include/linux/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ enum { 
	IRQCHIP_MASK_ON_SUSPEND		= (1 <<  2),

	IRQCHIP_ONOFFLINE_ENABLED	= (1 <<  3),

	IRQCHIP_SKIP_SET_WAKE		= (1 <<  4),

	IRQCHIP_ONESHOT_SAFE		= (1 <<  5),

};



/* This include will go away once we isolated irq_desc usage to core code */

kernel/irq/manage.c

+14 −1
Original line number Diff line number Diff line
@@ -943,6 +943,18 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
		goto out_thread;

	}



	/*

	 * Drivers are often written to work w/o knowledge about the

	 * underlying irq chip implementation, so a request for a

	 * threaded irq without a primary hard irq context handler

	 * requires the ONESHOT flag to be set. Some irq chips like

	 * MSI based interrupts are per se one shot safe. Check the

	 * chip flags, so we can avoid the unmask dance at the end of

	 * the threaded handler for those.

	 */

	if (desc->irq_data.chip->flags & IRQCHIP_ONESHOT_SAFE)

		new->flags &= ~IRQF_ONESHOT;



	/*

	 * The following block of code has to be executed atomically

	 */
@@ -1017,7 +1029,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
		 */

		new->thread_mask = 1 << ffz(thread_mask);



	} else if (new->handler == irq_default_primary_handler) {

	} else if (new->handler == irq_default_primary_handler &&

		   !(desc->irq_data.chip->flags & IRQCHIP_ONESHOT_SAFE)) {

		/*

		 * The interrupt was requested with handler = NULL, so

		 * we use the default primary handler for it. But it