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>
Subject: [PATCH v3 08/15] platform: of: Assign MSI domain to platform device
Date: Tue, 7 Jul 2015 18:17:58 +0100 [thread overview]
Message-ID: <1436289485-28230-9-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1436289485-28230-1-git-send-email-marc.zyngier@arm.com>
As for PCI, we're able to populate the msi_domain field at probe time,
provided that the device tree has an "msi-parent" property.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
drivers/of/irq.c | 16 ++++++++++++++++
drivers/of/platform.c | 1 +
include/linux/irqdomain.h | 1 +
include/linux/of_irq.h | 1 +
4 files changed, 19 insertions(+)
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 3cf7a01..64392a6 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -18,6 +18,7 @@
* driver.
*/
+#include <linux/device.h>
#include <linux/errno.h>
#include <linux/list.h>
#include <linux/module.h>
@@ -576,3 +577,18 @@ err:
kfree(desc);
}
}
+
+void of_msi_configure(struct device *dev, struct device_node *np)
+{
+ struct device_node *msi_np;
+ struct irq_domain *d;
+
+ msi_np = of_parse_phandle(np, "msi-parent", 0);
+ if (!msi_np)
+ return;
+
+ 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);
+}
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index ddf8e42..8a002d6 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -184,6 +184,7 @@ static struct platform_device *of_platform_device_create_pdata(
dev->dev.bus = &platform_bus_type;
dev->dev.platform_data = platform_data;
of_dma_configure(&dev->dev, dev->dev.of_node);
+ of_msi_configure(&dev->dev, dev->dev.of_node);
if (of_device_add(dev) != 0) {
of_dma_deconfigure(&dev->dev);
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 25e9e66..b4a74f7 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -55,6 +55,7 @@ struct irq_data;
enum irq_domain_bus_token {
DOMAIN_BUS_ANY = 0,
DOMAIN_BUS_PCI_MSI,
+ DOMAIN_BUS_PLATFORM_MSI,
};
/**
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index d884929..4bcbd58 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -74,6 +74,7 @@ static inline int of_irq_to_resource_table(struct device_node *dev,
*/
extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
extern struct device_node *of_irq_find_parent(struct device_node *child);
+extern void of_msi_configure(struct device *dev, struct device_node *np);
#else /* !CONFIG_OF */
static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
--
2.1.4
next prev parent reply other threads:[~2015-07-07 17:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 17:17 [PATCH v3 00/15] Introducing per-device MSI domain Marc Zyngier
2015-07-07 17:17 ` [PATCH v3 01/15] genirq: irqdomain: Allow irq domain aliasing Marc Zyngier
2015-07-07 17:17 ` [PATCH v3 02/15] PCI: MSI: Register irq domain with specific token Marc Zyngier
2015-07-07 17:17 ` [PATCH v3 03/15] device core: Introduce per-device MSI domain pointer Marc Zyngier
2015-07-07 17:17 ` [PATCH v3 04/15] PCI/MSI: Add hooks to populate the msi_domain field Marc Zyngier
2015-07-07 17:17 ` [PATCH v3 05/15] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier
2015-07-07 17:17 ` [PATCH v3 06/15] PCI/MSI: of: Allow msi_domain lookup using the host bridge node Marc Zyngier
2015-07-07 17:17 ` [PATCH v3 07/15] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier
2015-07-07 17:17 ` Marc Zyngier [this message]
2015-07-07 17:17 ` [PATCH v3 09/15] irqchip: gicv3-its: Split PCI/MSI code from the core ITS driver Marc Zyngier
2015-07-08 10:48 ` Thomas Gleixner
2015-07-08 11:02 ` Marc Zyngier
2015-07-07 17:18 ` [PATCH v3 10/15] irqchip: gicv3-its: Register irq domain with platform MSI token Marc Zyngier
2015-07-07 17:18 ` [PATCH v3 11/15] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier
2015-07-07 17:18 ` [PATCH v3 12/15] irqchip: gicv3-its: " Marc Zyngier
2015-07-07 17:18 ` [PATCH v3 13/15] irqchip: gicv3-its: Make the PCI/MSI code standalone Marc Zyngier
2015-07-07 17:18 ` [PATCH v3 14/15] PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller Marc Zyngier
2015-07-09 22:12 ` Duc Dang
2015-07-10 8:43 ` Marc Zyngier
2015-07-07 17:18 ` [PATCH v3 15/15] PCI/MSI: Drop domain field from msi_controller Marc Zyngier
2015-07-09 13:58 ` [PATCH v3 00/15] Introducing per-device MSI domain Lorenzo Pieralisi
2015-07-09 14:35 ` Marc Zyngier
2015-07-10 13:34 ` Lorenzo Pieralisi
2015-07-10 14:25 ` 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=1436289485-28230-9-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=bhelgaas@google.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).