diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-07-28 14:46:09 +0100 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-10-15 15:50:39 +0800 |
| commit | 90f8c5124ba5a059776286a9cb010b07908dbef4 (patch) | |
| tree | c39841e42f21f4e80bcae69062a2d9383ab0422d | |
| parent | 7a61f04c58eaaea99757a42209cbf5cf441ee9d2 (diff) | |
PCI/MSI: Register irq domain with specific token
When creating a PCI/MSI domain, tag it with DOMAIN_BUS_PCI_MSI so
that it can be looked-up using irq_find_matching_host().
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Ma Jun <majun258@huawei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Duc Dang <dhdang@apm.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-3-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
(cherry picked from commit 0380839dc90c53e24ddfa0f17ad909c2ddc345c2)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | drivers/pci/msi.c | 9 | ||||
| -rw-r--r-- | include/linux/irqdomain.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index c3e7dfcf9ff5..4c8cd1a17625 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1302,12 +1302,19 @@ struct irq_domain *pci_msi_create_irq_domain(struct device_node *node, struct msi_domain_info *info, struct irq_domain *parent) { + struct irq_domain *domain; + if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS) pci_msi_domain_update_dom_ops(info); if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS) pci_msi_domain_update_chip_ops(info); - return msi_create_irq_domain(node, info, parent); + domain = msi_create_irq_domain(node, info, parent); + if (!domain) + return NULL; + + domain->bus_token = DOMAIN_BUS_PCI_MSI; + return domain; } /** diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index a3ad60a88b5f..899ad15e7822 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -54,6 +54,7 @@ struct irq_data; */ enum irq_domain_bus_token { DOMAIN_BUS_ANY = 0, + DOMAIN_BUS_PCI_MSI, }; /** |