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

Commit 3ce8461f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-5.1-2' of... 

Merge tag 'irqchip-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Pull irqchip updates for 5.1 from Marc Zyngier:

 - irqsteer error handling fix
 - GICv3 range coalescing fix
 - stm32 coprocessor coexistence fixes
 - mbigen MSI teardown fix
 - non-DT secondary GIC infrastructure removed
 - various cleanups (brcmstb-l2, mmp)
 - new DT bindings (r8a774c0)
parents 551417af fca269f2

Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required properties: 
    - "renesas,irqc-r8a7793" (R-Car M2-N)

    - "renesas,irqc-r8a7794" (R-Car E2)

    - "renesas,intc-ex-r8a774a1" (RZ/G2M)

    - "renesas,intc-ex-r8a774c0" (RZ/G2E)

    - "renesas,intc-ex-r8a7795" (R-Car H3)

    - "renesas,intc-ex-r8a7796" (R-Car M3-W)

    - "renesas,intc-ex-r8a77965" (R-Car M3-N)

arch/arm/mach-cns3xxx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void __init cns3xxx_map_io(void) 
/* used by entry-macro.S */

void __init cns3xxx_init_irq(void)

{

	gic_init(0, 29, IOMEM(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),

	gic_init(IOMEM(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),

		 IOMEM(CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT));

}

drivers/irqchip/irq-brcmstb-l2.c

+2 −2
Original line number Diff line number Diff line
@@ -275,14 +275,14 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, 
	return ret;

}



int __init brcmstb_l2_edge_intc_of_init(struct device_node *np,

static int __init brcmstb_l2_edge_intc_of_init(struct device_node *np,

	struct device_node *parent)

{

	return brcmstb_l2_intc_of_init(np, parent, &l2_edge_intc_init);

}

IRQCHIP_DECLARE(brcmstb_l2_intc, "brcm,l2-intc", brcmstb_l2_edge_intc_of_init);



int __init brcmstb_l2_lvl_intc_of_init(struct device_node *np,

static int __init brcmstb_l2_lvl_intc_of_init(struct device_node *np,

	struct device_node *parent)

{

	return brcmstb_l2_intc_of_init(np, parent, &l2_lvl_intc_init);

drivers/irqchip/irq-gic-v3-its.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ static int lpi_range_cmp(void *priv, struct list_head *a, struct list_head *b) 
	ra = container_of(a, struct lpi_range, entry);

	rb = container_of(b, struct lpi_range, entry);



	return rb->base_id - ra->base_id;

	return ra->base_id - rb->base_id;

}



static void merge_lpi_ranges(void)

drivers/irqchip/irq-gic.c

+16 −29
Original line number Diff line number Diff line
@@ -1089,11 +1089,10 @@ static void gic_init_chip(struct gic_chip_data *gic, struct device *dev, 
#endif

}



static int gic_init_bases(struct gic_chip_data *gic, int irq_start,

static int gic_init_bases(struct gic_chip_data *gic,

			  struct fwnode_handle *handle)

{

	irq_hw_number_t hwirq_base;

	int gic_irqs, irq_base, ret;

	int gic_irqs, ret;



	if (IS_ENABLED(CONFIG_GIC_NON_BANKED) && gic->percpu_offset) {

		/* Frankein-GIC without banked registers... */
@@ -1145,28 +1144,21 @@ static int gic_init_bases(struct gic_chip_data *gic, int irq_start, 
	} else {		/* Legacy support */

		/*

		 * For primary GICs, skip over SGIs.

		 * For secondary GICs, skip over PPIs, too.

		 * No secondary GIC support whatsoever.

		 */

		if (gic == &gic_data[0] && (irq_start & 31) > 0) {

			hwirq_base = 16;

			if (irq_start != -1)

				irq_start = (irq_start & ~31) + 16;

		} else {

			hwirq_base = 32;

		}

		int irq_base;



		gic_irqs -= hwirq_base; /* calculate # of irqs to allocate */

		gic_irqs -= 16; /* calculate # of irqs to allocate */



		irq_base = irq_alloc_descs(irq_start, 16, gic_irqs,

		irq_base = irq_alloc_descs(16, 16, gic_irqs,

					   numa_node_id());

		if (irq_base < 0) {

			WARN(1, "Cannot allocate irq_descs @ IRQ%d, assuming pre-allocated\n",

			     irq_start);

			irq_base = irq_start;

			WARN(1, "Cannot allocate irq_descs @ IRQ16, assuming pre-allocated\n");

			irq_base = 16;

		}



		gic->domain = irq_domain_add_legacy(NULL, gic_irqs, irq_base,

					hwirq_base, &gic_irq_domain_ops, gic);

						    16, &gic_irq_domain_ops, gic);

	}



	if (WARN_ON(!gic->domain)) {
@@ -1195,7 +1187,6 @@ static int gic_init_bases(struct gic_chip_data *gic, int irq_start, 
}



static int __init __gic_init_bases(struct gic_chip_data *gic,

				   int irq_start,

				   struct fwnode_handle *handle)

{

	char *name;
@@ -1231,32 +1222,28 @@ static int __init __gic_init_bases(struct gic_chip_data *gic, 
		gic_init_chip(gic, NULL, name, false);

	}



	ret = gic_init_bases(gic, irq_start, handle);

	ret = gic_init_bases(gic, handle);

	if (ret)

		kfree(name);



	return ret;

}



void __init gic_init(unsigned int gic_nr, int irq_start,

		     void __iomem *dist_base, void __iomem *cpu_base)

void __init gic_init(void __iomem *dist_base, void __iomem *cpu_base)

{

	struct gic_chip_data *gic;



	if (WARN_ON(gic_nr >= CONFIG_ARM_GIC_MAX_NR))

		return;



	/*

	 * Non-DT/ACPI systems won't run a hypervisor, so let's not

	 * bother with these...

	 */

	static_branch_disable(&supports_deactivate_key);



	gic = &gic_data[gic_nr];

	gic = &gic_data[0];

	gic->raw_dist_base = dist_base;

	gic->raw_cpu_base = cpu_base;



	__gic_init_bases(gic, irq_start, NULL);

	__gic_init_bases(gic, NULL);

}



static void gic_teardown(struct gic_chip_data *gic)
@@ -1399,7 +1386,7 @@ int gic_of_init_child(struct device *dev, struct gic_chip_data **gic, int irq) 
	if (ret)

		return ret;



	ret = gic_init_bases(*gic, -1, &dev->of_node->fwnode);

	ret = gic_init_bases(*gic, &dev->of_node->fwnode);

	if (ret) {

		gic_teardown(*gic);

		return ret;
@@ -1459,7 +1446,7 @@ gic_of_init(struct device_node *node, struct device_node *parent) 
	if (gic_cnt == 0 && !gic_check_eoimode(node, &gic->raw_cpu_base))

		static_branch_disable(&supports_deactivate_key);



	ret = __gic_init_bases(gic, -1, &node->fwnode);

	ret = __gic_init_bases(gic, &node->fwnode);

	if (ret) {

		gic_teardown(gic);

		return ret;
@@ -1650,7 +1637,7 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header, 
		return -ENOMEM;

	}



	ret = __gic_init_bases(gic, -1, domain_handle);

	ret = __gic_init_bases(gic, domain_handle);

	if (ret) {

		pr_err("Failed to initialise GIC\n");

		irq_domain_free_fwnode(domain_handle);