From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759224AbbIVRwm (ORCPT ); Tue, 22 Sep 2015 13:52:42 -0400 Received: from foss.arm.com ([217.140.101.70]:59374 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759018AbbIVRwj (ORCPT ); Tue, 22 Sep 2015 13:52:39 -0400 From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Rob Herring , Jason Cooper , Thomas Gleixner , Bjorn Helgaas , Mark Rutland Subject: [PATCH 2/4] of: irq: Add support for the new definition of "msi-parent" Date: Tue, 22 Sep 2015 18:52:14 +0100 Message-Id: <1442944336-11754-3-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442944336-11754-1-git-send-email-marc.zyngier@arm.com> References: <1442944336-11754-1-git-send-email-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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