Commit 82d2ef45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2021-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "A set of interrupt chip driver fixes:

   - Fix the multi vector MSI allocation on Armada 370XP

   - Do interrupt acknowledgement correctly in the aspeed-scu driver

   - Make the IPR register offset correct in the NVIC driver

   - Make redistribution table flushing correct by issueing a SYNC
     command to ensure that the invalidation command has been executed

   - Plug a device tree node reference leak in the bcm7210-l2 driver

   - Trivial fixes in the MIPS GIC and the Apple AIC drivers"

* tag 'irq-urgent-2021-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/irq-bcm7120-l2: Add put_device() after of_find_device_by_node()
  irqchip/irq-gic-v3-its.c: Force synchronisation when issuing INVALL
  irqchip/apple-aic: Mark aic_init_smp() as __init
  irqchip: nvic: Fix offset for Interrupt Priority Offsets
  irqchip/mips-gic: Use bitfield helpers
  irqchip/aspeed-scu: Replace update_bits with write_bits.
  irqchip/armada-370-xp: Fix support for Multi-MSI interrupts
  irqchip/armada-370-xp: Fix return value of armada_370_xp_msi_alloc()
parents 77360225 b7fd35a0

drivers/irqchip/irq-apple-aic.c

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static const struct irq_domain_ops aic_ipi_domain_ops = { 
	.free = aic_ipi_free,

};



static int aic_init_smp(struct aic_irq_chip *irqc, struct device_node *node)

static int __init aic_init_smp(struct aic_irq_chip *irqc, struct device_node *node)

{

	struct irq_domain *ipi_domain;

	int base_ipi;

drivers/irqchip/irq-armada-370-xp.c

+6 −10
Original line number Diff line number Diff line
@@ -232,16 +232,12 @@ static int armada_370_xp_msi_alloc(struct irq_domain *domain, unsigned int virq, 
	int hwirq, i;



	mutex_lock(&msi_used_lock);



	hwirq = bitmap_find_next_zero_area(msi_used, PCI_MSI_DOORBELL_NR,

					   0, nr_irqs, 0);

	if (hwirq >= PCI_MSI_DOORBELL_NR) {

	hwirq = bitmap_find_free_region(msi_used, PCI_MSI_DOORBELL_NR,

					order_base_2(nr_irqs));

	mutex_unlock(&msi_used_lock);

		return -ENOSPC;

	}



	bitmap_set(msi_used, hwirq, nr_irqs);

	mutex_unlock(&msi_used_lock);

	if (hwirq < 0)

		return -ENOSPC;



	for (i = 0; i < nr_irqs; i++) {

		irq_domain_set_info(domain, virq + i, hwirq + i,
@@ -250,7 +246,7 @@ static int armada_370_xp_msi_alloc(struct irq_domain *domain, unsigned int virq, 
				    NULL, NULL);

	}



	return hwirq;

	return 0;

}



static void armada_370_xp_msi_free(struct irq_domain *domain,
@@ -259,7 +255,7 @@ static void armada_370_xp_msi_free(struct irq_domain *domain, 
	struct irq_data *d = irq_domain_get_irq_data(domain, virq);



	mutex_lock(&msi_used_lock);

	bitmap_clear(msi_used, d->hwirq, nr_irqs);

	bitmap_release_region(msi_used, d->hwirq, order_base_2(nr_irqs));

	mutex_unlock(&msi_used_lock);

}

drivers/irqchip/irq-aspeed-scu-ic.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void aspeed_scu_ic_irq_handler(struct irq_desc *desc) 
		generic_handle_domain_irq(scu_ic->irq_domain,

					  bit - scu_ic->irq_shift);



		regmap_update_bits(scu_ic->scu, scu_ic->reg, mask,

		regmap_write_bits(scu_ic->scu, scu_ic->reg, mask,

				  BIT(bit + ASPEED_SCU_IC_STATUS_SHIFT));

	}

drivers/irqchip/irq-bcm7120-l2.c

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, 
	}



	data->num_parent_irqs = platform_irq_count(pdev);

	put_device(&pdev->dev);

	if (data->num_parent_irqs <= 0) {

		pr_err("invalid number of parent interrupts\n");

		ret = -ENOMEM;

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

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static struct its_collection *its_build_invall_cmd(struct its_node *its, 


	its_fixup_cmd(cmd);



	return NULL;

	return desc->its_invall_cmd.col;

}



static struct its_vpe *its_build_vinvall_cmd(struct its_node *its,