Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6580525 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull irq updates from Thomas Gleixner:
 "The irq department delivers:

   - new core infrastructure to allow better management of multi-queue
     devices (interrupt spreading, node aware descriptor allocation ...)

   - a new interrupt flow handler to support the new fangled Intel VMD
     devices.

   - yet another new interrupt controller driver.

   - a series of fixes which addresses sparse warnings, missing
     includes, missing static declarations etc from Ben Dooks.

   - a fix for the error handling in the hierarchical domain allocation
     code.

   - the usual pile of small updates to core and driver code"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  genirq: Fix missing irq allocation affinity hint
  irqdomain: Fix irq_domain_alloc_irqs_recursive() error handling
  irq/Documentation: Correct result of echnoing 5 to smp_affinity
  MAINTAINERS: Remove Jiang Liu from irq domains
  genirq/msi: Fix broken debug output
  genirq: Add a helper to spread an affinity mask for MSI/MSI-X vectors
  genirq/msi: Make use of affinity aware allocations
  genirq: Use affinity hint in irqdesc allocation
  genirq: Add affinity hint to irq allocation
  genirq: Introduce IRQD_AFFINITY_MANAGED flag
  genirq/msi: Remove unused MSI_FLAG_IDENTITY_MAP
  irqchip/s3c24xx: Fixup IO accessors for big endian
  irqchip/exynos-combiner: Fix usage of __raw IO
  irqdomain: Fix disposal of mappings for interrupt hierarchies
  irqchip/aspeed-vic: Add irq controller for Aspeed
  doc/devicetree: Add Aspeed VIC bindings
  x86/PCI/VMD: Use untracked irq handler
  genirq: Add untracked irq handler
  irqchip/mips-gic: Populate irq_domain names
  irqchip/gicv3-its: Implement two-level(indirect) device table support
  ...
parents 55392c4c eb0dc47a

Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Main node required properties: 
	"arm,pl390"

	"arm,tc11mp-gic"

	"brcm,brahma-b15-gic"

	"nvidia,tegra210-agic"

	"qcom,msm-8660-qgic"

	"qcom,msm-qgic2"

- interrupt-controller : Identifies the node as an interrupt controller
@@ -68,7 +69,7 @@ Optional 
	"ic_clk" (for "arm,arm11mp-gic")

	"PERIPHCLKEN" (for "arm,cortex-a15-gic")

	"PERIPHCLK", "PERIPHCLKEN" (for "arm,cortex-a9-gic")

	"clk" (for "arm,gic-400")

	"clk" (for "arm,gic-400" and "nvidia,tegra210")

	"gclk" (for "arm,pl390")



- power-domains : A phandle and PM domain specifier as defined by bindings of

Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Aspeed Vectored Interrupt Controller



These bindings are for the Aspeed AST2400 interrupt controller register layout.

The SoC has an legacy register layout, but this driver does not support that

mode of operation.



Required properties:



- compatible : should be "aspeed,ast2400-vic".



- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : Specifies the number of cells needed to encode an

  interrupt source. The value shall be 1.



Example:



 vic: interrupt-controller@1e6c0080 {

      compatible = "aspeed,ast2400-vic";

      interrupt-controller;

      #interrupt-cells = <1>;

      reg = <0x1e6c0080 0x80>;

 };

Documentation/filesystems/proc.txt

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ IRQ, you can set it by doing: 
  > echo 1 > /proc/irq/10/smp_affinity



This means that only the first CPU will handle the IRQ, but you can also echo

5 which means that only the first and fourth CPU can handle the IRQ.

5 which means that only the first and third CPU can handle the IRQ.



The contents of each smp_affinity file is the same by default:

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -6235,7 +6235,6 @@ F: Documentation/devicetree/bindings/interrupt-controller/ 
F:	drivers/irqchip/



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Jiang Liu <jiang.liu@linux.intel.com>

M:	Marc Zyngier <marc.zyngier@arm.com>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

arch/sparc/kernel/irq_64.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ unsigned int irq_alloc(unsigned int dev_handle, unsigned int dev_ino) 
{

	int irq;



	irq = __irq_alloc_descs(-1, 1, 1, numa_node_id(), NULL);

	irq = __irq_alloc_descs(-1, 1, 1, numa_node_id(), NULL, NULL);

	if (irq <= 0)

		goto out;