From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754343AbbG2WZ4 (ORCPT ); Wed, 29 Jul 2015 18:25:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36974 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753978AbbG2WZx (ORCPT ); Wed, 29 Jul 2015 18:25:53 -0400 Date: Wed, 29 Jul 2015 15:25:14 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: hanjun.guo@linaro.org, jason@lakedaemon.net, hpa@zytor.com, majun258@huawei.com, bhelgaas@google.com, linux-arm-kernel@lists.infradead.org, mingo@kernel.org, jiang.liu@linux.intel.com, dhdang@apm.com, linux-kernel@vger.kernel.org, wangyijing@huawei.com, marc.zyngier@arm.com, tglx@linutronix.de, lorenzo.pieralisi@arm.com Reply-To: bhelgaas@google.com, linux-arm-kernel@lists.infradead.org, hpa@zytor.com, jason@lakedaemon.net, hanjun.guo@linaro.org, majun258@huawei.com, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, dhdang@apm.com, mingo@kernel.org, wangyijing@huawei.com In-Reply-To: <1438091186-10244-3-git-send-email-marc.zyngier@arm.com> References: <1438091186-10244-3-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] PCI/MSI: Register irq domain with specific token Git-Commit-ID: 0380839dc90c53e24ddfa0f17ad909c2ddc345c2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0380839dc90c53e24ddfa0f17ad909c2ddc345c2 Gitweb: http://git.kernel.org/tip/0380839dc90c53e24ddfa0f17ad909c2ddc345c2 Author: Marc Zyngier AuthorDate: Tue, 28 Jul 2015 14:46:09 +0100 Committer: Thomas Gleixner 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 Reviewed-by: Hanjun Guo Signed-off-by: Marc Zyngier Cc: Cc: Yijing Wang Cc: Ma Jun Cc: Lorenzo Pieralisi Cc: Duc Dang Cc: Jiang Liu Cc: Jason Cooper Link: http://lkml.kernel.org/r/1438091186-10244-3-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- 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, }; /**