From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 06/19] PCI/MSI: of: Allow msi_domain lookup using the host bridge node
Date: Thu, 23 Jul 2015 10:26:25 +0100 [thread overview]
Message-ID: <1437643598-19795-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1437643598-19795-1-git-send-email-marc.zyngier@arm.com>
A number of platforms do not need to use the msi-parent property,
as the host bridge itself provides the MSI controller.
Allow this configuration by performing an irq domain lookup based
on the host bridge node if it doesn't have a valid msi-parent property.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
drivers/pci/of.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index e2ebb7d..fcfdadf 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -69,12 +69,21 @@ struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus)
if (!bus->dev.of_node)
return NULL;
+
+ /* Start looking for a phandle to an MSI controller. */
np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0);
+
+ /*
+ * If we don't have an msi-parent property, look for a domain
+ * directly attached to the host bridge.
+ */
if (!np)
- return NULL;
+ np = bus->dev.of_node;
+
d = irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI);
if (!d)
d = irq_find_host(np);
+
return d;
#else
return NULL;
--
2.1.4
next prev parent reply other threads:[~2015-07-23 9:26 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-23 9:26 [PATCH v5 00/19] Per-device MSI domain & platform MSI Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 01/19] genirq: irqdomain: Allow irq domain aliasing Marc Zyngier
2015-07-25 7:15 ` Hanjun Guo
2015-07-23 9:26 ` [PATCH v5 02/19] PCI: MSI: Register irq domain with specific token Marc Zyngier
2015-07-23 13:05 ` Bjorn Helgaas
2015-07-25 8:02 ` Hanjun Guo
2015-07-23 9:26 ` [PATCH v5 03/19] device core: Introduce per-device MSI domain pointer Marc Zyngier
2015-07-25 8:12 ` Hanjun Guo
2015-07-23 9:26 ` [PATCH v5 04/19] PCI/MSI: Add hooks to populate the msi_domain field Marc Zyngier
2015-07-23 13:06 ` Bjorn Helgaas
2015-07-23 14:52 ` Marc Zyngier
2015-07-23 15:36 ` Bjorn Helgaas
2015-07-25 8:20 ` Hanjun Guo
2015-07-23 9:26 ` [PATCH v5 05/19] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier
2015-07-23 13:12 ` Bjorn Helgaas
2015-07-23 9:26 ` Marc Zyngier [this message]
2015-07-23 13:13 ` [PATCH v5 06/19] PCI/MSI: of: Allow msi_domain lookup using the host bridge node Bjorn Helgaas
2015-07-23 9:26 ` [PATCH v5 07/19] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier
2015-07-23 13:14 ` Bjorn Helgaas
2015-07-25 8:25 ` Hanjun Guo
2015-07-23 9:26 ` [PATCH v5 08/19] platform: of: Assign MSI domain to platform device Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 09/19] drivers: base: Add MSI domain support for non-PCI devices Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 10/19] genirq: Add DOMAIN_BUS_NEXUS irqdomain property Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 11/19] irqchip: gicv3-its: Split PCI/MSI code from the core ITS driver Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 12/19] irqchip: gicv3-its: Register irq domain with NEXUS token Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 13/19] irqchip: gicv3-its: Get rid of struct msi_controller Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 14/19] irqchip: gicv3-its: Make the PCI/MSI code standalone Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 15/19] irqchip: gicv3-its: Add platform MSI support Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 16/19] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 17/19] irqchip: GICv2m: Add platform MSI support Marc Zyngier
2015-07-23 9:26 ` [PATCH v5 18/19] PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller Marc Zyngier
2015-07-23 13:17 ` Bjorn Helgaas
2015-07-23 9:26 ` [PATCH v5 19/19] PCI/MSI: Drop domain field from msi_controller Marc Zyngier
2015-07-23 13:18 ` [PATCH v5 00/19] Per-device MSI domain & platform MSI Bjorn Helgaas
2015-07-23 14:54 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437643598-19795-7-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).