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>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Yijing Wang <wangyijing@huawei.com>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Subject: [PATCH v2 4/8] PCI/MSI: of: Allow msi_domain lookup using the PHB node
Date: Thu, 8 Jan 2015 17:06:08 +0000 [thread overview]
Message-ID: <1420736772-11088-5-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1420736772-11088-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 PHB 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 d8d1274..75bfb85 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -68,9 +68,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;
dev_set_msi_domain(&bus->dev, irq_find_host(np));
#endif
}
--
2.1.4
next prev parent reply other threads:[~2015-01-08 17:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-08 17:06 [PATCH v2 0/8] Introducing per-device MSI domain Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 1/8] device core: Introduce per-device MSI domain pointer Marc Zyngier
2015-01-15 20:35 ` Stuart Yoder
2015-01-16 19:10 ` Marc Zyngier
2015-01-19 2:10 ` Jiang Liu
2015-01-20 17:17 ` Stuart Yoder
2015-01-21 1:34 ` Jiang Liu
2015-01-08 17:06 ` [PATCH v2 2/8] PCI/MSI: Add hooks to populate the msi_domain field Marc Zyngier
2015-01-13 12:34 ` Yijing Wang
2015-01-13 13:45 ` Marc Zyngier
2015-01-14 2:04 ` Yijing Wang
2015-01-14 2:06 ` Yijing Wang
2015-01-08 17:06 ` [PATCH v2 3/8] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier
2015-01-14 8:17 ` Yun Wu (Abel)
2015-01-14 10:19 ` Marc Zyngier
2015-01-08 17:06 ` Marc Zyngier [this message]
2015-01-08 17:06 ` [PATCH v2 5/8] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 6/8] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 7/8] irqchip: gicv3-its: " Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 8/8] PCI/MSI: Drop domain field from msi_controller Marc Zyngier
2015-01-27 0:45 ` [PATCH v2 0/8] Introducing per-device MSI domain 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=1420736772-11088-5-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=Suravee.Suthikulpanit@amd.com \
--cc=bhelgaas@google.com \
--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=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
all inboxes | Powered by JetHome®