irq updates for 4.14
Subsystems (26)
Linus,
please pull the latest irq-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-core-for-linus
The interrupt subsystem delivers this time:
- Refactoring of the GIC-V3 driver to prepare for the GIC-V4 support
- Initial GIC-V4 support
- Consolidation of the FSL MSI support
- Utilize the effective affinity interface in various ARM irqchip drivers
- Yet another interrupt chip driver (UniPhier AIDET)
- Bulk conversion of the irq chip driver to use %pOF
- The usual small fixes and improvements all over the place
Thanks,
tglx
------------------>
Bartosz Golaszewski (2):
genirq/irq_sim: Add a simple interrupt simulator framework genirq/irq_sim: Add a devres variant of irq_sim_init()
Bhumika Goyal (2):
irqchip/gic: Make irq_chip const
irqchip/mmp: Make mmp_intc_conf const
Dan Carpenter (1):
irqdomain: Prevent potential NULL pointer dereference in irq_domain_push_irq()
David Daney (5):
genirq: Export more irq_chip_*_parent() functions
genirq: Add handle_fasteoi_{level,edge}_irq flow handlers
irqdomain: Factor out code to add and remove items to and from the revmap
irqdomain: Check for NULL function pointer in irq_domain_free_irqs_hierarchy()
irqdomain: Add irq_domain_{push,pop}_irq() functions
Florian Fainelli (1):
irqchip/irq-bcm7120-l2: Use correct I/O accessors for irq_fwd_mask
Marc Zyngier (51):
genirq/debugfs: Triggering of interrupts from userspace
genirq: Restrict effective affinity to interrupts actually using it genirq/proc: Use the the accessor to report the effective affinity irqchip/gic: Report that effective affinity is a single target irqchip/gic-v3: Report that effective affinity is a single target irqchip/gic-v3-its: Report that effective affinity is a single target irqchip/armada-370-xp: Report that effective affinity is a single target irqchip/bcm-6345-l1: Report that effective affinity is a single target irqchip/bcm-7038-l1: Report that effective affinity is a single target irqchip/metag-ext: Report that effective affinity is a single target irqchip/hip04: Report that effective affinity is a single target irqchip/mips-gic: Report that effective affinity is a single target irqchip/xtensa-mx: Report that effective affinity is a single target irqchip/gic-v3-its: Properly handle command queue wrapping
genirq: Let irq_set_vcpu_affinity() iterate over hierarchy irqchip/gic-v3: Add redistributor iterator
irqchip/gic-v3: Add VLPI/DirectLPI discovery irqchip/gic-v3-its: Move LPI definitions around irqchip/gic-v3-its: Add probing for VLPI properties irqchip/gic-v3-its: Macro-ize its_send_single_command irqchip/gic-v3-its: Implement irq_set_irqchip_state for pending state irqchip/gic-v3-its: Split out property table allocation irqchip/gic-v3-its: Allow use of indirect VCPU tables irqchip/gic-v3-its: Split out pending table allocation irqchip/gic-v3-its: Rework LPI freeing
irqchip/gic-v3-its: Generalize device table allocation irqchip/gic-v3-its: Generalize LPI configuration irqchip/gic-v4: Add management structure definitions irqchip/gic-v3-its: Add GICv4 ITS command definitions irqchip/gic-v3-its: Add VLPI configuration hook irqchip/gic-v3-its: Add VLPI map/unmap operations irqchip/gic-v3-its: Add VLPI configuration handling irqchip/gic-v3-its: Add VPE domain infrastructure irqchip/gic-v3-its: Add VPE irq domain allocation/teardown irqchip/gic-v3-its: Add VPE irq domain [de]activation irqchip/gic-v3-its: Add VPENDBASER/VPROPBASER accessors irqchip/gic-v3-its: Add VPE scheduling
irqchip/gic-v3-its: Add VPE invalidation hook irqchip/gic-v3-its: Add VPE affinity changes irqchip/gic-v3-its: Add VPE interrupt masking irqchip/gic-v3-its: Make LPI allocation optional on device creation irqchip/gic-v3-its: Add device proxy for VPE management if !DirectLpi irqchip/gic-v3-its: Move pending doorbell after VMOVP irqchip/gic-v3-its: Allow doorbell interrupts to be injected/cleared irqchip/gic-v3-its: Set implementation defined bit to enable VLPIs irqchip/gic-v4: Add per-VM VPE domain creation irqchip/gic-v4: Add VPE command interface
irqchip/gic-v4: Add VLPI configuration interface irqchip/gic-v4: Add some basic documentation irqchip/gic-v4: Enable low-level GICv4 operations irqchip/gic-v3: Advertise GICv4 support to KVM
Masahiro Yamada (2):
genirq: Fix for_each_action_of_desc() macro
irqchip: Add UniPhier AIDET irqchip driver
Minghuan Lian (9):
irqchip/ls-scfg-msi: Fix typo of MSI compatible strings
arm: dts: ls1021a: Fix typo of MSI compatible string
arm64: dts: ls1043a: Fix typo of MSI compatible string
arm: dts: ls1021a: Share all MSIs
arm64: dts: ls1043a: Share all MSIs
arm64: dts: ls1046a: Add MSI dts node irqchip/ls-scfg-msi: Add LS1046a MSI support irqchip/ls-scfg-msi: Add LS1043a v1.1 MSI support irqchip/ls-scfg-msi: Add MSI affinity support
Rob Herring (1):
irqchip: Convert to using %pOF instead of full_name
Stefan Roese (1):
irqchip/armada-370-xp: Enable MSI-X support
Thomas Gleixner (1):
genirq/proc: Avoid uninitalized variable warning
kbuild test robot (1):
genirq: Fix semicolon.cocci warnings
.../interrupt-controller/fsl,ls-scfg-msi.txt | 8 +- .../socionext,uniphier-aidet.txt | 32 + Documentation/driver-model/devres.txt | 1 + MAINTAINERS | 1 + arch/arm/boot/dts/ls1021a.dtsi | 8 +- arch/arm/include/asm/arch_gicv3.h | 34 + arch/arm/mach-hisi/Kconfig | 1 + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 12 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 31 + arch/arm64/include/asm/arch_gicv3.h | 7 + arch/metag/Kconfig | 1 + drivers/irqchip/Kconfig | 15 + drivers/irqchip/Makefile | 3 +- drivers/irqchip/irq-armada-370-xp.c | 5 +- drivers/irqchip/irq-bcm2835.c | 9 +- drivers/irqchip/irq-bcm2836.c | 5 +- drivers/irqchip/irq-bcm6345-l1.c | 3 + drivers/irqchip/irq-bcm7038-l1.c | 3 + drivers/irqchip/irq-bcm7120-l2.c | 10 +- drivers/irqchip/irq-crossbar.c | 6 +- drivers/irqchip/irq-digicolor.c | 8 +- drivers/irqchip/irq-dw-apb-ictl.c | 12 +- drivers/irqchip/irq-gic-v3-its-pci-msi.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 1508 ++++++++++++++++++-- drivers/irqchip/irq-gic-v3.c | 109 +- drivers/irqchip/irq-gic-v4.c | 225 +++ drivers/irqchip/irq-gic.c | 5 +- drivers/irqchip/irq-hip04.c | 3 + drivers/irqchip/irq-imx-gpcv2.c | 4 +- drivers/irqchip/irq-lpc32xx.c | 2 +- drivers/irqchip/irq-ls-scfg-msi.c | 256 +++- drivers/irqchip/irq-metag-ext.c | 4 + drivers/irqchip/irq-mips-gic.c | 10 +- drivers/irqchip/irq-mmp.c | 4 +- drivers/irqchip/irq-mtk-sysirq.c | 3 +- drivers/irqchip/irq-mxs.c | 4 +- drivers/irqchip/irq-stm32-exti.c | 8 +- drivers/irqchip/irq-sun4i.c | 6 +- drivers/irqchip/irq-tegra.c | 16 +- drivers/irqchip/irq-uniphier-aidet.c | 261 ++++ drivers/irqchip/irq-xilinx-intc.c | 4 +- drivers/irqchip/irq-xtensa-mx.c | 6 +- include/linux/irq.h | 7 +- include/linux/irq_sim.h | 44 + include/linux/irqchip/arm-gic-common.h | 2 + include/linux/irqchip/arm-gic-v3.h | 84 ++ include/linux/irqchip/arm-gic-v4.h | 105 ++ include/linux/irqdomain.h | 3 + kernel/irq/Kconfig | 9 + kernel/irq/Makefile | 1 + kernel/irq/chip.c | 109 ++ kernel/irq/debugfs.c | 50 +- kernel/irq/internals.h | 2 +- kernel/irq/irq_sim.c | 164 +++ kernel/irq/irqdomain.c | 230 ++- kernel/irq/manage.c | 14 +- kernel/irq/proc.c | 8 +- 57 files changed, 3188 insertions(+), 299 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.txt create mode 100644 drivers/irqchip/irq-gic-v4.c create mode 100644 drivers/irqchip/irq-uniphier-aidet.c create mode 100644 include/linux/irq_sim.h create mode 100644 include/linux/irqchip/arm-gic-v4.h create mode 100644 kernel/irq/irq_sim.c
Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt +5 -3
@@ -4,8 +4,10 @@ Required properties: - compatible: should be "fsl,<soc-name>-msi" to identify Layerscape PCIe MSI controller block such as: - "fsl,1s1021a-msi" - "fsl,1s1043a-msi" + "fsl,ls1021a-msi" + "fsl,ls1043a-msi" + "fsl,ls1046a-msi" + "fsl,ls1043a-v1.1-msi" - msi-controller: indicates that this is a PCIe MSI controller node - reg: physical base address of the controller and length of memory mapped. - interrupts: an interrupt to the parent interrupt controller.
@@ -23,7 +25,7 @@ MSI controller node Examples: msi1: msi-controller@1571000 { - compatible = "fsl,1s1043a-msi"; + compatible = "fsl,ls1043a-msi"; reg = <0x0 0x1571000 0x0 0x8>, msi-controller; interrupts = <0 116 0x4>;
Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.txt new file +32 -0
@@ -0,0 +1,32 @@ +UniPhier AIDET + +UniPhier AIDET (ARM Interrupt Detector) is an add-on block for ARM GIC (Generic +Interrupt Controller). GIC itself can handle only high level and rising edge +interrupts. The AIDET provides logic inverter to support low level and falling +edge interrupts. + +Required properties: +- compatible: Should be one of the following: + "socionext,uniphier-ld4-aidet" - for LD4 SoC + "socionext,uniphier-pro4-aidet" - for Pro4 SoC + "socionext,uniphier-sld8-aidet" - for sLD8 SoC + "socionext,uniphier-pro5-aidet" - for Pro5 SoC + "socionext,uniphier-pxs2-aidet" - for PXs2/LD6b SoC + "socionext,uniphier-ld11-aidet" - for LD11 SoC + "socionext,uniphier-ld20-aidet" - for LD20 SoC + "socionext,uniphier-pxs3-aidet" - for PXs3 SoC +- reg: Specifies offset and length of the register set for the device. +- interrupt-controller: Identifies the node as an interrupt controller +- #interrupt-cells : Specifies the number of cells needed to encode an interrupt + source. The value should be 2. The first cell defines the interrupt number + (corresponds to the SPI interrupt number of GIC). The second cell specifies + the trigger type as defined in interrupts.txt in this directory. + +Example: + + aidet: aidet@5fc20000 { + compatible = "socionext,uniphier-pro4-aidet"; + reg = <0x5fc20000 0x200>; + interrupt-controller; + #interrupt-cells = <2>; + };
Documentation/driver-model/devres.txt +1 -0
@@ -312,6 +312,7 @@ IRQ devm_irq_alloc_descs_from() devm_irq_alloc_generic_chip() devm_irq_setup_generic_chip() + devm_irq_sim_init() LED devm_led_classdev_register()
MAINTAINERS +1 -0
@@ -1993,6 +1993,7 @@ F: arch/arm64/boot/dts/socionext/ F: drivers/bus/uniphier-system-bus.c F: drivers/clk/uniphier/ F: drivers/i2c/busses/i2c-uniphier* +F: drivers/irqchip/irq-uniphier-aidet.c F: drivers/pinctrl/uniphier/ F: drivers/reset/reset-uniphier.c F: drivers/tty/serial/8250/8250_uniphier.c
arch/arm/boot/dts/ls1021a.dtsi +4 -4
@@ -129,14 +129,14 @@ }; msi1: msi-controller@1570e00 { - compatible = "fsl,1s1021a-msi"; + compatible = "fsl,ls1021a-msi"; reg = <0x0 0x1570e00 0x0 0x8>; msi-controller; interrupts = <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>; }; msi2: msi-controller@1570e08 { - compatible = "fsl,1s1021a-msi"; + compatible = "fsl,ls1021a-msi"; reg = <0x0 0x1570e08 0x0 0x8>; msi-controller; interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
@@ -699,7 +699,7 @@ bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ - msi-parent = <&msi1>; + msi-parent = <&msi1>, <&msi2>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
@@ -722,7 +722,7 @@ bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x48 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ - msi-parent = <&msi2>; + msi-parent = <&msi1>, <&msi2>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
arch/arm/include/asm/arch_gicv3.h +34 -0
@@ -276,6 +276,12 @@ static inline u64 __gic_readq_nonatomic(const volatile void __iomem *addr)#define gicr_write_pendbaser (v, c) __gic_writeq_nonatomic(v, c)/* +* GICR_xLPIR - only the lower bits are significant +*/ +#define gic_read_lpir (c) readl_relaxed(c) +#define gic_write_lpir (v, c) writel_relaxed(lower_32_bits(v), c) + +/* * GITS_TYPER is an ID register and doesn't need atomicity. */ #define gits_read_typer (c) __gic_readq_nonatomic(c)
@@ -291,5 +297,33 @@ static inline u64 __gic_readq_nonatomic(const volatile void __iomem *addr)*/ #define gits_write_cwriter (v, c) __gic_writeq_nonatomic(v, c) +/* +* GITS_VPROPBASER - hi and lo bits may be accessed independently. +*/ +#define gits_write_vpropbaser (v, c) __gic_writeq_nonatomic(v, c) + +/* +* GITS_VPENDBASER - the Valid bit must be cleared before changing +* anything else. +*/ +static inline void gits_write_vpendbaser (u64 val,void *__iomem addr) +{ +u32 tmp; + + tmp =readl_relaxed (addr +4 ); +if (tmp & (GICR_VPENDBASER_Valid >>32 )) { + tmp &= ~(GICR_VPENDBASER_Valid >>32 ); +writel_relaxed (tmp, addr +4 ); + } + +/* +* Use the fact that __gic_writeq_nonatomic writes the second +* half of the 64bit quantity after the first. +*/ +__gic_writeq_nonatomic (val, addr); +} + +#define gits_read_vpendbaser (c) __gic_readq_nonatomic(c) +#endif /* !__ASSEMBLY__ */ #endif /* !__ASM_ARCH_GICV3_H */
arch/arm/mach-hisi/Kconfig +1 -0
@@ -39,6 +39,7 @@ config ARCH_HIP04 select HAVE_ARM_ARCH_TIMER select MCPM if SMP select MCPM_QUAD_CLUSTER if SMP + select GENERIC_IRQ_EFFECTIVE_AFF_MASK help Support for Hisilicon HiP04 SoC family
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +6 -6
@@ -653,21 +653,21 @@ }; msi1: msi-controller1@1571000 { - compatible = "fsl,1s1043a-msi"; + compatible = "fsl,ls1043a-msi"; reg = <0x0 0x1571000 0x0 0x8>; msi-controller; interrupts = <0 116 0x4>; }; msi2: msi-controller2@1572000 { - compatible = "fsl,1s1043a-msi"; + compatible = "fsl,ls1043a-msi"; reg = <0x0 0x1572000 0x0 0x8>; msi-controller; interrupts = <0 126 0x4>; }; msi3: msi-controller3@1573000 { - compatible = "fsl,1s1043a-msi"; + compatible = "fsl,ls1043a-msi"; reg = <0x0 0x1573000 0x0 0x8>; msi-controller; interrupts = <0 160 0x4>;
@@ -689,7 +689,7 @@ bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ - msi-parent = <&msi1>; + msi-parent = <&msi1>, <&msi2>, <&msi3>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic 0 110 0x4>,
@@ -714,7 +714,7 @@ bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x48 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ - msi-parent = <&msi2>; + msi-parent = <&msi1>, <&msi2>, <&msi3>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic 0 120 0x4>,
@@ -739,7 +739,7 @@ bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x50 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ - msi-parent = <&msi3>; + msi-parent = <&msi1>, <&msi2>, <&msi3>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic 0 154 0x4>,
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +31 -0
@@ -630,6 +630,37 @@ interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clockgen 4 1>; }; + + msi1: msi-controller@1580000 { + compatible = "fsl,ls1046a-msi"; + msi-controller; + reg = <0x0 0x1580000 0x0 0x10000>; + interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; + }; + + msi2: msi-controller@1590000 { + compatible = "fsl,ls1046a-msi"; + msi-controller; + reg = <0x0 0x1590000 0x0 0x10000>; + interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; + }; + + msi3: msi-controller@15a0000 { + compatible = "fsl,ls1046a-msi"; + msi-controller; + reg = <0x0 0x15a0000 0x0 0x10000>; + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>; + }; + }; reserved-memory {
arch/arm64/include/asm/arch_gicv3.h +7 -0
@@ -116,6 +116,8 @@ static inline void gic_write_bpr1(u32 val)#define gic_read_typer (c) readq_relaxed(c)#define gic_write_irouter (v, c) writeq_relaxed(v, c) +#define gic_read_lpir (c) readq_relaxed(c) +#define gic_write_lpir (v, c) writeq_relaxed(v, c)#define gic_flush_dcache_to_poc (a,l) __flush_dcache_area((a), (l))
@@ -133,5 +135,10 @@ static inline void gic_write_bpr1(u32 val)#define gicr_write_pendbaser (v, c) writeq_relaxed(v, c)#define gicr_read_pendbaser (c) readq_relaxed(c) +#define gits_write_vpropbaser (v, c) writeq_relaxed(v, c) + +#define gits_write_vpendbaser (v, c) writeq_relaxed(v, c) +#define gits_read_vpendbaser (c) readq_relaxed(c) +#endif /* __ASSEMBLY__ */ #endif /* __ASM_ARCH_GICV3_H */
arch/metag/Kconfig +1 -0
@@ -26,6 +26,7 @@ config METAG select HAVE_SYSCALL_TRACEPOINTS select HAVE_UNDERSCORE_SYMBOL_PREFIX select IRQ_DOMAIN + select GENERIC_IRQ_EFFECTIVE_AFF_MASK select MODULES_USE_ELF_RELA select OF select OF_EARLY_FLATTREE
drivers/irqchip/Kconfig +15 -0
@@ -7,6 +7,7 @@ config ARM_GIC select IRQ_DOMAIN select IRQ_DOMAIN_HIERARCHY select MULTI_IRQ_HANDLER + select GENERIC_IRQ_EFFECTIVE_AFF_MASK config ARM_GIC_PM bool
@@ -34,6 +35,7 @@ config ARM_GIC_V3 select MULTI_IRQ_HANDLER select IRQ_DOMAIN_HIERARCHY select PARTITION_PERCPU + select GENERIC_IRQ_EFFECTIVE_AFF_MASK config ARM_GIC_V3_ITS bool
@@ -64,6 +66,7 @@ config ARMADA_370_XP_IRQ bool select GENERIC_IRQ_CHIP select PCI_MSI if PCI + select GENERIC_IRQ_EFFECTIVE_AFF_MASK config ALPINE_MSI bool
@@ -93,11 +96,13 @@ config BCM6345_L1_IRQ bool select GENERIC_IRQ_CHIP select IRQ_DOMAIN + select GENERIC_IRQ_EFFECTIVE_AFF_MASK config BCM7038_L1_IRQ bool select GENERIC_IRQ_CHIP select IRQ_DOMAIN + select GENERIC_IRQ_EFFECTIVE_AFF_MASK config BCM7120_L2_IRQ bool
@@ -136,6 +141,7 @@ config IRQ_MIPS_CPU select GENERIC_IRQ_IPI if SYS_SUPPORTS_MULTITHREADING select IRQ_DOMAIN select IRQ_DOMAIN_HIERARCHY if GENERIC_IRQ_IPI + select GENERIC_IRQ_EFFECTIVE_AFF_MASK config CLPS711X_IRQCHIP bool
@@ -217,6 +223,7 @@ config VERSATILE_FPGA_IRQ_NR config XTENSA_MX bool select IRQ_DOMAIN + select GENERIC_IRQ_EFFECTIVE_AFF_MASK config XILINX_INTC bool
@@ -306,3 +313,11 @@ config QCOM_IRQ_COMBINER help Say yes here to add support for the IRQ combiner devices embedded in Qualcomm Technologies chips. + +config IRQ_UNIPHIER_AIDET + bool "UniPhier AIDET support" if COMPILE_TEST + depends on ARCH_UNIPHIER || COMPILE_TEST + default ARCH_UNIPHIER + select IRQ_DOMAIN_HIERARCHY + help + Support for the UniPhier AIDET (ARM Interrupt Detector).
drivers/irqchip/Makefile +2 -1
@@ -28,7 +28,7 @@ obj-$(CONFIG_ARM_GIC_PM) += irq-gic-pm.o obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-common.o -obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o +obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o obj-$(CONFIG_HISILICON_IRQ_MBIGEN) += irq-mbigen.o obj-$(CONFIG_ARM_NVIC) += irq-nvic.o
@@ -78,3 +78,4 @@ obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o +obj-$(CONFIG_IRQ_UNIPHIER_AIDET) += irq-uniphier-aidet.o
drivers/irqchip/irq-armada-370-xp.c +4 -1
@@ -203,7 +203,7 @@ static struct irq_chip armada_370_xp_msi_irq_chip = {static struct msi_domain_info armada_370_xp_msi_domain_info = { .flags = (MSI_FLAG_USE_DEF_DOM_OPS |MSI_FLAG_USE_DEF_CHIP_OPS | -MSI_FLAG_MULTI_PCI_MSI ), +MSI_FLAG_MULTI_PCI_MSI |MSI_FLAG_PCI_MSIX ), .chip = &armada_370_xp_msi_irq_chip, };
@@ -330,6 +330,8 @@ static int armada_xp_set_affinity(struct irq_data *d,writel (reg, main_int_base +ARMADA_370_XP_INT_SOURCE_CTL (hwirq));raw_spin_unlock (&irq_controller_lock); +irq_data_update_effective_affinity (d,cpumask_of (cpu)); + return IRQ_SET_MASK_OK; }#endif
@@ -363,6 +365,7 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h, }else {irq_set_chip_and_handler (virq, &armada_370_xp_irq_chip, handle_level_irq); +irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (virq))); }irq_set_probe (virq);
drivers/irqchip/irq-bcm2835.c +4 -5
@@ -147,13 +147,12 @@ static int __init armctrl_of_init(struct device_node *node, base =of_iomap (node,0 );if (!base) -panic ("%s: unable to map IC registers\n" , - node->full_name); +panic ("%pOF: unable to map IC registers\n" , node); intc.domain =irq_domain_add_linear (node,MAKE_HWIRQ (NR_BANKS ,0 ), &armctrl_ops,NULL );if (!intc.domain) -panic ("%s: unable to create IRQ domain\n" , node->full_name); +panic ("%pOF: unable to create IRQ domain\n" , node);for (b =0 ; b <NR_BANKS ; b++) { intc.pending[b] = base + reg_pending[b];
@@ -173,8 +172,8 @@ static int __init armctrl_of_init(struct device_node *node,int parent_irq =irq_of_parse_and_map (node,0 );if (!parent_irq) { -panic ("%s: unable to get parent interrupt.\n" , - node->full_name); +panic ("%pOF: unable to get parent interrupt.\n" , + node); }irq_set_chained_handler (parent_irq, bcm2836_chained_handle_irq); }else {
drivers/irqchip/irq-bcm2836.c +2 -3
@@ -282,8 +282,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, { intc.base =of_iomap (node,0 );if (!intc.base) { -panic ("%s: unable to map local interrupt registers\n" , - node->full_name); +panic ("%pOF: unable to map local interrupt registers\n" , node); }bcm2835_init_local_timer_frequency ();
@@ -292,7 +291,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, &bcm2836_arm_irqchip_intc_ops, NULL);if (!intc.domain) -panic ("%s: unable to create IRQ domain\n" , node->full_name); +panic ("%pOF: unable to create IRQ domain\n" , node);bcm2836_arm_irqchip_register_irq (LOCAL_IRQ_CNTPSIRQ , &bcm2836_arm_irqchip_timer);
drivers/irqchip/irq-bcm6345-l1.c +3 -0
@@ -231,6 +231,8 @@ static int bcm6345_l1_set_affinity(struct irq_data *d, }raw_spin_unlock_irqrestore (&intc->lock, flags); +irq_data_update_effective_affinity (d,cpumask_of (new_cpu)); +return IRQ_SET_MASK_OK_NOCOPY ; }
@@ -291,6 +293,7 @@ static int bcm6345_l1_map(struct irq_domain *d, unsigned int virq,irq_set_chip_and_handler (virq, &bcm6345_l1_irq_chip, handle_percpu_irq);irq_set_chip_data (virq, d->host_data); +irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (virq)));return 0 ; }
drivers/irqchip/irq-bcm7038-l1.c +3 -0
@@ -212,6 +212,8 @@ static int bcm7038_l1_set_affinity(struct irq_data *d,__bcm7038_l1_unmask (d, first_cpu);raw_spin_unlock_irqrestore (&intc->lock, flags); +irq_data_update_effective_affinity (d,cpumask_of (first_cpu)); +return 0 ; }
@@ -299,6 +301,7 @@ static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq, {irq_set_chip_and_handler (virq, &bcm7038_l1_irq_chip, handle_level_irq);irq_set_chip_data (virq, d->host_data); +irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (virq)));return 0 ; }
drivers/irqchip/irq-bcm7120-l2.c +4 -6
@@ -250,12 +250,6 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn,if (ret <0 ) goto out_free_l1_data; -for (idx =0 ; idx < data->n_words; idx++) { -__raw_writel (data->irq_fwd_mask[idx], - data->pair_base[idx] + - data->en_offset[idx]); - } -for (irq =0 ; irq < data->num_parent_irqs; irq++) { ret =bcm7120_l2_intc_init_one (dn, data, irq, valid_mask);if (ret)
@@ -297,6 +291,10 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, gc->reg_base = data->pair_base[idx]; ct->regs.mask = data->en_offset[idx]; +/* gc->reg_base is defined and so is gc->writel */ +irq_reg_writel (gc, data->irq_fwd_mask[idx], + data->en_offset[idx]); + ct->chip.irq_mask = irq_gc_mask_clr_bit; ct->chip.irq_unmask = irq_gc_mask_set_bit; ct->chip.irq_ack = irq_gc_noop;
drivers/irqchip/irq-crossbar.c +3 -3
@@ -341,13 +341,13 @@ static int __init irqcrossbar_init(struct device_node *node,int err;if (!parent) { -pr_err ("%s: no parent, giving up\n" , node->full_name); +pr_err ("%pOF: no parent, giving up\n" , node);return -ENODEV ; } parent_domain =irq_find_host (parent);if (!parent_domain) { -pr_err ("%s: unable to obtain parent domain\n" , node->full_name); +pr_err ("%pOF: unable to obtain parent domain\n" , node);return -ENXIO ; }
@@ -360,7 +360,7 @@ static int __init irqcrossbar_init(struct device_node *node, node, &crossbar_domain_ops, NULL);if (!domain) { -pr_err ("%s: failed to allocated domain\n" , node->full_name); +pr_err ("%pOF: failed to allocated domain\n" , node);return -ENOMEM ; }
drivers/irqchip/irq-digicolor.c +4 -4
@@ -78,7 +78,7 @@ static int __init digicolor_of_init(struct device_node *node, reg_base =of_iomap (node,0 );if (!reg_base) { -pr_err ("%s: unable to map IC registers\n" , node->full_name); +pr_err ("%pOF: unable to map IC registers\n" , node);return -ENXIO ; }
@@ -88,7 +88,7 @@ static int __init digicolor_of_init(struct device_node *node, ucregs =syscon_regmap_lookup_by_phandle (node,"syscon" );if (IS_ERR (ucregs)) { -pr_err ("%s: unable to map UC registers\n" , node->full_name); +pr_err ("%pOF: unable to map UC registers\n" , node);return PTR_ERR (ucregs); }/* channel 1, regular IRQs */
@@ -97,7 +97,7 @@ static int __init digicolor_of_init(struct device_node *node, digicolor_irq_domain =irq_domain_add_linear (node,64 , &irq_generic_chip_ops,NULL );if (!digicolor_irq_domain) { -pr_err ("%s: unable to create IRQ domain\n" , node->full_name); +pr_err ("%pOF: unable to create IRQ domain\n" , node);return -ENOMEM ; }
@@ -105,7 +105,7 @@ static int __init digicolor_of_init(struct device_node *node,"digicolor_irq" , handle_level_irq, clr, 0, 0);if (ret) { -pr_err ("%s: unable to allocate IRQ gc\n" , node->full_name); +pr_err ("%pOF: unable to allocate IRQ gc\n" , node);return ret; }
drivers/irqchip/irq-dw-apb-ictl.c +6 -6
@@ -79,24 +79,24 @@ static int __init dw_apb_ictl_init(struct device_node *np,/* Map the parent interrupt for the chained handler */ irq =irq_of_parse_and_map (np,0 );if (irq <=0 ) { -pr_err ("%s: unable to parse irq\n" , np->full_name); +pr_err ("%pOF: unable to parse irq\n" , np);return -EINVAL ; } ret =of_address_to_resource (np,0 , &r);if (ret) { -pr_err ("%s: unable to get resource\n" , np->full_name); +pr_err ("%pOF: unable to get resource\n" , np);return ret; }if (!request_mem_region (r.start,resource_size (&r), np->full_name)) { -pr_err ("%s: unable to request mem region\n" , np->full_name); +pr_err ("%pOF: unable to request mem region\n" , np);return -ENOMEM ; } iobase =ioremap (r.start,resource_size (&r));if (!iobase) { -pr_err ("%s: unable to map resource\n" , np->full_name); +pr_err ("%pOF: unable to map resource\n" , np); ret = -ENOMEM ; goto err_release; }
@@ -123,7 +123,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, domain =irq_domain_add_linear (np, nrirqs, &irq_generic_chip_ops,NULL );if (!domain) { -pr_err ("%s: unable to add irq domain\n" , np->full_name); +pr_err ("%pOF: unable to add irq domain\n" , np); ret = -ENOMEM ; goto err_unmap; }
@@ -132,7 +132,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, handle_level_irq, clr,0 , IRQ_GC_INIT_MASK_CACHE);if (ret) { -pr_err ("%s: unable to alloc irq domain gc\n" , np->full_name); +pr_err ("%pOF: unable to alloc irq domain gc\n" , np); goto err_unmap; }
drivers/irqchip/irq-gic-v3-its-pci-msi.c +1 -1
@@ -138,7 +138,7 @@ static int __init its_pci_of_msi_init(void)if (its_pci_msi_init_one (of_node_to_fwnode (np), np->full_name))continue ; -pr_info ("PCI/MSI: %s domain created\n" , np->full_name); +pr_info ("PCI/MSI: %pOF domain created\n" , np); }return 0 ;
drivers/irqchip/irq-gic-v3-its.c +1386 -122
1,875 lines not on this page · raw message
drivers/irqchip/irq-gic-v3.c +79 -30
201 lines not on this page · raw message
drivers/irqchip/irq-gic-v4.c new file +225 -0
225 lines not on this page · raw message
drivers/irqchip/irq-gic.c +4 -1
@@ -344,6 +344,8 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,writel_relaxed (val | bit, reg);gic_unlock_irqrestore (flags); +irq_data_update_effective_affinity (d,cpumask_of (cpu)); + return IRQ_SET_MASK_OK_DONE; }#endif
@@ -410,7 +412,7 @@ static void gic_handle_cascade_irq(struct irq_desc *desc)chained_irq_exit (chip, desc); } -static struct irq_chip gic_chip = { +static const struct irq_chip gic_chip = { .irq_mask = gic_mask_irq, .irq_unmask = gic_unmask_irq, .irq_eoi = gic_eoi_irq,
@@ -966,6 +968,7 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq,irq_domain_set_info (d, irq, hw, &gic->chip, d->host_data, handle_fasteoi_irq,NULL ,NULL );irq_set_probe (irq); +irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (irq))); }return 0 ; }
drivers/irqchip/irq-hip04.c +3 -0
@@ -165,6 +165,8 @@ static int hip04_irq_set_affinity(struct irq_data *d,writel_relaxed (val | bit, reg);raw_spin_unlock (&irq_controller_lock); +irq_data_update_effective_affinity (d,cpumask_of (cpu)); + return IRQ_SET_MASK_OK; }#endif
@@ -312,6 +314,7 @@ static int hip04_irq_domain_map(struct irq_domain *d, unsigned int irq,irq_set_chip_and_handler (irq, &hip04_irq_chip, handle_fasteoi_irq);irq_set_probe (irq); +irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (irq))); }irq_set_chip_data (irq, d->host_data);return 0 ;
drivers/irqchip/irq-imx-gpcv2.c +2 -2
@@ -214,13 +214,13 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,int i;if (!parent) { -pr_err ("%s: no parent, giving up\n" , node->full_name); +pr_err ("%pOF: no parent, giving up\n" , node);return -ENODEV ; } parent_domain =irq_find_host (parent);if (!parent_domain) { -pr_err ("%s: unable to get parent domain\n" , node->full_name); +pr_err ("%pOF: unable to get parent domain\n" , node);return -ENXIO ; }
drivers/irqchip/irq-lpc32xx.c +1 -1
@@ -191,7 +191,7 @@ static int __init lpc32xx_of_ic_init(struct device_node *node, irqc->base =of_iomap (node,0 );if (!irqc->base) { -pr_err ("%s: unable to map registers\n" , node->full_name); +pr_err ("%pOF: unable to map registers\n" , node);kfree (irqc);return -EINVAL ; }
drivers/irqchip/irq-ls-scfg-msi.c +222 -34
83 lines not on this page · raw message
drivers/irqchip/irq-uniphier-aidet.c new file +261 -0
261 lines not on this page · raw message
include/linux/irq_sim.h new file +44 -0
44 lines not on this page · raw message
include/linux/irqchip/arm-gic-v3.h +84 -0
84 lines not on this page · raw message
include/linux/irqchip/arm-gic-v4.h new file +105 -0
105 lines not on this page · raw message
kernel/irq/chip.c +109 -0
109 lines not on this page · raw message
kernel/irq/debugfs.c +49 -1
50 lines not on this page · raw message
kernel/irq/irq_sim.c new file +164 -0
164 lines not on this page · raw message
kernel/irq/irqdomain.c +200 -30
230 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.