From patchwork Mon Nov 17 11:03:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 5318041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 48E26C11AC for ; Mon, 17 Nov 2014 11:04:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 434BD200CA for ; Mon, 17 Nov 2014 11:04:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F6E6200F0 for ; Mon, 17 Nov 2014 11:04:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqK4w-0002FL-QN; Mon, 17 Nov 2014 11:02:42 +0000 Received: from mga09.intel.com ([134.134.136.24]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqK3M-00010U-0O for linux-arm-kernel@lists.infradead.org; Mon, 17 Nov 2014 11:01:05 +0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 17 Nov 2014 02:58:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,691,1406617200"; d="scan'208";a="487989094" Received: from gerry-dev.bj.intel.com ([10.238.158.52]) by orsmga003.jf.intel.com with ESMTP; 17 Nov 2014 02:58:32 -0800 From: Jiang Liu To: Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Grant Likely , Marc Zyngier , Yijing Wang , Yingjoe Chen , Borislav Petkov , "H. Peter Anvin" , Matthias Brugger , Jiang Liu , Alexander Gordeev Subject: [Patch V3 7/9] genirq: Provide default callbacks for msi_domain_ops Date: Mon, 17 Nov 2014 19:03:20 +0800 Message-Id: <1416222202-28002-8-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1416222202-28002-1-git-send-email-jiang.liu@linux.intel.com> References: <1416222202-28002-1-git-send-email-jiang.liu@linux.intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141117_030104_168093_7B94B22B X-CRM114-Status: GOOD ( 18.44 ) X-Spam-Score: -5.0 (-----) Cc: linux-pci@vger.kernel.org, Tony Luck , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Extend struct msi_domain_info and provide default callbacks for msi_domain_ops. Signed-off-by: Jiang Liu --- include/linux/msi.h | 29 ++++++++++--- kernel/irq/msi.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 132 insertions(+), 13 deletions(-) diff --git a/include/linux/msi.h b/include/linux/msi.h index 243c4eb485a6..3571b4715c75 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -3,6 +3,7 @@ #include #include +#include #include /* for msi_alloc_info_t */ struct msi_msg { @@ -124,13 +125,15 @@ typedef struct msi_alloc_info msi_alloc_info_t; struct msi_domain_ops { /* Callbacks for msi_create_irq_domain() */ - void (*calc_hwirq)(struct msi_domain_info *info, void *arg, + void (*calc_hwirq)(struct msi_domain_info *info, + msi_alloc_info_t *arg, struct msi_desc *desc); - irq_hw_number_t (*get_hwirq)(struct msi_domain_info *info, void *arg); + irq_hw_number_t (*get_hwirq)(struct msi_domain_info *info, + msi_alloc_info_t *arg); int (*msi_init)(struct irq_domain *domain, struct msi_domain_info *info, unsigned int virq, irq_hw_number_t hwirq, - void *arg); + msi_alloc_info_t *arg); void (*msi_free)(struct irq_domain *domain, struct msi_domain_info *info, unsigned int virq); @@ -150,15 +153,31 @@ struct msi_domain_ops { }; struct msi_domain_info { + u32 flags; struct msi_domain_ops *ops; struct irq_chip *chip; - void *data; + void *chip_data; /* optional chip data */ + irq_flow_handler_t handler; /* optional flow handler */ + void *handler_data; /* optional handler data */ + const char *handler_name; /* optional handler name */ + void *data; /* optional private data */ }; +/* Use default MSI domain ops if possible */ +#define MSI_FLAG_USE_DEF_DOM_OPS 0x1 +/* Use default MSI chip ops if possible */ +#define MSI_FLAG_USE_DEF_CHIP_OPS 0x2 +/* Build identity map between hwirq and irq */ +#define MSI_FLAG_IDENTITY_MAP 0x10 +/* Support multiple PCI MSI interrupts */ +#define MSI_FLAG_MULTI_PCI_MSI 0x100 +/* Support PCI MSIX interrupts */ +#define MSI_FLAG_PCI_MSIX 0x200 + int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force); -struct irq_domain *msi_create_irq_domain(struct device_node *of_node, +struct irq_domain *msi_create_irq_domain(struct device_node *node, struct msi_domain_info *info, struct irq_domain *parent); int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 586cd8b3a174..1aa06b3281d6 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -9,6 +9,8 @@ * This file contains common code to support Message Signalled Interrupt for * PCI compatible and non PCI compatible devices. */ +#include +#include #include #include #include @@ -114,17 +116,110 @@ static struct irq_domain_ops msi_domain_ops = { .deactivate = msi_domain_deactivate, }; -struct irq_domain *msi_create_irq_domain(struct device_node *of_node, +#ifndef msi_alloc_info_t +static irq_hw_number_t msi_domain_ops_get_hwirq(struct msi_domain_info *info, + struct msi_alloc_info *arg) +{ + return arg->hwirq; +} + +static int msi_domain_ops_prepare(struct irq_domain *domain, struct device *dev, + int nvec, struct msi_alloc_info *arg) +{ + memset(arg, 0, sizeof(*arg)); + + return 0; +} + +static int msi_domain_ops_set_desc(struct msi_alloc_info *arg, + struct msi_desc *desc) +{ + arg->desc = desc; + + return 0; +} +#else +#define msi_domain_ops_get_hwirq NULL +#define msi_domain_ops_prepare NULL +#define msi_domain_ops_set_desc NULL +#endif /* msi_alloc_info_t */ + +static int msi_domain_ops_init(struct irq_domain *domain, + struct msi_domain_info *info, + unsigned int virq, irq_hw_number_t hwirq, + msi_alloc_info_t *arg) +{ + irq_domain_set_hwirq_and_chip(domain, virq, hwirq, info->chip, + info->chip_data); + if (info->handler && info->handler_name) { + __irq_set_handler(virq, info->handler, 0, info->handler_name); + if (info->handler_data) + irq_set_handler_data(virq, info->handler_data); + } + + return 0; +} + +static int msi_domain_ops_check(struct irq_domain *domain, + struct msi_domain_info *info, + struct device *dev) +{ + return 0; +} + +static struct msi_domain_ops msi_domain_ops_default = { + .get_hwirq = msi_domain_ops_get_hwirq, + .msi_init = msi_domain_ops_init, + .msi_check = msi_domain_ops_check, + .msi_prepare = msi_domain_ops_prepare, + .set_desc = msi_domain_ops_set_desc, +}; + +static void msi_domain_update_dom_ops(struct msi_domain_info *info) +{ + struct msi_domain_ops *ops = info->ops; + + if (ops == NULL) { + info->ops = &msi_domain_ops_default; + return; + } + + if (ops->get_hwirq == NULL) + ops->get_hwirq = msi_domain_ops_default.get_hwirq; + if (ops->msi_init == NULL) + ops->msi_init = msi_domain_ops_default.msi_init; + if (ops->msi_check == NULL) + ops->msi_check = msi_domain_ops_default.msi_check; + if (ops->msi_prepare == NULL) + ops->msi_prepare = msi_domain_ops_default.msi_prepare; + if (ops->set_desc == NULL) + ops->set_desc = msi_domain_ops_default.set_desc; +} + +static void msi_domain_update_chip_ops(struct msi_domain_info *info) +{ + struct irq_chip *chip = info->chip; + + BUG_ON(!chip); + if (!chip->irq_mask) + chip->irq_mask = mask_msi_irq; + if (!chip->irq_unmask) + chip->irq_unmask = unmask_msi_irq; + if (!chip->irq_set_affinity) + chip->irq_set_affinity = msi_domain_set_affinity; +} + +struct irq_domain *msi_create_irq_domain(struct device_node *node, struct msi_domain_info *info, struct irq_domain *parent) { - struct irq_domain *domain; - - domain = irq_domain_add_tree(of_node, &msi_domain_ops, info); - if (domain) - domain->parent = parent; + if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS) + msi_domain_update_dom_ops(info); + if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS) + msi_domain_update_chip_ops(info); - return domain; + return irq_domain_add_hierarchy(parent, 0, 0, node, &msi_domain_ops, + info); } int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, @@ -147,7 +242,12 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, if (ret) goto handle_error; - virq = __irq_domain_alloc_irqs(domain, -1, desc->nvec_used, + if (info->flags & MSI_FLAG_IDENTITY_MAP) + virq = (int)ops->get_hwirq(info, &arg); + else + virq = -1; + + virq = __irq_domain_alloc_irqs(domain, virq, desc->nvec_used, dev_to_node(dev), &arg, false); if (virq >= 0) { for (i = 0; i < desc->nvec_used; i++)