Dear Grant Likely,
On Tue, 11 Jun 2013 14:37:45 +0100, Grant Likely wrote:
> > +static int armada_370_xp_setup_msi_irq(struct msi_chip *chip,
> > + struct pci_dev *pdev,
> > + struct msi_desc *desc)
> > +{
> > + struct msi_msg msg;
> > + int hwirq, irq;
> > +
> > + hwirq = armada_370_xp_alloc_msi();
> > + if (hwirq < 0)
> > + return hwirq;
> > +
> > + irq = irq_create_mapping(armada_370_xp_msi_domain, hwirq);
> > + if (!irq) {
> > + armada_370_xp_free_msi(hwirq);
> > + return -EINVAL;
> > + }
>
> This looks like something that the irq_domain should handle for you.
> It would be good to have a variant of irq_create_mapping() that keeps
> track of available hwirqs, allocates a free one, and maps it all with
> one function call. I can see that being useful by other MSI interrupt
> controllers and would eliminate needing to open-code it above.
>
> take a look at the irqdomain/test branch on git://git.secretlab.ca/git/linux
>
> I'm hoping to push that series into v3.11 and it simplifies the
> irq_domain code quite a bit. It would be easy to build an
> irq_create_mapping() variant on top of that. Take a look at
> irq_create_direct_mapping() for inspiration (although that function does
> it the other way around. It allocates a virq and uses that number for
> the hwirq number)
Ok, I've implemented something according to your idea. Will be part of
the v3 of this series. For reference, the piece of code I've added in
irqdomain.c looks like:
/**
+ * irq_alloc_mapping() - Allocate an irq for mapping
+ * @domain: domain to allocate the irq for or NULL for default domain
+ * @hwirq: reference to the returned hwirq
+ *
+ * This routine are used for irq controllers which can choose the
+ * hardware interrupt number from a range [ 0 ; domain size ], such as
+ * is often the case with PCI MSI controllers. The function will
+ * returned the allocated hwirq number in the hwirq pointer, and the
+ * corresponding virq number as the return value.
+ */
+unsigned int irq_alloc_mapping(struct irq_domain *domain,
+ irq_hw_number_t *out_hwirq)
+{
+ unsigned int virq;
+ irq_hw_number_t hwirq;
+
+ pr_debug("irq_alloc_mapping(0x%p)\n", domain);
+
+ if (domain == NULL)
+ domain = irq_default_domain;
+
+ for (hwirq = 0; hwirq < domain->hwirq_max; hwirq++)
+ if (!irq_find_mapping(domain, hwirq))
+ break;
+
+ if (hwirq == domain->hwirq_max) {
+ pr_debug("-> no available hwirq found\n");
+ return 0;
+ }
+
+ virq = irq_alloc_desc_from(1, of_node_to_nid(domain->of_node));
+ if (virq <= 0) {
+ pr_debug("-> virq allocation failed\n");
+ return 0;
+ }
+
+ if (irq_domain_associate(domain, virq, hwirq)) {
+ irq_free_desc(virq);
+ return 0;
+ }
+
+ pr_debug("irq %lu on domain %s mapped to virtual irq %u\n",
+ hwirq, of_node_full_name(domain->of_node), virq);
+
+ *out_hwirq = hwirq;
+
+ return virq;
+}
+EXPORT_SYMBOL_GPL(irq_alloc_mapping);
+
+/**
> > +static int armada_370_xp_msi_init(struct device_node *node)
> > +{
> > + struct msi_chip *msi_chip;
> > + u32 reg;
> > +
> > + msi_chip = kzalloc(sizeof(*msi_chip), GFP_KERNEL);
>
> devm_kzalloc() so it gets freed on failure or unbind; although for this
> device you may not care.
Unfortunately, we don't have access to a platform_device by the time
the IRQ controller driver is initialized. Thierry Redding suggested to
use of_find_device_by_node(), but it returns NULL. I guess it's because
this IRQ controller driver is initialized much before the
platform_device structures are created.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
