From: Marc Zyngier <marc.zyngier@arm.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jiang Liu <jiang.liu@linux.intel.com>,
Jason Cooper <jason@lakedaemon.net>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Yijing Wang <wangyijing@huawei.com>, Ma Jun <majun258@huawei.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Duc Dang <dhdang@apm.com>
Subject: [PATCH v4 06/19] PCI/MSI: of: Allow msi_domain lookup using the host bridge node
Date: Wed, 15 Jul 2015 13:16:40 +0100 [thread overview]
Message-ID: <1436962613-17359-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1436962613-17359-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 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 09df465..9d61cef 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -69,9 +69,14 @@ void pci_set_phb_of_msi_domain(struct pci_bus *bus)
if (!bus->dev.of_node)
return;
+ /* 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;
+ np = bus->dev.of_node;
d = irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI);
if (!d)
d = irq_find_host(np);
--
2.1.4
next prev parent reply other threads:[~2015-07-15 12:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 12:16 [PATCH v4 00/19] Per-device MSI domain & platform MSI Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 01/19] genirq: irqdomain: Allow irq domain aliasing Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 02/19] PCI: MSI: Register irq domain with specific token Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 03/19] device core: Introduce per-device MSI domain pointer Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 04/19] PCI/MSI: Add hooks to populate the msi_domain field Marc Zyngier
2015-07-21 21:19 ` Bjorn Helgaas
2015-07-21 21:26 ` Bjorn Helgaas
2015-07-22 14:42 ` Marc Zyngier
2015-07-22 14:48 ` Bjorn Helgaas
2015-07-22 14:54 ` Marc Zyngier
2015-07-22 16:53 ` Bjorn Helgaas
2015-07-22 17:42 ` Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 05/19] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier
2015-07-21 21:30 ` Bjorn Helgaas
2015-07-15 12:16 ` Marc Zyngier [this message]
2015-07-15 12:16 ` [PATCH v4 07/19] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier
2015-07-21 21:17 ` Bjorn Helgaas
2015-07-22 15:19 ` Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 08/19] platform: of: Assign MSI domain to platform device Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 09/19] drivers: base: Add MSI domain support for non-PCI devices Marc Zyngier
2015-07-20 2:33 ` majun (F)
2015-07-20 7:54 ` Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 10/19] genirq: Add DOMAIN_BUS_NEXUS irqdomain property Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 11/19] irqchip: gicv3-its: Split PCI/MSI code from the core ITS driver Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 12/19] irqchip: gicv3-its: Register irq domain with NEXUS token Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 13/19] irqchip: gicv3-its: Get rid of struct msi_controller Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 14/19] irqchip: gicv3-its: Make the PCI/MSI code standalone Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 15/19] irqchip: gicv3-its: Add platform MSI support Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 16/19] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 17/19] irqchip: GICv2m: Add platform MSI support Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 18/19] PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller Marc Zyngier
2015-07-15 12:16 ` [PATCH v4 19/19] PCI/MSI: Drop domain field from msi_controller Marc Zyngier
2015-07-21 21:37 ` Bjorn Helgaas
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=1436962613-17359-7-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=bhelgaas@google.com \
--cc=dhdang@apm.com \
--cc=jason@lakedaemon.net \
--cc=jiang.liu@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=majun258@huawei.com \
--cc=tglx@linutronix.de \
--cc=wangyijing@huawei.com \
/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).