Commit 2d6c4e40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull irq updates from Thomas Gleixner:
 "A small set of updates mostly for irq chip drivers:

   - MIPS GIC fix for spurious, masked interrupts

   - fix for a subtle IPI bug in GICv3

   - do not probe GICv3 ITSs that are marked as disabled

   - multi-MSI support for GICv2m

   - various small cleanups"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqdomain: Re-use DEFINE_SHOW_ATTRIBUTE() macro
  irqchip/bcm: Remove hashed address printing
  irqchip/gic-v2m: Add PCI Multi-MSI support
  irqchip/gic-v3: Ignore disabled ITS nodes
  irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
  irqchip/gic-v3: Change pr_debug message to pr_devel
  irqchip/mips-gic: Avoid spuriously handling masked interrupts
parents 59e47215 6dee6ae9

drivers/irqchip/irq-bcm7038-l1.c

+0 −3
Original line number Diff line number Diff line
@@ -339,9 +339,6 @@ int __init bcm7038_l1_of_init(struct device_node *dn, 
		goto out_unmap;

	}



	pr_info("registered BCM7038 L1 intc (mem: 0x%p, IRQs: %d)\n",

		intc->cpus[0]->map_base, IRQS_PER_WORD * intc->n_words);



	return 0;



out_unmap:

drivers/irqchip/irq-bcm7120-l2.c

+0 −3
Original line number Diff line number Diff line
@@ -318,9 +318,6 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, 
		}

	}



	pr_info("registered %s intc (mem: 0x%p, parent IRQ(s): %d)\n",

			intc_name, data->map_base[0], data->num_parent_irqs);



	return 0;



out_free_domain:

drivers/irqchip/irq-brcmstb-l2.c

+0 −3
Original line number Diff line number Diff line
@@ -262,9 +262,6 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, 
		ct->chip.irq_set_wake = irq_gc_set_wake;

	}



	pr_info("registered L2 intc (mem: 0x%p, parent irq: %d)\n",

			base, parent_irq);



	return 0;



out_free_domain:

drivers/irqchip/irq-gic-v2m.c

+22 −24
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static struct irq_chip gicv2m_msi_irq_chip = { 


static struct msi_domain_info gicv2m_msi_domain_info = {

	.flags	= (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |

		   MSI_FLAG_PCI_MSIX),

		   MSI_FLAG_PCI_MSIX | MSI_FLAG_MULTI_PCI_MSI),

	.chip	= &gicv2m_msi_irq_chip,

};
@@ -155,18 +155,12 @@ static int gicv2m_irq_gic_domain_alloc(struct irq_domain *domain, 
	return 0;

}



static void gicv2m_unalloc_msi(struct v2m_data *v2m, unsigned int hwirq)

static void gicv2m_unalloc_msi(struct v2m_data *v2m, unsigned int hwirq,

			       int nr_irqs)

{

	int pos;



	pos = hwirq - v2m->spi_start;

	if (pos < 0 || pos >= v2m->nr_spis) {

		pr_err("Failed to teardown msi. Invalid hwirq %d\n", hwirq);

		return;

	}



	spin_lock(&v2m_lock);

	__clear_bit(pos, v2m->bm);

	bitmap_release_region(v2m->bm, hwirq - v2m->spi_start,

			      get_count_order(nr_irqs));

	spin_unlock(&v2m_lock);

}
@@ -174,13 +168,13 @@ static int gicv2m_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, 
				   unsigned int nr_irqs, void *args)

{

	struct v2m_data *v2m = NULL, *tmp;

	int hwirq, offset, err = 0;

	int hwirq, offset, i, err = 0;



	spin_lock(&v2m_lock);

	list_for_each_entry(tmp, &v2m_nodes, entry) {

		offset = find_first_zero_bit(tmp->bm, tmp->nr_spis);

		if (offset < tmp->nr_spis) {

			__set_bit(offset, tmp->bm);

		offset = bitmap_find_free_region(tmp->bm, tmp->nr_spis,

						 get_count_order(nr_irqs));

		if (offset >= 0) {

			v2m = tmp;

			break;

		}
@@ -192,16 +186,21 @@ static int gicv2m_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, 


	hwirq = v2m->spi_start + offset;



	err = gicv2m_irq_gic_domain_alloc(domain, virq, hwirq);

	if (err) {

		gicv2m_unalloc_msi(v2m, hwirq);

		return err;

	}

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

		err = gicv2m_irq_gic_domain_alloc(domain, virq + i, hwirq + i);

		if (err)

			goto fail;



	irq_domain_set_hwirq_and_chip(domain, virq, hwirq,

		irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i,

					      &gicv2m_irq_chip, v2m);

	}



	return 0;



fail:

	irq_domain_free_irqs_parent(domain, virq, nr_irqs);

	gicv2m_unalloc_msi(v2m, hwirq, get_count_order(nr_irqs));

	return err;

}



static void gicv2m_irq_domain_free(struct irq_domain *domain,
@@ -210,8 +209,7 @@ static void gicv2m_irq_domain_free(struct irq_domain *domain, 
	struct irq_data *d = irq_domain_get_irq_data(domain, virq);

	struct v2m_data *v2m = irq_data_get_irq_chip_data(d);



	BUG_ON(nr_irqs != 1);

	gicv2m_unalloc_msi(v2m, d->hwirq);

	gicv2m_unalloc_msi(v2m, d->hwirq, nr_irqs);

	irq_domain_free_irqs_parent(domain, virq, nr_irqs);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ static int __init its_pci_of_msi_init(void) 


	for (np = of_find_matching_node(NULL, its_device_id); np;

	     np = of_find_matching_node(np, its_device_id)) {

		if (!of_device_is_available(np))

			continue;

		if (!of_property_read_bool(np, "msi-controller"))

			continue;

CRA Git | Maintained and supported by SUSTech CRA and CCSE