From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752356AbcAFWWJ (ORCPT ); Wed, 6 Jan 2016 17:22:09 -0500 Received: from mail-by2on0145.outbound.protection.outlook.com ([207.46.100.145]:19376 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752081AbcAFWWD (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 10/11] staging: fsl-mc: Added DPRC interrupt handler Date: Wed, 6 Jan 2016 16:03:28 -0600 Message-ID: <1452117809-1870-11-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;BN1AFFO11FD045;1:X2ZwP7XcgBaejw5b24QT3vG1egFm3eGiP6IWc6WB1uFU4nj17OS5y0/8+f3izjlv7iWGPvdJltaftvUsx0kKWcByErzx6Ib5lxOzm6FlPqomD1OjPnD304HFtpzx/IhDgnAvMoUqhyORBwTJI35ejFnk3l6ry8NfJk8G4+8F8hY/aqXBwqBXcCsDiaa+4hLstdIP2JnvC/rCGE5v9LYzV6ZitZV3P2FuwHRHHN7HXJRLQmo5NUH3P8ulMh5ekWMm/2+i4vQTxRWq0nvkWQrzRFb8tRN9i8d/SA4W7g907Q1/OL4e9RpwfD/C8zCXSbNoSabQPwjSGu+kUVodVF254ycAAoMKm3CkDIfBqCA7zah6ZVwNy2Q9BWe5C5q6pxyou9vqd9UCFYNTzJXdUY7JIn0b24nJ8Os44FtLrcFrjBETII539qsmpVgjGxwtWfZv X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(3190300001)(189002)(199003)(2950100001)(5001770100001)(36756003)(11100500001)(50466002)(5003940100001)(77096005)(92566002)(2906002)(107886002)(48376002)(4326007)(47776003)(50226001)(106466001)(229853001)(575784001)(76176999)(87936001)(2201001)(50986999)(104016004)(86362001)(586003)(85326001)(6806005)(97736004)(1096002)(4001430100002)(19580405001)(189998001)(1220700001)(81156007)(19580395003)(5001960100002)(5008740100001)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR0301MB1310;H:tx30smr01.am.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1310;2:t764pp9BitU6mAu/l/wWhLcvRgqtHtVrNHgG61XLXfPEa4qTeVVsXl9RIIBoJQjX6CBxkAW2r83oel+/DBXwvVipYrAhYIuqewC8MBYg4NdDn5ZWKv1kwdZxLj6tARfHG/vkuzhaSn5ZBKwenf+gaQ==;3:LqopyFfurPkrzDN6IWFOPy3/DqRAzPU1nKkv8U3oCob9L7NPu19ytAqaOGP1P2YuwUQJQaVcd/q2J3LqKOxIVnSY46rcneJUc3VI9dALotmTU5C+87xd7WTpN/enh/091j8np7RTntx+DAjosnyilKNwg6ixxzrfjjtsj7pUUzdvbrqGRu3RvuUP4sbV8M5JwI5Avbgb59sYm6PB1L54paQIPrxzj8YxwgRAZOJ9pKg=;25:V/WZu4r70+1sZ1x+aNFRoUfpnJWP0PWuGWiNqlnWkgA4SHaJx6pu2OB107g7bUAOghu2zE8Zt1/rzQsKlb3ViH+XE1//S/148A824ZPyP6LjnAoSCZbn93hCGWLRb4GOh1ns2w325/+pa6nNGkJP8hlvyZ2doaJ253mwSEeC1Hy0BETqLuOc5EPdf7Le9tpHDa4NyG48deaERTO3Rn1Gwg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1310; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1310;20:dxoaAwaGcJulAqrf12kB+Ank8kC1CGcAs1I8nRtgadbuyfrzYa1397T/mgR2eMJNm1NZNpzxzwJcspppSFwP6rSBxLKbXQFk451cQVaKd87lUDDuhtJ5/TvN7OuUovrg7NSnnSj6QZlU2d2R3H0nQ/Xw++IKqsR+4eFWGMOJM3stMZv2h1xJVCH4ycRCGvxW0kUpgfbxgUAcMj5dGFCn4kj+EjSl8eJdi1y19GkPsyX0BFLyB9UnSHlR+QQlYontvPp1riiJkQ09fkA72hEWW0YU+5cusB+ZzUyZrvIhAZ3S02ysA4/ZpB2PRl77CipXZlqZW2FK85N53XAJ1w5h9lEfqoe7BBPM46Wb2u3jB8Q=;4:zDJXoYNiYFbyFfJzw8MP//iVEXlU3SxWHaRP7wbPMnvowAOLc3OzNj3qpjsEMj6n0jQHxAFiC1no+SqNgbmBVGkVfciJQNLRbEKlG3OyBt1z1nSfraxQs4YDNrmedJW1kuwktJgXqSDh/INZIVG0L/Oxurvt5OSDYaqS0XyJlISZPhM+bLT/qsyo05Xmek+FNJ8ryOxq2GAy57CDFewRdF2973v5iuB+D+gClTyTX71sZ+qc0MgjasJNat6mVYQ6vYrasgbvZXbmQtvmXBsiseXZLjcuNniP/7zmIxvT49hqvKaisWZol97cyu7TsLjf93UTevYJ063kuCp14lDTJKlIHvOyXFel2sv86AU8G6gO6X4Ap8NyGCtBraEuxICSQaIC7TALfesZYHYRmz1BIJkp182t2MekEPMrBg3hlNSaSccQR1OH+Ug/rlLFmFm2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001);SRVR:DM2PR0301MB1310;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1310; X-Forefront-PRVS: 0813C68E65 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB1310;23:odXpDWwrk6my5I4DpS+1gGNGaqjG0GjMl+Opk9C?= =?us-ascii?Q?Juj5wTCt2CIZxk/ZOlK0KY2mld343BCrDONIjvhxMeC4XwY3pEmwn2ZKSmQ9?= =?us-ascii?Q?OZNBTeJUI1Rf65gmYMM5tBMbY37Hzyk+TUAqjtcPcKRZMXwY4UZx7T/catte?= =?us-ascii?Q?dyQ+3PLBjFx3p93JFvyjoOa8+U2nDlQbDhDYIWwdgWlweNS5bqIQOonMTZO8?= =?us-ascii?Q?d6AVgIf+ce/TjycOM2omaFLNue0son7zouSKUSXZYHX/gxbSrCTuK1nOFyJ/?= =?us-ascii?Q?qXWJb0TBkAiecSq5ExRxArG0eedMMOmgbnR3t7uDO6R0ODCSHZjMYqfvvXzT?= =?us-ascii?Q?spn/yPojoJSM6ijYzDEKSSPDZh0WGLLgK4eFjVYRULDHotldMzhv6FPysSIo?= =?us-ascii?Q?DHcpUaZp9l8NEmK27jqTYh8Z5m/qzQUe9EN+JjJ9BPVOLwKNbIVHy9eJecgv?= =?us-ascii?Q?59MCM9DvFxwk0TshwBTCHI+a64t4j2wMnqtPkgMb/yl3fEmMb7x0C8FIxawg?= =?us-ascii?Q?IuRJ44P1ZTr5t0NMKUfzIjIeQIq2MlL052MeQYOorArCpWOTwN+hxxQjV6Kt?= =?us-ascii?Q?9duKm1qt6KTBKXW4DS/zyrt7DupUctp1B2Mk8eeVaqyxNvUB72WB/ou/RIef?= =?us-ascii?Q?OxzNTzk17kNMB7JYvsdeE7k782bNsRD3ervaT+Pnkv833pOuCUyu6KpqEF52?= =?us-ascii?Q?Bbk4S6azrXaTW0JlpNrVfDdj5rREHinW146S0r31MC9yOhl0N66wc828b19p?= =?us-ascii?Q?9hb+RBrTrV7umcidzey1VlkOv/QeOzHwNkYQ4UDD5cqBSf+JPYKcwzDp+ixl?= =?us-ascii?Q?ZxUl1MmoIDjul3OSMU8sv6cjuGYlYQYhkwxGpU2g3Fv9Aty3kNJXHaCMN1/+?= =?us-ascii?Q?phaeiu6NV9SSX9/K5fD4EpP+7jXVvPMOYGLNWbUIFo4o+NKcNTB9ULg6UPxt?= =?us-ascii?Q?55F37GpKEBpsZNfYDg/ooAA6SZWtHEWfsCtGPz/0Ul+XSq3+vMMWG+3wJJjW?= =?us-ascii?Q?V+zB7T6fWlOsmR/tW4OrsXRFuKCNcuvM+aBNO9o8kiLLPe/x7Q3pliL73frA?= =?us-ascii?Q?JCFM5nrdOIAuORbYWuZDc7HMd11hdaFf0dES0W0pU3WKL0H8SYrDsmilSEQs?= =?us-ascii?Q?Pc/dYWm1Nw0HlR1a794BvNbKqUMoWjFIk?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1310;5:YWuHh6OZRzGfyn225zuUfwitp2kUOb7kOaV83iwIeQn5ntiH/sdzPJYbiB81gUnWp9iqOFai6/NbUNZR1HkC4k4AGFKJfBVA7AXQ+yFytibRUBJ9bCEA5qDc0PmybBFCwzeSAXaA5P6BbxmtSTEtAA==;24:ew+ae5Zn00oyteCq24eZeU0CpjVD6+5pOObQZa5Kh7YrIeDcLYIAkYfwJDktSKgAf4jYM6l8CO6Z8wzMhL1KUoTLs1+/ApTmhW/s+GPu3bo= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2016 22:21:55.9632 (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: DM2PR0301MB1310 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "J. German Rivera" The interrupt handler for DPRC IRQs is added. DPRC IRQs are generated for hot plug events related to DPAA2 objects in a given DPRC. These events include, creating/destroying DPAA2 objects in the DPRC, changing the "plugged" state of DPAA2 objects and moving objects between DPRCs. 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/dprc-driver.c | 247 +++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 42b2494..52c6fce 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "dprc-cmd.h" struct dprc_child_objs { @@ -386,6 +387,230 @@ error: EXPORT_SYMBOL_GPL(dprc_scan_container); /** + * dprc_irq0_handler - Regular ISR for DPRC interrupt 0 + * + * @irq: IRQ number of the interrupt being handled + * @arg: Pointer to device structure + */ +static irqreturn_t dprc_irq0_handler(int irq_num, void *arg) +{ + return IRQ_WAKE_THREAD; +} + +/** + * dprc_irq0_handler_thread - Handler thread function for DPRC interrupt 0 + * + * @irq: IRQ number of the interrupt being handled + * @arg: Pointer to device structure + */ +static irqreturn_t dprc_irq0_handler_thread(int irq_num, void *arg) +{ + int error; + u32 status; + struct device *dev = (struct device *)arg; + struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); + struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev); + struct fsl_mc_io *mc_io = mc_dev->mc_io; + struct msi_desc *msi_desc = mc_dev->irqs[0]->msi_desc; + + dev_dbg(dev, "DPRC IRQ %d triggered on CPU %u\n", + irq_num, smp_processor_id()); + + if (WARN_ON(!(mc_dev->flags & FSL_MC_IS_DPRC))) + return IRQ_HANDLED; + + mutex_lock(&mc_bus->scan_mutex); + if (WARN_ON(!msi_desc || msi_desc->irq != (u32)irq_num)) + goto out; + + error = dprc_get_irq_status(mc_io, 0, mc_dev->mc_handle, 0, + &status); + if (error < 0) { + dev_err(dev, + "dprc_get_irq_status() failed: %d\n", error); + goto out; + } + + error = dprc_clear_irq_status(mc_io, 0, mc_dev->mc_handle, 0, + status); + if (error < 0) { + dev_err(dev, + "dprc_clear_irq_status() failed: %d\n", error); + goto out; + } + + if (status & (DPRC_IRQ_EVENT_OBJ_ADDED | + DPRC_IRQ_EVENT_OBJ_REMOVED | + DPRC_IRQ_EVENT_CONTAINER_DESTROYED | + DPRC_IRQ_EVENT_OBJ_DESTROYED | + DPRC_IRQ_EVENT_OBJ_CREATED)) { + unsigned int irq_count; + + error = dprc_scan_objects(mc_dev, &irq_count); + if (error < 0) { + /* + * If the error is -ENXIO, we ignore it, as it indicates + * that the object scan was aborted, as we detected that + * an object was removed from the DPRC in the MC, while + * we were scanning the DPRC. + */ + if (error != -ENXIO) { + dev_err(dev, "dprc_scan_objects() failed: %d\n", + error); + } + + goto out; + } + + if (irq_count > FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS) { + dev_warn(dev, + "IRQs needed (%u) exceed IRQs preallocated (%u)\n", + irq_count, FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS); + } + } + +out: + mutex_unlock(&mc_bus->scan_mutex); + return IRQ_HANDLED; +} + +/* + * Disable and clear interrupt for a given DPRC object + */ +static int disable_dprc_irq(struct fsl_mc_device *mc_dev) +{ + int error; + struct fsl_mc_io *mc_io = mc_dev->mc_io; + + WARN_ON(mc_dev->obj_desc.irq_count != 1); + + /* + * Disable generation of interrupt, while we configure it: + */ + error = dprc_set_irq_enable(mc_io, 0, mc_dev->mc_handle, 0, 0); + if (error < 0) { + dev_err(&mc_dev->dev, + "Disabling DPRC IRQ failed: dprc_set_irq_enable() failed: %d\n", + error); + return error; + } + + /* + * Disable all interrupt causes for the interrupt: + */ + error = dprc_set_irq_mask(mc_io, 0, mc_dev->mc_handle, 0, 0x0); + if (error < 0) { + dev_err(&mc_dev->dev, + "Disabling DPRC IRQ failed: dprc_set_irq_mask() failed: %d\n", + error); + return error; + } + + /* + * Clear any leftover interrupts: + */ + error = dprc_clear_irq_status(mc_io, 0, mc_dev->mc_handle, 0, ~0x0U); + if (error < 0) { + dev_err(&mc_dev->dev, + "Disabling DPRC IRQ failed: dprc_clear_irq_status() failed: %d\n", + error); + return error; + } + + return 0; +} + +static int register_dprc_irq_handler(struct fsl_mc_device *mc_dev) +{ + int error; + struct fsl_mc_device_irq *irq = mc_dev->irqs[0]; + + WARN_ON(mc_dev->obj_desc.irq_count != 1); + + /* + * NOTE: devm_request_threaded_irq() invokes the device-specific + * function that programs the MSI physically in the device + */ + error = devm_request_threaded_irq(&mc_dev->dev, + irq->msi_desc->irq, + dprc_irq0_handler, + dprc_irq0_handler_thread, + IRQF_NO_SUSPEND | IRQF_ONESHOT, + "FSL MC DPRC irq0", + &mc_dev->dev); + if (error < 0) { + dev_err(&mc_dev->dev, + "devm_request_threaded_irq() failed: %d\n", + error); + return error; + } + + return 0; +} + +static int enable_dprc_irq(struct fsl_mc_device *mc_dev) +{ + int error; + + /* + * Enable all interrupt causes for the interrupt: + */ + error = dprc_set_irq_mask(mc_dev->mc_io, 0, mc_dev->mc_handle, 0, + ~0x0u); + if (error < 0) { + dev_err(&mc_dev->dev, + "Enabling DPRC IRQ failed: dprc_set_irq_mask() failed: %d\n", + error); + + return error; + } + + /* + * Enable generation of the interrupt: + */ + error = dprc_set_irq_enable(mc_dev->mc_io, 0, mc_dev->mc_handle, 0, 1); + if (error < 0) { + dev_err(&mc_dev->dev, + "Enabling DPRC IRQ failed: dprc_set_irq_enable() failed: %d\n", + error); + + return error; + } + + return 0; +} + +/* + * Setup interrupt for a given DPRC device + */ +static int dprc_setup_irq(struct fsl_mc_device *mc_dev) +{ + int error; + + error = fsl_mc_allocate_irqs(mc_dev); + if (error < 0) + return error; + + error = disable_dprc_irq(mc_dev); + if (error < 0) + goto error_free_irqs; + + error = register_dprc_irq_handler(mc_dev); + if (error < 0) + goto error_free_irqs; + + error = enable_dprc_irq(mc_dev); + if (error < 0) + goto error_free_irqs; + + return 0; + +error_free_irqs: + fsl_mc_free_irqs(mc_dev); + return error; +} + +/** * dprc_probe - callback invoked when a DPRC is being bound to this driver * * @mc_dev: Pointer to fsl-mc device representing a DPRC @@ -476,6 +701,13 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) if (error < 0) goto error_cleanup_open; + /* + * Configure interrupt for the DPRC object associated with this MC bus: + */ + error = dprc_setup_irq(mc_dev); + if (error < 0) + goto error_cleanup_open; + dev_info(&mc_dev->dev, "DPRC device bound to driver"); return 0; @@ -494,6 +726,15 @@ error_cleanup_msi_domain: return error; } +/* + * Tear down interrupt for a given DPRC object + */ +static void dprc_teardown_irq(struct fsl_mc_device *mc_dev) +{ + (void)disable_dprc_irq(mc_dev); + fsl_mc_free_irqs(mc_dev); +} + /** * dprc_remove - callback invoked when a DPRC is being unbound from this driver * @@ -514,6 +755,12 @@ static int dprc_remove(struct fsl_mc_device *mc_dev) if (WARN_ON(!mc_dev->mc_io)) return -EINVAL; + if (WARN_ON(!mc_bus->irq_resources)) + return -EINVAL; + + if (dev_get_msi_domain(&mc_dev->dev)) + dprc_teardown_irq(mc_dev); + device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove); dprc_cleanup_all_resource_pools(mc_dev); error = dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle); -- 2.3.3