Commit-ID: 0380839dc90c53e24ddfa0f17ad909c2ddc345c2 Gitweb: http://git.kernel.org/tip/0380839dc90c53e24ddfa0f17ad909c2ddc345c2 Author: Marc Zyngier <marc.zyng...@arm.com> AuthorDate: Tue, 28 Jul 2015 14:46:09 +0100 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Thu, 30 Jul 2015 00:14:37 +0200
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 <bhelg...@google.com> Reviewed-by: Hanjun Guo <hanjun....@linaro.org> Signed-off-by: Marc Zyngier <marc.zyng...@arm.com> Cc: <linux-arm-ker...@lists.infradead.org> Cc: Yijing Wang <wangyij...@huawei.com> Cc: Ma Jun <majun...@huawei.com> Cc: Lorenzo Pieralisi <lorenzo.pieral...@arm.com> Cc: Duc Dang <dhd...@apm.com> Cc: Jiang Liu <jiang....@linux.intel.com> Cc: Jason Cooper <ja...@lakedaemon.net> Link: http://lkml.kernel.org/r/1438091186-10244-3-git-send-email-marc.zyng...@arm.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- drivers/pci/msi.c | 9 ++++++++- include/linux/irqdomain.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index cd4c78c..3aae7c9 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1273,12 +1273,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 91a83ad..25e9e66 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, }; /** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/