From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754583AbbG2W3c (ORCPT ); Wed, 29 Jul 2015 18:29:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37140 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754283AbbG2W3a (ORCPT ); Wed, 29 Jul 2015 18:29:30 -0400 Date: Wed, 29 Jul 2015 15:28:49 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: marc.zyngier@arm.com, mingo@kernel.org, dhdang@apm.com, wangyijing@huawei.com, linux-kernel@vger.kernel.org, bhelgaas@google.com, jiang.liu@linux.intel.com, hpa@zytor.com, hanjun.guo@linaro.org, tglx@linutronix.de, majun258@huawei.com, linux-arm-kernel@lists.infradead.org, jason@lakedaemon.net, lorenzo.pieralisi@arm.com Reply-To: dhdang@apm.com, bhelgaas@google.com, linux-kernel@vger.kernel.org, wangyijing@huawei.com, mingo@kernel.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, lorenzo.pieralisi@arm.com, jason@lakedaemon.net, tglx@linutronix.de, majun258@huawei.com, hpa@zytor.com, hanjun.guo@linaro.org, jiang.liu@linux.intel.com In-Reply-To: <1438091186-10244-13-git-send-email-marc.zyngier@arm.com> References: <1438091186-10244-13-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/gicv3-its: Register irq domain with NEXUS token Git-Commit-ID: e55dcd4d8b8b82e4ecef2937c6d1dde7ba82916b 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: e55dcd4d8b8b82e4ecef2937c6d1dde7ba82916b Gitweb: http://git.kernel.org/tip/e55dcd4d8b8b82e4ecef2937c6d1dde7ba82916b Author: Marc Zyngier AuthorDate: Tue, 28 Jul 2015 14:46:19 +0100 Committer: Thomas Gleixner CommitDate: Thu, 30 Jul 2015 00:14:38 +0200 irqchip/gicv3-its: Register irq domain with NEXUS token Now that we can distinguish between multiple domains carrying the same device_node, tag the raw ITS domain with DOMAIN_BUS_NEXUS. This will allow MSI providers built on top of the raw ITS domain to identify it. Signed-off-by: Marc Zyngier Cc: Cc: Yijing Wang Cc: Ma Jun Cc: Lorenzo Pieralisi Cc: Duc Dang Cc: Hanjun Guo Cc: Bjorn Helgaas Cc: Jiang Liu Cc: Jason Cooper Link: http://lkml.kernel.org/r/1438091186-10244-13-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-gic-v3-its.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 7f995d8..58dc70e 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1444,13 +1444,14 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR); if (of_property_read_bool(its->msi_chip.of_node, "msi-controller")) { - its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its); + its->domain = irq_domain_add_tree(node, &its_domain_ops, its); if (!its->domain) { err = -ENOMEM; goto out_free_tables; } its->domain->parent = parent; + its->domain->bus_token = DOMAIN_BUS_NEXUS; its->msi_chip.domain = its_pci_msi_alloc_domain(node, its->domain);