From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758178AbbKGBqd (ORCPT ); Fri, 6 Nov 2015 20:46:33 -0500 Received: from mail-bl2on0134.outbound.protection.outlook.com ([65.55.169.134]:3152 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755000AbbKGBqZ (ORCPT ); Fri, 6 Nov 2015 20:46:25 -0500 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none;freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; From: "J. German Rivera" To: , , , CC: , , , , , , , , , , , , , , "J. German Rivera" Subject: [PATCH v3 03/11] staging: fsl-mc: Added generic MSI support for FSL-MC devices Date: Fri, 6 Nov 2015 19:30:19 -0600 Message-ID: <1446859827-6927-4-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1446859827-6927-1-git-send-email-German.Rivera@freescale.com> References: <1446859827-6927-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD002;1:NQcCfLsOdLNvPcOpAuvnOCqHD07e1wwLdSk+pAp86+P/d/kghxK0Cq2RVX2Nc37vUAdM/2EqYWgwxoVqN6OUyqBKD5sE4hdWAUvZwfWtVrDoga0L5CLZxXONlqnbqwdhRwP1JDo5F3szEHm9Jx3ykeB+RQur8mW+5GP1n6/6ArdY8UfFgszGAIYiuISRMdPKiSoITP9urQ/m3gZ9GTmjlJE25gFq8ZvQ/KDKNggB5tgOR49iiL0Im4zMVIoM2D5abds1Yj24JkGqMBTxSf0rfmo49VG4h+fOjFBZkYMepjAuHDhf2oRUaH+gU5J8Y0qPFrm1x5e547jFOHJppNGNj6xJzLO3MtiOipGcuXCHzuFCxeIBUQaqZqQPzTs6P3pAownBhoZkipCdvD06Mm3PGw== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(5008740100001)(229853001)(97736004)(85426001)(104016004)(81156007)(5001770100001)(107886002)(19580405001)(50986999)(87936001)(6806005)(76176999)(50466002)(48376002)(19580395003)(106466001)(92566002)(5001960100002)(36756003)(5003940100001)(47776003)(105606002)(77096005)(50226001)(5007970100001)(2950100001)(11100500001)(189998001)(4001430100002)(86362001)(2201001)(41533002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR0301MB1637;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1637;2:RaW3/eDzha05Xzp+kOau/IAOfJ6xwQCNTg57x7pABSXlrgeOkCKwfaI2s1u7sMzy9D6igAddW+CGApMo3ep7irey7dVgDK1t/Zcc4CAqSvbYXkAIU7ioPcyCsbOkLh/0zJ2C6vGJv7RvvfCO7UpAySO8zYDA5MZUaMVjR/TIQyQ=;3:jfZ4lDksin5Cju5g+xizXDqcDE91isi2qnL7kwMeNAjgVOfieo5m8g0Oz+RL7628NR+Vg6vbjsljZmSYX8MZJXIOS67vujpFUi5Mltl29VhWvBXImO1ZxT5pW8d4Dlsqd9XqMLCb9ROcdGfwJ75AGOFBSBYTVq8ahXh0Pj3573y0Pqd0TH0dDVhrJeJzq33wqqiZBaP2hrA4OKR7RD076oPEZm2g3QTJC3xzUfRhjJM=;25:oyrvC1krB8BhHcmp6YHBUBQp3DpnrtA9TPzYP1qpOrGzZ9MRy9+8PffhKk1qbrxE7JNibalvca+Otms/JSqoFzQa/RoRTtD5Yr/cTI9cdDwbMfFegVmtoG52GFYgmivrsEFFJ90lp3vAuzSS9/aRjBUzn0jzAng3GFV+L/lLOm8GFHkR/TiiiHMtF4p9Q6Tn2C6ZtrGPwuD4W5BYzv4rwjImpOw71oniVDi7QyqPaeennnMcbMHziNqdy0UsBL7QCdFsWoZnCYtJMZxjh7nR7A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB1637; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1637;20:dXh7YrtXUtfXiAfLwR8PA4Sswf1w9edNmZjuVWKldgBLBIVh98Srl1teQ7RLNzmmvwM6ZA6B0hbrF1lUzWPc3IA+ON2nz0L46iCyTscVns0u5u7X+qxWkKK8zR+zKPUaOU9Us9m0s3drfuLORygFjd7LVjRqBZVqFBuK/E1XqXXLdDkQ/MOp7Q57fzx4MqgAUvJUvL2+Nf0BReDJUAFG6rUrAGsA0MqdkdO93rSjr3EK3FatVmcRaKvm/IWMuRl8iaaKhrQUnxl8iIQieUdThWM/b6AO85y3v1aRAnzt91EUgVQdB4My7U0hgbQyimhScM3gcAqVUXwKf6oVFGsTpOykK468Hmx8zV+Hk0uWWL8=;4:0NGZnnqeMqvr4K/fbNuuEQh8aur4hiUzkPFyY0BN/CBJef3GSlPOuHRSPRLMY6x+Zubd0r1HojXjkxiwBjwVwbM7JW7zVNRoVPMVTG3kOVSYvDVP6fgi34yg+qKGzM8wesuexdJ83JLAhGHCsJzOzvt/7AOki56kHpkwpijbFnLssjVYkYDcTDtnxHSgU5pYcCEBACaKwRuzDfPuC2Ym22EPKiUKsBmxKhVi/IPC7L0hSfm2MmdKdFaJMYybHW2tLx4pUQvAa/FLH9uV8jcEqCL4T26KBYXrJM5fujo64VGRyQxhqXFVBqotuZbCMZOAtjCGsrCI4qozvT0bJE+fb2qHfF/x/lMBv0NLz/akrW7PoUXOOmY2aKO3aQ+Op105 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001);SRVR:BY2PR0301MB1637;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB1637; X-Forefront-PRVS: 0753EA505A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR0301MB1637;23:jjcA1G/dBzJBsfy7EL/97nhys/BR29Fy0D1VZ7H?= =?us-ascii?Q?BdxY3i5H/6kzbZ/xTm0b/wf1g1SUQ36UzGQvivrlwFP86MTRXbPl/3qfkHIA?= =?us-ascii?Q?q6fR5Y0ish6axQex0VxLV+JxzF5M88wjP1su9g001uTdy/9sbBi61R4/UlB7?= =?us-ascii?Q?NV8VR5Zj2mzj6MQINyyGoH9vgqdvVHVF+WOqUt3Pu2EBp5EvBNHWhigR/YsN?= =?us-ascii?Q?DJKTU0CbqB9E4xSokUqSsOGNItFLSwI3N3BnzKyjLbgbrnh95+0Z0laN7xGn?= =?us-ascii?Q?2hv4585eZ/TiESKfUoidIUnhqMEFCjVtge1o4fO9h+Y/H+a3IV3QoAryfnCS?= =?us-ascii?Q?o5hKMz7cpF3gUDsTQjf5aKDlJSAyFWfTWqh2/oNBNxbb4XGiRWm0aBNNVrgj?= =?us-ascii?Q?OLL8IBCIw5adWZA4dNsNuEZQ6v3Yn/gEgxtFKmiU/wM/+yo3nQM8vxE8uhRy?= =?us-ascii?Q?sojUKS+0n5uorY07gtKCkpD7N6fTHIuUeV7sZN1k9242sdwjVZijJwXITBZd?= =?us-ascii?Q?tmA32pPRqFHr7QWeeRDxNl5CfFoljufn7kU6vw0tWbquOAL9JrxnIJ+dvjII?= =?us-ascii?Q?gE+kAz8KoffJjsbWKZnPgeDVZzcD9BCyh4INrj/UQi4cYYyORAjDSfldy3vG?= =?us-ascii?Q?ob3U8gP5dIJtixICFhWDhmNzbiD1ysB6xF5HFzKzYX081xfKNayaHjjJsfJk?= =?us-ascii?Q?I4Kd4XIQ1XeKQ8jNI0xFrPE7Mi0/7nEaNwig/SSv5iOpYYmihixmGI/0BSa5?= =?us-ascii?Q?cRfbj+mhHcSfKA6MHc+0/5T8Q6YiMZZ+mBnsDT302WTzb9LWD4hNmND8m3/w?= =?us-ascii?Q?l/UoVytFN7aKzm8fqGz6r0SYgA3RwGftO+WB8yufz6ZodRjJamunbeAIyN/L?= =?us-ascii?Q?fqyEUjRJ1DxIXYoRFGid7adDA0AFvbCdr6DtutkyL64Kn5jkH/HKPA2Ut4mL?= =?us-ascii?Q?NyNFbBRYTgrMf75mTJdUi7WlejkeWoV7zcItiKVP1wK93ypjxcV7uqWKyyz4?= =?us-ascii?Q?qdQVJYMawwy3G8Ow9JHQJB5bWLV+ATNDyqlmxmoOincl1y9C1wrb+MKuOMdY?= =?us-ascii?Q?WhpMguu4h6Y5r+r1WE2gqylLujjcfRnSEzBUX84LLIYglLze3lg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1637;5:6+OecREFk1WZVxavueNrFoW7bIzFUCarkq1r3ZmJDDtMGupMFXKxn+pFWBuZd9HE4Aw07iLzxRfi5SfhA2kdZVTUPl42Rt0Yti/SljOxrEYMyFi4mGreyeFfKXvfrsTalaTs4LRXhbH2gQ5QcKPXcQ==;24:qEeT4kVOjdvVVx8yMlVxnbQVoJHV7ZuNxSI/DPR2tzxKLqr2F3P46GHRI72XsoSA6BhbRoAWKo3Fake7wFXP7ZwYzRM8AZP5KT7T/XQtb84=;20:VbHiKOhPxBwAjrhx3RQiPPHKnVHd+D6VBWsaAOJckQhJWxDHGdGYg3tKBazYns3kKG32h3mAXmleS0MeQmdFlA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2015 01:46:20.7423 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB1637 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Created an MSI domain for the fsl-mc bus-- including functions to create a domain, find a domain, alloc/free domain irqs, and bus specific overrides for domain and irq_chip ops. Signed-off-by: J. German Rivera --- CHANGE HISTORY Changes in v3: none - Addressed comments from Marc Zyngier: * Added WARN_ON in fsl_mc_msi_set_desc to check that caller does not set set_desc * Changed type of paddr in irq_cfg to be phys_addr_t * Added WARN_ON in fsl_mc_msi_update_chip_op() to check that caller does not set irq_write_msi_msg Changes in v2: none drivers/staging/fsl-mc/bus/Kconfig | 1 + drivers/staging/fsl-mc/bus/Makefile | 1 + drivers/staging/fsl-mc/bus/mc-msi.c | 285 ++++++++++++++++++++++++++++ drivers/staging/fsl-mc/include/dprc.h | 2 +- drivers/staging/fsl-mc/include/mc-private.h | 17 ++ drivers/staging/fsl-mc/include/mc.h | 17 ++ 6 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/fsl-mc/bus/mc-msi.c diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig index 0d779d9..c498ac6 100644 --- a/drivers/staging/fsl-mc/bus/Kconfig +++ b/drivers/staging/fsl-mc/bus/Kconfig @@ -9,6 +9,7 @@ config FSL_MC_BUS tristate "Freescale Management Complex (MC) bus driver" depends on OF && ARM64 + select GENERIC_MSI_IRQ_DOMAIN help Driver to enable the bus infrastructure for the Freescale QorIQ Management Complex (fsl-mc). The fsl-mc is a hardware diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 25433a9..a5f2ba4 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -13,5 +13,6 @@ mc-bus-driver-objs := mc-bus.o \ dpmng.o \ dprc-driver.o \ mc-allocator.o \ + mc-msi.o \ dpmcp.o \ dpbp.o diff --git a/drivers/staging/fsl-mc/bus/mc-msi.c b/drivers/staging/fsl-mc/bus/mc-msi.c new file mode 100644 index 0000000..d6ac465 --- /dev/null +++ b/drivers/staging/fsl-mc/bus/mc-msi.c @@ -0,0 +1,285 @@ +/* + * Freescale Management Complex (MC) bus driver MSI support + * + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Author: German Rivera + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include "../include/mc-private.h" +#include +#include +#include +#include +#include +#include +#include "../include/mc-sys.h" +#include "dprc-cmd.h" + +static void fsl_mc_msi_set_desc(msi_alloc_info_t *arg, + struct msi_desc *desc) +{ + arg->desc = desc; + arg->hwirq = (irq_hw_number_t)desc->fsl_mc.msi_index; +} + +static void fsl_mc_msi_update_dom_ops(struct msi_domain_info *info) +{ + struct msi_domain_ops *ops = info->ops; + + if (WARN_ON(!ops)) + return; + + /* + * set_desc should not be set by the caller + */ + if (WARN_ON(ops->set_desc)) + return; + + ops->set_desc = fsl_mc_msi_set_desc; +} + +static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev, + struct fsl_mc_device_irq *mc_dev_irq) +{ + int error; + struct fsl_mc_device *owner_mc_dev = mc_dev_irq->mc_dev; + struct msi_desc *msi_desc = mc_dev_irq->msi_desc; + struct dprc_irq_cfg irq_cfg; + + /* + * msi_desc->msg.address is 0x0 when this function is invoked in + * the free_irq() code path. In this case, for the MC, we don't + * really need to "unprogram" the MSI, so we just return. + */ + if (msi_desc->msg.address_lo == 0x0 && msi_desc->msg.address_hi == 0x0) + return; + + if (WARN_ON(!owner_mc_dev)) + return; + + irq_cfg.paddr = ((u64)msi_desc->msg.address_hi << 32) | + msi_desc->msg.address_lo; + irq_cfg.val = msi_desc->msg.data; + irq_cfg.user_irq_id = msi_desc->irq; + + if (owner_mc_dev == mc_bus_dev) { + /* + * IRQ is for the mc_bus_dev's DPRC itself + */ + error = dprc_set_irq(mc_bus_dev->mc_io, + MC_CMD_FLAG_INTR_DIS | MC_CMD_FLAG_PRI, + mc_bus_dev->mc_handle, + mc_dev_irq->dev_irq_index, + &irq_cfg); + if (error < 0) { + dev_err(&owner_mc_dev->dev, + "dprc_set_irq() failed: %d\n", error); + } + } else { + /* + * IRQ is for for a child device of mc_bus_dev + */ + error = dprc_set_obj_irq(mc_bus_dev->mc_io, + MC_CMD_FLAG_INTR_DIS | MC_CMD_FLAG_PRI, + mc_bus_dev->mc_handle, + owner_mc_dev->obj_desc.type, + owner_mc_dev->obj_desc.id, + mc_dev_irq->dev_irq_index, + &irq_cfg); + if (error < 0) { + dev_err(&owner_mc_dev->dev, + "dprc_obj_set_irq() failed: %d\n", error); + } + } +} + +/* + * NOTE: This function is invoked with interrupts disabled + */ +static void fsl_mc_msi_write_msg(struct irq_data *irq_data, + struct msi_msg *msg) +{ + struct msi_desc *msi_desc = irq_data_get_msi_desc(irq_data); + struct fsl_mc_device *mc_bus_dev = to_fsl_mc_device(msi_desc->dev); + struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_bus_dev); + struct fsl_mc_device_irq *mc_dev_irq = + &mc_bus->irq_resources[msi_desc->fsl_mc.msi_index]; + + WARN_ON(mc_dev_irq->msi_desc != msi_desc); + msi_desc->msg = *msg; + + /* + * Program the MSI (paddr, value) pair in the device: + */ + __fsl_mc_msi_write_msg(mc_bus_dev, mc_dev_irq); +} + +static void fsl_mc_msi_update_chip_ops(struct msi_domain_info *info) +{ + struct irq_chip *chip = info->chip; + + if (WARN_ON((!chip))) + return; + + /* + * irq_write_msi_msg should not be set by the caller + */ + if (WARN_ON(chip->irq_write_msi_msg)) + return; + + chip->irq_write_msi_msg = fsl_mc_msi_write_msg; +} + +/** + * fsl_mc_msi_create_irq_domain - Create a fsl-mc MSI interrupt domain + * @np: Optional device-tree node of the interrupt controller + * @info: MSI domain info + * @parent: Parent irq domain + * + * Updates the domain and chip ops and creates a fsl-mc MSI + * interrupt domain. + * + * Returns: + * A domain pointer or NULL in case of failure. + */ +struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode, + struct msi_domain_info *info, + struct irq_domain *parent) +{ + struct irq_domain *domain; + + if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS) + fsl_mc_msi_update_dom_ops(info); + if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS) + fsl_mc_msi_update_chip_ops(info); + + domain = msi_create_irq_domain(fwnode, info, parent); + if (domain) + domain->bus_token = DOMAIN_BUS_FSL_MC_MSI; + + return domain; +} + +int fsl_mc_find_msi_domain(struct device_node *mc_of_node, + struct irq_domain **mc_msi_domain) +{ + struct device_node *msi_parent_node; + struct irq_domain *msi_domain; + + msi_parent_node = of_parse_phandle(mc_of_node, "msi-parent", 0); + if (!msi_parent_node) { + pr_err("msi-parent phandle missing for %s\n", + mc_of_node->full_name); + return -ENOENT; + } + + /* + * Look up the fsl-mc MSI domain: + */ + msi_domain = irq_find_matching_host(msi_parent_node, + DOMAIN_BUS_FSL_MC_MSI); + if (!msi_domain) { + pr_err("Unable to find fsl-mc MSI domain for %s\n", + mc_of_node->full_name); + + return -ENOENT; + } + + *mc_msi_domain = msi_domain; + return 0; +} + +static void fsl_mc_msi_free_descs(struct device *dev) +{ + struct msi_desc *desc, *tmp; + + list_for_each_entry_safe(desc, tmp, dev_to_msi_list(dev), list) { + list_del(&desc->list); + free_msi_entry(desc); + } +} + +static int fsl_mc_msi_alloc_descs(struct device *dev, unsigned int irq_count) + +{ + unsigned int i; + int error; + struct msi_desc *msi_desc; + + for (i = 0; i < irq_count; i++) { + msi_desc = alloc_msi_entry(dev); + if (!msi_desc) { + dev_err(dev, "Failed to allocate msi entry\n"); + error = -ENOMEM; + goto cleanup_msi_descs; + } + + msi_desc->fsl_mc.msi_index = i; + msi_desc->nvec_used = 1; + INIT_LIST_HEAD(&msi_desc->list); + list_add_tail(&msi_desc->list, dev_to_msi_list(dev)); + } + + return 0; + +cleanup_msi_descs: + fsl_mc_msi_free_descs(dev); + return error; +} + +int fsl_mc_msi_domain_alloc_irqs(struct device *dev, + unsigned int irq_count) +{ + struct irq_domain *msi_domain; + int error; + + if (WARN_ON(!list_empty(dev_to_msi_list(dev)))) + return -EINVAL; + + error = fsl_mc_msi_alloc_descs(dev, irq_count); + if (error < 0) + return error; + + msi_domain = dev_get_msi_domain(dev); + if (WARN_ON(!msi_domain)) { + error = -EINVAL; + goto cleanup_msi_descs; + } + + /* + * NOTE: Calling this function will trigger the invocation of the + * its_fsl_mc_msi_prepare() callback + */ + error = msi_domain_alloc_irqs(msi_domain, dev, irq_count); + + if (error) { + dev_err(dev, "Failed to allocate IRQs\n"); + goto cleanup_msi_descs; + } + + return 0; + +cleanup_msi_descs: + fsl_mc_msi_free_descs(dev); + return error; +} + +void fsl_mc_msi_domain_free_irqs(struct device *dev) +{ + struct irq_domain *msi_domain; + + msi_domain = dev_get_msi_domain(dev); + if (WARN_ON(!msi_domain)) + return; + + msi_domain_free_irqs(msi_domain, dev); + + if (WARN_ON(list_empty(dev_to_msi_list(dev)))) + return; + + fsl_mc_msi_free_descs(dev); +} diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index c3152f6..94c4927 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h @@ -176,7 +176,7 @@ int dprc_reset_container(struct fsl_mc_io *mc_io, * @user_irq_id: A user defined number associated with this IRQ */ struct dprc_irq_cfg { - u64 paddr; + phys_addr_t paddr; u32 val; int user_irq_id; }; diff --git a/drivers/staging/fsl-mc/include/mc-private.h b/drivers/staging/fsl-mc/include/mc-private.h index 2c4cc79..3dabd003 100644 --- a/drivers/staging/fsl-mc/include/mc-private.h +++ b/drivers/staging/fsl-mc/include/mc-private.h @@ -26,6 +26,9 @@ strcmp(_obj_type, "dpmcp") == 0 || \ strcmp(_obj_type, "dpcon") == 0) +struct irq_domain; +struct msi_domain_info; + /** * struct fsl_mc - Private data of a "fsl,qoriq-mc" platform device * @root_mc_bus_dev: MC object device representing the root DPRC @@ -79,11 +82,13 @@ struct fsl_mc_resource_pool { * @resource_pools: array of resource pools (one pool per resource type) * for this MC bus. These resources represent allocatable entities * from the physical DPRC. + * @irq_resources: Pointer to array of IRQ objects for the IRQ pool * @scan_mutex: Serializes bus scanning */ struct fsl_mc_bus { struct fsl_mc_device mc_dev; struct fsl_mc_resource_pool resource_pools[FSL_MC_NUM_POOL_TYPES]; + struct fsl_mc_device_irq *irq_resources; struct mutex scan_mutex; /* serializes bus scanning */ }; @@ -116,4 +121,16 @@ int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus, void fsl_mc_resource_free(struct fsl_mc_resource *resource); +struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode, + struct msi_domain_info *info, + struct irq_domain *parent); + +int fsl_mc_find_msi_domain(struct device_node *mc_of_node, + struct irq_domain **mc_msi_domain); + +int fsl_mc_msi_domain_alloc_irqs(struct device *dev, + unsigned int irq_count); + +void fsl_mc_msi_domain_free_irqs(struct device *dev); + #endif /* _FSL_MC_PRIVATE_H_ */ diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index a933291..1c1d6ae 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -104,6 +104,23 @@ struct fsl_mc_resource { }; /** + * struct fsl_mc_device_irq - MC object device message-based interrupt + * @msi_desc: pointer to MSI descriptor allocated by fsl_mc_msi_alloc_descs() + * @mc_dev: MC object device that owns this interrupt + * @dev_irq_index: device-relative IRQ index + * @resource: MC generic resource associated with the interrupt + */ +struct fsl_mc_device_irq { + struct msi_desc *msi_desc; + struct fsl_mc_device *mc_dev; + u8 dev_irq_index; + struct fsl_mc_resource resource; +}; + +#define to_fsl_mc_irq(_mc_resource) \ + container_of(_mc_resource, struct fsl_mc_device_irq, resource) + +/** * Bit masks for a MC object device (struct fsl_mc_device) flags */ #define FSL_MC_IS_DPRC 0x0001 -- 2.3.3