From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752784AbcAFWY5 (ORCPT ); Wed, 6 Jan 2016 17:24:57 -0500 Received: from mail-bl2on0119.outbound.protection.outlook.com ([65.55.169.119]:33081 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752091AbcAFWWD (ORCPT ); Wed, 6 Jan 2016 17:22:03 -0500 Authentication-Results: spf=permerror (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 RESEND v4 05/11] staging: fsl-mc: Extended MC bus allocator to include IRQs Date: Wed, 6 Jan 2016 16:03:23 -0600 Message-ID: <1452117809-1870-6-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1452117809-1870-1-git-send-email-German.Rivera@freescale.com> References: <1452117809-1870-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD047;1:TuoWdyxZWX+M3N9t1NkIVzYpYXW1R0KIJuOdRjHJAJgOXXDFkrb3gU42PJQ84aqOsur6RyXRUOwNY5psBAHLEz6g2vkebKXTGHC2CbDJYBvGAcWV+Mb1Mso/dv0pYXAnSg1CURu66KBdv6rw7A7JzsT9Kq5fE7avAAZQd0LRwZhQqPshW/eXdtkZGCTH84exrN8x+6pa2L4JTIcxtdJzBEgNZj6njvyvyGLowwSwy2rZ9QjccOfVtkBf/e/W6VuKgC209M9eKY3Rgh9NtnxehV0fDRoyqwke31X4A+Wlr2xcYj7NcHEfMIA3KA6Gdshii/79RbrvXz7Wu7rwkJoTj4lMYTTM5stQLKVpK+znzgLHO6hxsUxaVCcGSpGdnlV82Vw8PDv65GgfXxiInYFwVxGb3QHEYxrnAC3JiROdY9iYUfE19TRsvfnOp5N9yCjW X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(3190300001)(199003)(189002)(76176999)(50986999)(50226001)(5001960100002)(97736004)(6806005)(47776003)(19580395003)(2906002)(19580405001)(81156007)(2201001)(4001430100002)(2950100001)(48376002)(86362001)(87936001)(229853001)(85326001)(586003)(189998001)(5001770100001)(1220700001)(77096005)(1096002)(107886002)(104016004)(5003940100001)(50466002)(36756003)(92566002)(11100500001)(106466001)(5890100001)(4326007)(5008740100001)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR03MB509;H:tx30smr01.am.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB509;2:MxZH7nthzkVkBrrVVf+2tWKbDhmuyMFNN1qEHe8xdrha91bdFHRCxmSkSn04aiN2rKP+Pnsrd+q/uAUAd3H0e895wwqCUF5hmod7Ek9x2nLfj0I1AjpiPRc1E3vfN/mHu/n/E93SJKk0/lzWiDFz5Q==;3:7QtMOc3qquWTCiIM/EqfD4Pby5N4yz9bWPtCbpOnBtfpX/ssYdIy9f5Bi9Q2hHEJzqE97ewUEXLfsO6K8fi5kFMo8u4GE8jbPapaXmxhX6+U4JMU2PW4MxEUPXVWqb3LOnH3eLkKAfOZHT2NIaAQeUozFEmFIrtapQsnpxlaHdaPwrtVexvMM5RQUacI6lUYpAWXMvMBPWoWr5OBAcAly77nRqbw/Dze92eDcvvS7XE=;25:sT4n1KpGReqprIy/u2wVKHMG+CA+12PV9X6J9sF9QLHRTsr0zVe+HDI3lK00KMlTzIEPflA5TLFonYcIunD+dXAVVnVQmLv9r74PK8U2nmSaYQ/4UbiDZ3S6KvBmFmmJyEFjgIYqVhZVg2pEVfqR/X6ZuFReiQqjJrOcuAUrNQK6O902BTuaxlMYcY9/V/7NmxQ9qbabqJQYJOdbJRMTUQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB509; X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB509;20:gcueg/Q9OfACncTZFR4XPZLcjlPW5kkgJqGfSwJs+7a0UrY2c5z5vUuvmEl96nusuy2A8GbexzJ4EV3TN9y/b3wwHjooI0VOfDREZtym3paymmC5bdmT7u5fDxpeOb/rRK1QltORpz0vgSpeMJ1mGOKoMovlvSgrwKmVvb/nR3HsLAJJv2U6+rPmz2zt7XBWURsvrxN6XdXLZmGztfgComQfrAKGM1Jm7IpZd39syLCon1LaryJtTO+c3KrFvkIsYdAVBDsIkXBkw9S1viug4BQlGpiVWfVbu0JEiokHxXzY/N6BAmQdfrlXTkgSNtROx0PjXgZOkPfB58oz4X2O1DD1WwaTkILBCvLuiElCTcc=;4:vJWkUScJKw+HhOK3qdSiy7wn5b3CY2HmZUIcz5cowgBZWdcLrNf1j/+egFeB8hhnGOeJmB7TaCYuc6t/YOt8F0wOQBDYdhJGXSgVLoRP9QZHyxFZaNMuJyMXqtGQcUV5ZVOn3NumV/3Zb2JTRtIj3RmMwYtpOSr5zdRyxTHOmqJN4z9fnE5MhcJYsROoa3I9jKj09+xhAl+x58WgwcXAN72anf7IxNrQ7PJkozEK0bEkAoJWYS6yoJAp76JmPyhdLKcbqUo+uhvQRpRs7vm24FgaBm7FTOPxdMfHWGCujpVxmheQmkWPz/ET5YTE88lgscKOt4KHSLgoY5LPmHh5rPtQoFMGDcoF2t5V1e7brnj/TwhuvDHdopc7VmCjoyZaU18uyFfz7aY/ELknZtXR2x++gkMgPlArH77upqw2lpJFaWCQcBIrXLDvxrHKP0Z8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(10201501046)(3002001);SRVR:DM2PR03MB509;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB509; X-Forefront-PRVS: 0813C68E65 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR03MB509;23:2iKAMGhgtAno/6H4hRldhFXBxRMQ2OdZxpt9nrvrgc?= =?us-ascii?Q?GlMaVYFG4SLTm3YPWAd/Olc/aNWsY8z2l3xf9Hij4KFIMRjTUBuKPvq4HHLb?= =?us-ascii?Q?n5W7iQ/xNMqLC8qhkbMrrOpfdW71r38oHIDPxMfHOvnU3MMz6N0OirKv/yaa?= =?us-ascii?Q?aNIyMwAiRzTNav1v6m2AtAV02dtiSfaJa//dj888NakqCZLfCkNVWlKj0UoS?= =?us-ascii?Q?AKykTubRtFDitxXK9lk4xVW/V9RFhklacXxFR+w/2TSwqYQyySniujAPlsQ9?= =?us-ascii?Q?pxO0vQdhX3M/Aw/59vpJeRLIvnww8PQci4ExFBOum8z2jt+/oXirO+qZPeKN?= =?us-ascii?Q?6R2ehhzi2tFUyMf9TMMxRE9I4zq2SHBrtGvOq9oPZdKGlAdDj1zAUrkEyMV/?= =?us-ascii?Q?4wTbodM6NMTC9o5wGlNII8ZtUL9ejc+IDqQ/bpFKuP1Qx38jvO1s2IjHgpEJ?= =?us-ascii?Q?iLCqFzsWPZ5eBTGllRggk0Ahf2e1dp38BJNspLhiUuBQX4rCjjuOItn0m3AT?= =?us-ascii?Q?gZq+j1Te6Fk9lBC4gULuoPkpYOkX0fYKaZKakWYi2N1kx3b3x4dkSbUM8JHA?= =?us-ascii?Q?2LzbJQVTHGBU1Z9S6w+BclcwxF01lFs8Efio/8Hajb/aJPonEsoeAuI3m+gF?= =?us-ascii?Q?8jrR5G7G0z+NY7sm44TTN7kzm9q8EE1usZKswnF7j+2/X3mrmycZmVhxYega?= =?us-ascii?Q?sdAa+m2aDo2OGED15bZPkVyfXMSW1IupCDViGv06z8LaFeHA2jPNh6XGRYQ4?= =?us-ascii?Q?FeB8wJmLgQSLTL2ptW4xYmHENJynPydXcSLVdkBgZDpyWZ0jBtMsrqYBJunK?= =?us-ascii?Q?s4IBnIxaeezChcb55HTw3mJ99hkXkXSWPyb3d9Vkj54EZFvPy25CeYBLcWBL?= =?us-ascii?Q?9Hd6NVxey50tEoM/2ratL3fdLFFpOvDt+gywLmiR+m9VJHVzzt/kVysaS7fQ?= =?us-ascii?Q?LLoO/7rQtkR30FpOD2ApfLt6hlNJRWSKOdfCYTccTpzi1RkJMc7YqGYX7s4n?= =?us-ascii?Q?JUojZqQyhVEmlc9oa1WpMoKOXqD6tOJ71DFEThLAM4UQSIQUyHX+ixz7t2H7?= =?us-ascii?Q?KmZ0FglTYsXlIgnKLZzPruHpousNnXF9qRlDmqyIInqkRC6yznDMlfQ/CW7l?= =?us-ascii?Q?uAuQsEy4jWLghjGvMQPBACEem7Fo5G?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB509;5:Kg/ouFTEYGk/5/K2FVmWyeXYYM9vijUqCyskcbZrvFnA1so9WiaHMZrqKxoF70C867ZzgxfiFabpRCWgQuQplCz7zjdmMdpnc7fnobumge53UBX5gErTgj/npFaOTASji2zuuKqKlntxSY3/p6tTbw==;24:kXgglFU4VciEcmbtrrY3EkWkLkmrcVaN0axLA2tqO++2Qp5L3ozINlDqdqkSrbMtGnPuIdBDcm0HhPPfvm6jr/7EguP/+uskJNY20qxLMCk= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2016 22:21:55.4209 (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: DM2PR03MB509 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "J. German Rivera" All the IRQs for DPAA2 objects in the same DPRC must use the ICID of that DPRC, as their device Id in the GIC-ITS. Thus, all these IRQs must share the same ITT table in the GIC. As a result, a pool of IRQs with the same device Id must be preallocated per DPRC (fsl-mc bus instance). So, the fsl-mc bus object allocator is extended to also provide services to allocate IRQs to DPAA2 devices, from their parent fsl-mc bus IRQ pool. Signed-off-by: J. German Rivera --- CHANGE HISTORY Changes in v4: none Changes in v3: none Changes in v2: none drivers/staging/fsl-mc/bus/mc-allocator.c | 199 ++++++++++++++++++++++++++++ drivers/staging/fsl-mc/include/mc-private.h | 15 +++ drivers/staging/fsl-mc/include/mc.h | 9 ++ 3 files changed, 223 insertions(+) diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c index 88d1857..c5fa628 100644 --- a/drivers/staging/fsl-mc/bus/mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/mc-allocator.c @@ -15,6 +15,7 @@ #include "../include/dpcon-cmd.h" #include "dpmcp-cmd.h" #include "dpmcp.h" +#include /** * fsl_mc_resource_pool_add_device - add allocatable device to a resource @@ -160,6 +161,7 @@ static const char *const fsl_mc_pool_type_strings[] = { [FSL_MC_POOL_DPMCP] = "dpmcp", [FSL_MC_POOL_DPBP] = "dpbp", [FSL_MC_POOL_DPCON] = "dpcon", + [FSL_MC_POOL_IRQ] = "irq", }; static int __must_check object_type_to_pool_type(const char *object_type, @@ -465,6 +467,203 @@ void fsl_mc_object_free(struct fsl_mc_device *mc_adev) } EXPORT_SYMBOL_GPL(fsl_mc_object_free); +/* + * Initialize the interrupt pool associated with a MC bus. + * It allocates a block of IRQs from the GIC-ITS + */ +int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus, + unsigned int irq_count) +{ + unsigned int i; + struct msi_desc *msi_desc; + struct fsl_mc_device_irq *irq_resources; + struct fsl_mc_device_irq *mc_dev_irq; + int error; + struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev; + struct fsl_mc_resource_pool *res_pool = + &mc_bus->resource_pools[FSL_MC_POOL_IRQ]; + + if (WARN_ON(irq_count == 0 || + irq_count > FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS)) + return -EINVAL; + + error = fsl_mc_msi_domain_alloc_irqs(&mc_bus_dev->dev, irq_count); + if (error < 0) + return error; + + irq_resources = devm_kzalloc(&mc_bus_dev->dev, + sizeof(*irq_resources) * irq_count, + GFP_KERNEL); + if (!irq_resources) { + error = -ENOMEM; + goto cleanup_msi_irqs; + } + + for (i = 0; i < irq_count; i++) { + mc_dev_irq = &irq_resources[i]; + + /* + * NOTE: This mc_dev_irq's MSI addr/value pair will be set + * by the fsl_mc_msi_write_msg() callback + */ + mc_dev_irq->resource.type = res_pool->type; + mc_dev_irq->resource.data = mc_dev_irq; + mc_dev_irq->resource.parent_pool = res_pool; + INIT_LIST_HEAD(&mc_dev_irq->resource.node); + list_add_tail(&mc_dev_irq->resource.node, &res_pool->free_list); + } + + for_each_msi_entry(msi_desc, &mc_bus_dev->dev) { + mc_dev_irq = &irq_resources[msi_desc->fsl_mc.msi_index]; + mc_dev_irq->msi_desc = msi_desc; + mc_dev_irq->resource.id = msi_desc->irq; + } + + res_pool->max_count = irq_count; + res_pool->free_count = irq_count; + mc_bus->irq_resources = irq_resources; + return 0; + +cleanup_msi_irqs: + fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev); + return error; +} +EXPORT_SYMBOL_GPL(fsl_mc_populate_irq_pool); + +/** + * Teardown the interrupt pool associated with an MC bus. + * It frees the IRQs that were allocated to the pool, back to the GIC-ITS. + */ +void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus) +{ + struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev; + struct fsl_mc_resource_pool *res_pool = + &mc_bus->resource_pools[FSL_MC_POOL_IRQ]; + + if (WARN_ON(!mc_bus->irq_resources)) + return; + + if (WARN_ON(res_pool->max_count == 0)) + return; + + if (WARN_ON(res_pool->free_count != res_pool->max_count)) + return; + + INIT_LIST_HEAD(&res_pool->free_list); + res_pool->max_count = 0; + res_pool->free_count = 0; + mc_bus->irq_resources = NULL; + fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev); +} +EXPORT_SYMBOL_GPL(fsl_mc_cleanup_irq_pool); + +/** + * It allocates the IRQs required by a given MC object device. The + * IRQs are allocated from the interrupt pool associated with the + * MC bus that contains the device, if the device is not a DPRC device. + * Otherwise, the IRQs are allocated from the interrupt pool associated + * with the MC bus that represents the DPRC device itself. + */ +int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev) +{ + int i; + int irq_count; + int res_allocated_count = 0; + int error = -EINVAL; + struct fsl_mc_device_irq **irqs = NULL; + struct fsl_mc_bus *mc_bus; + struct fsl_mc_resource_pool *res_pool; + + if (WARN_ON(mc_dev->irqs)) + return -EINVAL; + + irq_count = mc_dev->obj_desc.irq_count; + if (WARN_ON(irq_count == 0)) + return -EINVAL; + + if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) + mc_bus = to_fsl_mc_bus(mc_dev); + else + mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent)); + + if (WARN_ON(!mc_bus->irq_resources)) + return -EINVAL; + + res_pool = &mc_bus->resource_pools[FSL_MC_POOL_IRQ]; + if (res_pool->free_count < irq_count) { + dev_err(&mc_dev->dev, + "Not able to allocate %u irqs for device\n", irq_count); + return -ENOSPC; + } + + irqs = devm_kzalloc(&mc_dev->dev, irq_count * sizeof(irqs[0]), + GFP_KERNEL); + if (!irqs) + return -ENOMEM; + + for (i = 0; i < irq_count; i++) { + struct fsl_mc_resource *resource; + + error = fsl_mc_resource_allocate(mc_bus, FSL_MC_POOL_IRQ, + &resource); + if (error < 0) + goto error_resource_alloc; + + irqs[i] = to_fsl_mc_irq(resource); + res_allocated_count++; + + WARN_ON(irqs[i]->mc_dev); + irqs[i]->mc_dev = mc_dev; + irqs[i]->dev_irq_index = i; + } + + mc_dev->irqs = irqs; + return 0; + +error_resource_alloc: + for (i = 0; i < res_allocated_count; i++) { + irqs[i]->mc_dev = NULL; + fsl_mc_resource_free(&irqs[i]->resource); + } + + return error; +} +EXPORT_SYMBOL_GPL(fsl_mc_allocate_irqs); + +/* + * It frees the IRQs that were allocated for a MC object device, by + * returning them to the corresponding interrupt pool. + */ +void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev) +{ + int i; + int irq_count; + struct fsl_mc_bus *mc_bus; + struct fsl_mc_device_irq **irqs = mc_dev->irqs; + + if (WARN_ON(!irqs)) + return; + + irq_count = mc_dev->obj_desc.irq_count; + + if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) + mc_bus = to_fsl_mc_bus(mc_dev); + else + mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent)); + + if (WARN_ON(!mc_bus->irq_resources)) + return; + + for (i = 0; i < irq_count; i++) { + WARN_ON(!irqs[i]->mc_dev); + irqs[i]->mc_dev = NULL; + fsl_mc_resource_free(&irqs[i]->resource); + } + + mc_dev->irqs = NULL; +} +EXPORT_SYMBOL_GPL(fsl_mc_free_irqs); + /** * fsl_mc_allocator_probe - callback invoked when an allocatable device is * being added to the system diff --git a/drivers/staging/fsl-mc/include/mc-private.h b/drivers/staging/fsl-mc/include/mc-private.h index 28c8d32..3babe92 100644 --- a/drivers/staging/fsl-mc/include/mc-private.h +++ b/drivers/staging/fsl-mc/include/mc-private.h @@ -30,6 +30,16 @@ struct irq_domain; struct msi_domain_info; /** + * Maximum number of total IRQs that can be pre-allocated for an MC bus' + * IRQ pool + */ +#define FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS 256 + +struct device_node; +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 * @num_translation_ranges: number of entries in addr_translation_ranges @@ -137,4 +147,9 @@ int __init its_fsl_mc_msi_init(void); void its_fsl_mc_msi_cleanup(void); +int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus, + unsigned int irq_count); + +void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus); + #endif /* _FSL_MC_PRIVATE_H_ */ diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index 1c1d6ae..ac7c1ce 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -14,12 +14,14 @@ #include #include #include +#include #include "../include/dprc.h" #define FSL_MC_VENDOR_FREESCALE 0x1957 struct fsl_mc_device; struct fsl_mc_io; +struct fsl_mc_bus; /** * struct fsl_mc_driver - MC object device driver object @@ -75,6 +77,7 @@ enum fsl_mc_pool_type { FSL_MC_POOL_DPMCP = 0x0, /* corresponds to "dpmcp" in the MC */ FSL_MC_POOL_DPBP, /* corresponds to "dpbp" in the MC */ FSL_MC_POOL_DPCON, /* corresponds to "dpcon" in the MC */ + FSL_MC_POOL_IRQ, /* * NOTE: New resource pool types must be added before this entry @@ -141,6 +144,7 @@ struct fsl_mc_device_irq { * NULL if none. * @obj_desc: MC description of the DPAA device * @regions: pointer to array of MMIO region entries + * @irqs: pointer to array of pointers to interrupts allocated to this device * @resource: generic resource associated with this MC object device, if any. * * Generic device object for MC object devices that are "attached" to a @@ -172,6 +176,7 @@ struct fsl_mc_device { struct fsl_mc_io *mc_io; struct dprc_obj_desc obj_desc; struct resource *regions; + struct fsl_mc_device_irq **irqs; struct fsl_mc_resource *resource; }; @@ -215,6 +220,10 @@ int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, void fsl_mc_object_free(struct fsl_mc_device *mc_adev); +int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev); + +void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev); + extern struct bus_type fsl_mc_bus_type; #endif /* _FSL_MC_H_ */ -- 2.3.3