Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1230715

[PATCH 2/4] of: irq: Add support for the new definition of "msi-parent"

Show all headers | View raw

Since 126b16e2ad98 ("Docs: dt: add generic MSI bindings"),
the definition of "msi-parent" has evolved, while maintaining
some degree of compatibility. It can now express multiple MSI
controllers as parents, as well as some sideband data being
communicated to the controller.

This patch revamps the parsing of the property, iterating over
the multiple parents until a suitable irqdomain is found.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/of/irq.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 55317fa..c9637cf 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -586,15 +586,23 @@ err:
  */
 void of_msi_configure(struct device *dev, struct device_node *np)
 {
-	struct device_node *msi_np;
-	struct irq_domain *d;
+	struct of_phandle_args args;
+	int index = 0;
 
-	msi_np = of_parse_phandle(np, "msi-parent", 0);
-	if (!msi_np)
-		return;
+	while (!of_parse_phandle_with_opt_args(np, "msi-parent", "#msi-cells",
+					       index, &args)) {
+		struct irq_domain *d;
 
-	d = irq_find_matching_host(msi_np, DOMAIN_BUS_PLATFORM_MSI);
-	if (!d)
-		d = irq_find_host(msi_np);
-	dev_set_msi_domain(dev, d);
+		d = irq_find_matching_host(args.np, DOMAIN_BUS_PLATFORM_MSI);
+		if (!d)
+			d = irq_find_host(args.np);
+
+		if (d) {
+			dev_set_msi_domain(dev, d);
+			return;
+		}
+
+		of_node_put(args.np);
+		index++;
+	}
 }
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] of: Handle multi-parent version of msi-parent Marc Zyngier <marc.zyngier@arm.com> - 2015-09-22 20:00 +0200
  [PATCH 4/4] irqchip/gic-v3-its: Parse new version of msi-parent property Marc Zyngier <marc.zyngier@arm.com> - 2015-09-22 20:40 +0200
  [PATCH 1/4] of: Add of_parse_phandle_with_opt_args() helper function Marc Zyngier <marc.zyngier@arm.com> - 2015-09-22 20:40 +0200
    Re: [PATCH 1/4] of: Add of_parse_phandle_with_opt_args() helper function Rob Herring <robh@kernel.org> - 2015-09-29 19:30 +0200
      Re: [PATCH 1/4] of: Add of_parse_phandle_with_opt_args() helper function Marc Zyngier <marc.zyngier@arm.com> - 2015-09-30 11:10 +0200
      Re: [PATCH 1/4] of: Add of_parse_phandle_with_opt_args() helper  function Mark Rutland <mark.rutland@arm.com> - 2015-09-30 16:00 +0200
    Re: [PATCH 1/4] of: Add of_parse_phandle_with_opt_args() helper  function Robin Murphy <robin.murphy@arm.com> - 2015-09-30 17:40 +0200
      Re: [PATCH 1/4] of: Add of_parse_phandle_with_opt_args() helper function Marc Zyngier <marc.zyngier@arm.com> - 2015-09-30 19:20 +0200
  [PATCH 2/4] of: irq: Add support for the new definition of "msi-parent" Marc Zyngier <marc.zyngier@arm.com> - 2015-09-22 20:40 +0200
    Re: [PATCH 2/4] of: irq: Add support for the new definition of  "msi-parent" Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-09-23 16:40 +0200
      Re: [PATCH 2/4] of: irq: Add support for the new definition of  "msi-parent" Thomas Gleixner <tglx@linutronix.de> - 2015-09-27 12:40 +0200
        Re: [PATCH 2/4] of: irq: Add support for the new definition of  "msi-parent" Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-09-27 15:10 +0200

csiph-web