Commit d5fb8213 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 fixes from Thomas Gleixner:
 "This contains:

   - a series of fixes for interrupt drivers to prevent a potential race
     when installing a chained interrupt handler

   - a fix for cpumask pointer misuse

   - a fix for using the wrong interrupt number from struct irq_data

   - removal of unused code and outdated comments

   - a few new helper functions which allow us to cleanup the interrupt
     handling code further in 4.3

   I decided against doing the cleanup at the end of this merge window
   and rather do the preparatory steps for 4.3, so we can run the final
   ABI change at the end of the 4.3 merge window with less risk"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
  ARM/LPC32xx: Use irq not hwirq for __irq_set_handler_locked()
  genirq: Implement irq_set_handler_locked()/irq_set_chip_handler_name_locked()
  genirq: Introduce helper irq_desc_get_irq()
  genirq: Remove irq_node()
  genirq: Clean up outdated comments related to include/linux/irqdesc.h
  mn10300: Fix incorrect use of irq_data->affinity
  MIPS/ralink: Fix race in installing chained IRQ handler
  MIPS/pci: Fix race in installing chained IRQ handler
  MIPS/ath25: Fix race in installing chained IRQ handler
  MIPS/ath25: Fix race in installing chained IRQ handler
  m68k/psc: Fix race in installing chained IRQ handler
  avr32/at32ap: Fix race in installing chained IRQ handler
  sh/intc: Fix race in installing chained IRQ handler
  sh/intc: Fix potential race in installing chained IRQ handler
  pinctrl/sun4i: Fix race in installing chained IRQ handler
  pinctrl/samsung: Fix race in installing chained IRQ handler
  pinctrl/samsung: Fix race in installing chained IRQ handler
  pinctrl/exynos: Fix race in installing chained IRQ handler
  pinctrl/st: Fix race in installing chained IRQ handler
  pinctrl/adi2: Fix race in installing chained IRQ handler
  ...
parents 8fff7755 93b6eb77

arch/arm/mach-lpc32xx/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -283,25 +283,25 @@ static int lpc32xx_set_irq_type(struct irq_data *d, unsigned int type) 
	case IRQ_TYPE_EDGE_RISING:

		/* Rising edge sensitive */

		__lpc32xx_set_irq_type(d->hwirq, 1, 1);

		__irq_set_handler_locked(d->hwirq, handle_edge_irq);

		__irq_set_handler_locked(d->irq, handle_edge_irq);

		break;



	case IRQ_TYPE_EDGE_FALLING:

		/* Falling edge sensitive */

		__lpc32xx_set_irq_type(d->hwirq, 0, 1);

		__irq_set_handler_locked(d->hwirq, handle_edge_irq);

		__irq_set_handler_locked(d->irq, handle_edge_irq);

		break;



	case IRQ_TYPE_LEVEL_LOW:

		/* Low level sensitive */

		__lpc32xx_set_irq_type(d->hwirq, 0, 0);

		__irq_set_handler_locked(d->hwirq, handle_level_irq);

		__irq_set_handler_locked(d->irq, handle_level_irq);

		break;



	case IRQ_TYPE_LEVEL_HIGH:

		/* High level sensitive */

		__lpc32xx_set_irq_type(d->hwirq, 1, 0);

		__irq_set_handler_locked(d->hwirq, handle_level_irq);

		__irq_set_handler_locked(d->irq, handle_level_irq);

		break;



	/* Other modes are not supported */

arch/avr32/mach-at32ap/extint.c

+1 −2
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ static int __init eic_probe(struct platform_device *pdev) 
		irq_set_chip_data(eic->first_irq + i, eic);

	}



	irq_set_chained_handler(int_irq, demux_eic_irq);

	irq_set_handler_data(int_irq, eic);

	irq_set_chained_handler_and_data(int_irq, demux_eic_irq, eic);



	if (pdev->id == 0) {

		nmi_eic = eic;

arch/m68k/mac/psc.c

+4 −8
Original line number Diff line number Diff line
@@ -148,14 +148,10 @@ static void psc_irq(unsigned int irq, struct irq_desc *desc) 


void __init psc_register_interrupts(void)

{

	irq_set_chained_handler(IRQ_AUTO_3, psc_irq);

	irq_set_handler_data(IRQ_AUTO_3, (void *)0x30);

	irq_set_chained_handler(IRQ_AUTO_4, psc_irq);

	irq_set_handler_data(IRQ_AUTO_4, (void *)0x40);

	irq_set_chained_handler(IRQ_AUTO_5, psc_irq);

	irq_set_handler_data(IRQ_AUTO_5, (void *)0x50);

	irq_set_chained_handler(IRQ_AUTO_6, psc_irq);

	irq_set_handler_data(IRQ_AUTO_6, (void *)0x60);

	irq_set_chained_handler_and_data(IRQ_AUTO_3, psc_irq, (void *)0x30);

	irq_set_chained_handler_and_data(IRQ_AUTO_4, psc_irq, (void *)0x40);

	irq_set_chained_handler_and_data(IRQ_AUTO_5, psc_irq, (void *)0x50);

	irq_set_chained_handler_and_data(IRQ_AUTO_6, psc_irq, (void *)0x60);

}



void psc_irq_enable(int irq) {

arch/mips/ath25/ar2315.c

+2 −2
Original line number Diff line number Diff line
@@ -161,8 +161,8 @@ void __init ar2315_arch_init_irq(void) 
	irq = irq_create_mapping(domain, AR2315_MISC_IRQ_AHB);

	setup_irq(irq, &ar2315_ahb_err_interrupt);



	irq_set_chained_handler(AR2315_IRQ_MISC, ar2315_misc_irq_handler);

	irq_set_handler_data(AR2315_IRQ_MISC, domain);

	irq_set_chained_handler_and_data(AR2315_IRQ_MISC,

					 ar2315_misc_irq_handler, domain);



	ar2315_misc_irq_domain = domain;

}

arch/mips/ath25/ar5312.c

+2 −2
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ void __init ar5312_arch_init_irq(void) 
	irq = irq_create_mapping(domain, AR5312_MISC_IRQ_AHB_PROC);

	setup_irq(irq, &ar5312_ahb_err_interrupt);



	irq_set_chained_handler(AR5312_IRQ_MISC, ar5312_misc_irq_handler);

	irq_set_handler_data(AR5312_IRQ_MISC, domain);

	irq_set_chained_handler_and_data(AR5312_IRQ_MISC,

					 ar5312_misc_irq_handler, domain);



	ar5312_misc_irq_domain = domain;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE