From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754371AbbG2W0M (ORCPT ); Wed, 29 Jul 2015 18:26:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36985 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753800AbbG2W0J (ORCPT ); Wed, 29 Jul 2015 18:26:09 -0400 Date: Wed, 29 Jul 2015 15:25:32 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: tglx@linutronix.de, lorenzo.pieralisi@arm.com, jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dhdang@apm.com, jason@lakedaemon.net, marc.zyngier@arm.com, bhelgaas@google.com, majun258@huawei.com, hanjun.guo@linaro.org, hpa@zytor.com, wangyijing@huawei.com, mingo@kernel.org Reply-To: mingo@kernel.org, hpa@zytor.com, wangyijing@huawei.com, hanjun.guo@linaro.org, majun258@huawei.com, bhelgaas@google.com, marc.zyngier@arm.com, jason@lakedaemon.net, dhdang@apm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, lorenzo.pieralisi@arm.com, jiang.liu@linux.intel.com, tglx@linutronix.de In-Reply-To: <1438091186-10244-4-git-send-email-marc.zyngier@arm.com> References: <1438091186-10244-4-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] device core: Introduce per-device MSI domain pointer Git-Commit-ID: f1421db8ca4c110144be97a5997ed83d34685db5 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: f1421db8ca4c110144be97a5997ed83d34685db5 Gitweb: http://git.kernel.org/tip/f1421db8ca4c110144be97a5997ed83d34685db5 Author: Marc Zyngier AuthorDate: Tue, 28 Jul 2015 14:46:10 +0100 Committer: Thomas Gleixner CommitDate: Thu, 30 Jul 2015 00:14:37 +0200 device core: Introduce per-device MSI domain pointer As MSI-type features are creeping into non-PCI devices, it is starting to make sense to give our struct device some form of support for this, by allowing a pointer to an MSI irq domain to be set/retrieved. Reviewed-by: Hanjun Guo Signed-off-by: Marc Zyngier Cc: Cc: Yijing Wang Cc: Ma Jun Cc: Lorenzo Pieralisi Cc: Duc Dang Cc: Bjorn Helgaas Cc: Jiang Liu Cc: Jason Cooper Link: http://lkml.kernel.org/r/1438091186-10244-4-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- include/linux/device.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/linux/device.h b/include/linux/device.h index 3d3139a..50e0005 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -715,6 +715,7 @@ struct device_dma_parameters { * @pins: For device pin management. * See Documentation/pinctrl.txt for details. * @msi_list: Hosts MSI descriptors + * @msi_domain: The generic MSI domain this device is using. * @numa_node: NUMA node this device is close to. * @dma_mask: Dma mask (if dma'ble device). * @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all @@ -775,6 +776,9 @@ struct device { struct dev_pm_info power; struct dev_pm_domain *pm_domain; +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN + struct irq_domain *msi_domain; +#endif #ifdef CONFIG_PINCTRL struct dev_pin_info *pins; #endif @@ -865,6 +869,22 @@ static inline void set_dev_node(struct device *dev, int node) } #endif +static inline struct irq_domain *dev_get_msi_domain(const struct device *dev) +{ +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN + return dev->msi_domain; +#else + return NULL; +#endif +} + +static inline void dev_set_msi_domain(struct device *dev, struct irq_domain *d) +{ +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN + dev->msi_domain = d; +#endif +} + static inline void *dev_get_drvdata(const struct device *dev) { return dev->driver_data;