Commit 36da9f5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "A set of interrupt subsystem updates:

  Core:

   - Ensure runtime power management for chained interrupts

  Drivers:

   - A collection of OF node refcount fixes

   - Unbreak MIPS uniprocessor builds

   - Fix xilinx interrupt controller Kconfig dependencies

   - Add a missing compatible string to the Uniphier driver"

* tag 'irq-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/loongson-liointc: Use architecture register to get coreid
  irqchip/uniphier-aidet: Add compatible string for NX1 SoC
  dt-bindings: interrupt-controller/uniphier-aidet: Add bindings for NX1 SoC
  irqchip/realtek-rtl: Fix refcount leak in map_interrupts
  irqchip/gic-v3: Fix refcount leak in gic_populate_ppi_partitions
  irqchip/gic-v3: Fix error handling in gic_populate_ppi_partitions
  irqchip/apple-aic: Fix refcount leak in aic_of_ic_init
  irqchip/apple-aic: Fix refcount leak in build_fiq_affinity
  irqchip/gic/realview: Fix refcount leak in realview_gic_of_init
  irqchip/xilinx: Remove microblaze+zynq dependency
  genirq: PM: Use runtime PM for chained interrupts
parents bc94632c 6872fcac

Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.yaml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ properties: 
      - socionext,uniphier-ld11-aidet

      - socionext,uniphier-ld20-aidet

      - socionext,uniphier-pxs3-aidet

      - socionext,uniphier-nx1-aidet



  reg:

    maxItems: 1

drivers/irqchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ config XTENSA_MX 


config XILINX_INTC

	bool "Xilinx Interrupt Controller IP"

	depends on MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP

	depends on OF

	select IRQ_DOMAIN

	help

	  Support for the Xilinx Interrupt Controller IP core.

drivers/irqchip/irq-apple-aic.c

+2 −0
Original line number Diff line number Diff line
@@ -1035,6 +1035,7 @@ static void build_fiq_affinity(struct aic_irq_chip *ic, struct device_node *aff) 
			continue;



		cpu = of_cpu_node_to_id(cpu_node);

		of_node_put(cpu_node);

		if (WARN_ON(cpu < 0))

			continue;
@@ -1143,6 +1144,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p 
		for_each_child_of_node(affs, chld)

			build_fiq_affinity(irqc, chld);

	}

	of_node_put(affs);



	set_handle_irq(aic_handle_irq);

	set_handle_fiq(aic_handle_fiq);

drivers/irqchip/irq-gic-realview.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ realview_gic_of_init(struct device_node *node, struct device_node *parent) 


	/* The PB11MPCore GIC needs to be configured in the syscon */

	map = syscon_node_to_regmap(np);

	of_node_put(np);

	if (!IS_ERR(map)) {

		/* new irq mode with no DCC */

		regmap_write(map, REALVIEW_SYS_LOCK_OFFSET,

drivers/irqchip/irq-gic-v3.c

+5 −2
Original line number Diff line number Diff line
@@ -1932,7 +1932,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) 


	gic_data.ppi_descs = kcalloc(gic_data.ppi_nr, sizeof(*gic_data.ppi_descs), GFP_KERNEL);

	if (!gic_data.ppi_descs)

		return;

		goto out_put_node;



	nr_parts = of_get_child_count(parts_node);
@@ -1973,12 +1973,15 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) 
				continue;



			cpu = of_cpu_node_to_id(cpu_node);

			if (WARN_ON(cpu < 0))

			if (WARN_ON(cpu < 0)) {

				of_node_put(cpu_node);

				continue;

			}



			pr_cont("%pOF[%d] ", cpu_node, cpu);



			cpumask_set_cpu(cpu, &part->mask);

			of_node_put(cpu_node);

		}



		pr_cont("}\n");