Commit 2d385336 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-core-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq updates from Thomas Gleixner:
 "Updates for the interrupt subsystem:

  Treewide:

    - Cleanup of setup_irq() which is not longer required because the
      memory allocator is available early.

      Most cleanup changes come through the various maintainer trees, so
      the final removal of setup_irq() is postponed towards the end of
      the merge window.

  Core:

    - Protection against unsafe invocation of interrupt handlers and
      unsafe interrupt injection including a fixup of the offending
      PCI/AER error injection mechanism.

      Invoking interrupt handlers from arbitrary contexts, i.e. outside
      of an actual interrupt, can cause inconsistent state on the
      fragile x86 interrupt affinity changing hardware trainwreck.

  Drivers:

    - Second wave of support for the new ARM GICv4.1

    - Multi-instance support for Xilinx and PLIC interrupt controllers

    - CPU-Hotplug support for PLIC

    - The obligatory new driver for X1000 TCU

    - Enhancements, cleanups and fixes all over the place"

* tag 'irq-core-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (58 commits)
  unicore32: Replace setup_irq() by request_irq()
  sh: Replace setup_irq() by request_irq()
  hexagon: Replace setup_irq() by request_irq()
  c6x: Replace setup_irq() by request_irq()
  alpha: Replace setup_irq() by request_irq()
  irqchip/gic-v4.1: Eagerly vmap vPEs
  irqchip/gic-v4.1: Add VSGI property setup
  irqchip/gic-v4.1: Add VSGI allocation/teardown
  irqchip/gic-v4.1: Move doorbell management to the GICv4 abstraction layer
  irqchip/gic-v4.1: Plumb set_vcpu_affinity SGI callbacks
  irqchip/gic-v4.1: Plumb get/set_irqchip_state SGI callbacks
  irqchip/gic-v4.1: Plumb mask/unmask SGI callbacks
  irqchip/gic-v4.1: Add initial SGI configuration
  irqchip/gic-v4.1: Plumb skeletal VSGI irqchip
  irqchip/stm32: Retrigger both in eoi and unmask callbacks
  irqchip/gic-v3: Move irq_domain_update_bus_token to after checking for NULL domain
  irqchip/xilinx: Do not call irq_set_default_host()
  irqchip/xilinx: Enable generic irq multi handler
  irqchip/xilinx: Fill error code when irq domain registration fails
  irqchip/xilinx: Add support for multiple instances
  ...
parents 673b41e0 8a13b02a

arch/alpha/kernel/irq_alpha.c

+5 −24
Original line number Diff line number Diff line
@@ -213,32 +213,13 @@ process_mcheck_info(unsigned long vector, unsigned long la_ptr, 
 * The special RTC interrupt type.  The interrupt itself was

 * processed by PALcode, and comes in via entInt vector 1.

 */



struct irqaction timer_irqaction = {

	.handler	= rtc_timer_interrupt,

	.name		= "timer",

};



void __init

init_rtc_irq(void)

init_rtc_irq(irq_handler_t handler)

{

	irq_set_chip_and_handler_name(RTC_IRQ, &dummy_irq_chip,

				      handle_percpu_irq, "RTC");

	setup_irq(RTC_IRQ, &timer_irqaction);

	if (!handler)

		handler = rtc_timer_interrupt;

	if (request_irq(RTC_IRQ, handler, 0, "timer", NULL))

		pr_err("Failed to register timer interrupt\n");

}
 


/* Dummy irqactions.  */

struct irqaction isa_cascade_irqaction = {

	.handler	= no_action,

	.name		= "isa-cascade"

};



struct irqaction timer_cascade_irqaction = {

	.handler	= no_action,

	.name		= "timer-cascade"

};



struct irqaction halt_switch_irqaction = {

	.handler	= no_action,

	.name		= "halt-switch"

};

arch/alpha/kernel/irq_i8259.c

+2 −6
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ struct irq_chip i8259a_irq_type = { 
void __init

init_i8259a_irqs(void)

{

	static struct irqaction cascade = {

		.handler	= no_action,

		.name		= "cascade",

	};



	long i;



	outb(0xff, 0x21);	/* mask all of 8259A-1 */
@@ -96,7 +91,8 @@ init_i8259a_irqs(void) 
		irq_set_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);

	}



	setup_irq(2, &cascade);

	if (request_irq(2, no_action, 0, "cascade", NULL))

		pr_err("Failed to request irq 2 (cascade)\n");

}

arch/alpha/kernel/irq_impl.h

+1 −6
Original line number Diff line number Diff line
@@ -21,14 +21,9 @@ extern void isa_no_iack_sc_device_interrupt(unsigned long); 
extern void srm_device_interrupt(unsigned long);

extern void pyxis_device_interrupt(unsigned long);



extern struct irqaction timer_irqaction;

extern struct irqaction isa_cascade_irqaction;

extern struct irqaction timer_cascade_irqaction;

extern struct irqaction halt_switch_irqaction;



extern void init_srm_irqs(long, unsigned long);

extern void init_pyxis_irqs(unsigned long);

extern void init_rtc_irq(void);

extern void init_rtc_irq(irq_handler_t  handler);



extern void common_init_isa_dma(void);

arch/alpha/kernel/irq_pyxis.c

+2 −1
Original line number Diff line number Diff line
@@ -107,5 +107,6 @@ init_pyxis_irqs(unsigned long ignore_mask) 
		irq_set_status_flags(i, IRQ_LEVEL);

	}



	setup_irq(16+7, &isa_cascade_irqaction);

	if (request_irq(16 + 7, no_action, 0, "isa-cascade", NULL))

		pr_err("Failed to register isa-cascade interrupt\n");

}

arch/alpha/kernel/sys_alcor.c

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ alcor_init_irq(void) 
	init_i8259a_irqs();

	common_init_isa_dma();



	setup_irq(16+31, &isa_cascade_irqaction);

	if (request_irq(16 + 31, no_action, 0, "isa-cascade", NULL))

		pr_err("Failed to register isa-cascade interrupt\n");

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE