From patchwork Mon Apr 7 16:46:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 14041551 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49791C369A1 for ; Mon, 7 Apr 2025 18:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To: In-Reply-To:References:Message-Id:Content-Transfer-Encoding:Content-Type: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IXCYBvQHP6LoD8UvUjr2imJ3HBeclffkcBbYNbZRrcY=; b=bM/YU6VBPsnDaUEtgcERWP+vQf ahCpv2i6q/au21DD5TF75k1XRvFeN4t0wqOjwbnYrt2F/WrAS5iKOkNgR57P/LzzS7aj5HSXTi0hc hbNN6zPo2DjzEH650paFTFIzTMfAyXNlTiwBBVk7DxXsrn7LPZxGw+PigVpyI30UooZoJ+9jnQTBN fJ7DloFDW3jNpliCF6uE1/VNNQJGn4kRiIIB4V7hukU2kwQsWOiHxm+H82zzySY+D9MS43rB8PXAq VFpE1qAWNabm7KAI+q7Tnr5R8eM9WfJHKc4cBKgMrz+yN6RdLS9p04MGxLeL1WQKdUfy9JHrhgYc3 q+Ci24Ig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rYU-00000001d4U-2uKw; Mon, 07 Apr 2025 18:50:46 +0000 Received: from mail-am7eur03on20617.outbound.protection.outlook.com ([2a01:111:f403:260e::617] helo=EUR03-AM7-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1pco-00000001Gma-3QLC for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 16:47:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ec2jhxoUm1foHFimxvvWvuWDNkOA7R2TTDbW9I6liONkC07bJWkG1SJ4EJllT7+vSFTbfOf/k5z4aCbKD6Z5hxY5+X24WyBD9jQLnEc5/+vRWUMTgHuyyV2TCRollfuIwdVGvWPNoW9URnimjafbuGiqbfE+hgxQ11nyb/+EI6r9ttHtP4hqCdG6oHo5gX3E3dIglWNo5sLJWLXb/sRngmCYAqgGEvlNJoSa7EZC88ZbAObM4ESyFgHpkuk7iPeoYjA28qnf/2dBzZ9c7Dl8YTEY+e/ASFevHsXJdQeDAhVWVs9QnXtPibNaJFWZOMbz24cy3kGo901QiFkMnKEvgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IXCYBvQHP6LoD8UvUjr2imJ3HBeclffkcBbYNbZRrcY=; b=iR/tATZj9GSj2Z43BUvJxmfZ0F+Gq7oBxkgxFPYmtk58l10kwCLQpAi7zemzxEQe3jPB5w6YXLp1JSmBN8/tyMJmp+Dj/HyZXN8rrWsubQUk2dwHqZ+5tawMHmGYEyPydNvvYJmKyaJkk2iqsIjKfdMOYBiCBUs1LRFS/HKr5ZvKg9Q1ArU5+PWGxLzFcILUju1Ai5dKFdO2LO1X3ScDFEUeFhDctnLG8+CMX1pq6Po18uke7hjUEwJwUrmMfwXjXdId+4XSsM95t75j3Ig6mfOS+13FGQiwcmAIz/fqMvk9scGPriQzGJYIfFIX9Tm2fryy/tjQiAlJZAJ1A5vqSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IXCYBvQHP6LoD8UvUjr2imJ3HBeclffkcBbYNbZRrcY=; b=OKA1E8p1AHknD6e95qGd9l7DD3/ss25iBJN9AZLEocgNoLNUrr1r4r10NUQP+1rGiZkC+6y3vb7Edo9ZfIMlyTkFZv4Q3fTWwJ0eqc2dLt7SYoUbUuOs+QAzx50CxCyrVy3C+q0BavC3i42D9Q5briVgFdpcDXQAwYSXzkHjcMMm3tkoYo7nqVrRJxP9mJ3aE6NTrPhFZMiY0f8Rz+xxpxNf75o/jTYZinHfzr0G5X1kzbrBwhF6ZTyxCGmbloiwkk4/HwlPAsbA6KlfL9fMmcWbYZj0ZJtvCRgtHlgdEpRugcSMdlnukCKTlfFWdNpzIXpHBfgHOKyELsbHxRczIQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by AM7PR04MB7029.eurprd04.prod.outlook.com (2603:10a6:20b:118::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Mon, 7 Apr 2025 16:47:03 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8606.029; Mon, 7 Apr 2025 16:47:03 +0000 From: Frank Li Date: Mon, 07 Apr 2025 12:46:36 -0400 Subject: [PATCH v2 2/3] dmaegnine: fsl-edma: add edma error interrupt handler Message-Id: <20250407-edma_err-v2-2-9d7e5b77fcc4@nxp.com> References: <20250407-edma_err-v2-0-9d7e5b77fcc4@nxp.com> In-Reply-To: <20250407-edma_err-v2-0-9d7e5b77fcc4@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Frank Li , Joy Zou X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1744044406; l=10170; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=LD6Mp7AzKiFOHMUjSiRbTwVIAnQ+zTBqUt1To6QgEGs=; b=c4S+b13BD+b4d/L3v4s5sBQhq0TVsEKD1MF315h0P3igZTBADsBA6ThgfePbuY46fN41Q6UMc yejUcGGKpLHDBp1aAbXnpimAGwyn3Kd9DDDHjEqgCfKlCLP5NrlxZ/a X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0243.namprd03.prod.outlook.com (2603:10b6:a03:3a0::8) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AM7PR04MB7029:EE_ X-MS-Office365-Filtering-Correlation-Id: 729e436c-d24a-45e6-8721-08dd75f3d2e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?KdMeVFXP4PUO+pz3ZEBUonracBOItdS?= =?utf-8?q?1d0vJthCOvnw2EfDAIJsSdwl6g38TvV6mKe62sPiMDJAFkAjkF4EeoHKl7hwvDy0m?= =?utf-8?q?s/XseVjBKcv5iguGFQjoE5FJl6mhFLZeboZ9CCx8o52XDyIpqgLi19ugCz11jZkUK?= =?utf-8?q?/ZvILrqZHW4e7a1cm8uXPwzxydCS7/HuBeOmUoiAczhgaTmhf3y/kL7AMoskb9y6F?= =?utf-8?q?K98QXnV4aG7yaqkMAzzYsk1ZtNK1CXmQUyewCMECXZvNIpFQv+j+TWb3VdOdua2QH?= =?utf-8?q?wQEdeCPU0XpV0wwEsF8wQYChExtdfSSH2OxHjkyhMAPAV7p3mIKluGGjIUWC/Ivx/?= =?utf-8?q?ryklYKvd9K1CIEIfKrNDbxK03nrcMPhLsV1RsVhDieu55PxsHRboRyJOS8yC/zAJF?= =?utf-8?q?tSKvwpKwM8tnNe+rxdzxxOAchMq8GeOoJ9CzoveOpkT+BYy8MIREalIAM9Fr+xP54?= =?utf-8?q?MmTgDbyQX9IknB7ORursxi2+eV0yjNRLwRJsIv6mn4gqy0vvsWuZgIYTQFGOrMgjE?= =?utf-8?q?zpBH0au7ofcisT5ooq6RtRg2H4fqD5486BaQsA/WrjRZev8VwywnN63QGPTuz8zEg?= =?utf-8?q?jVSgWo6nyWt1+H/uw0UdAUSgxXd+bYgU50RhI7xUtF+QKGU0BqHnIFHND+jD8KiT5?= =?utf-8?q?8+LmASH/S3rPNG9JhEqyL3ZRX+11/t/uRJSp242dJJD4rEsa5xePgujIEU3kPs2Fi?= =?utf-8?q?/yEEiuh45DthLoMWcvlBWOMlmj3yDgDIBXNCgRPmMfkMF4rtAFbrn+fFPpUu5LodU?= =?utf-8?q?LR8yStglkDTWWuc53f0cxoxYpN6z3q4QY7f5tCZw8M7w6zZtLfSSWUUA536YmkdrG?= =?utf-8?q?rqbQ5NJWhevfEAdHZ1YRZm0UgLGcgtJE3Tg50WyxeONP/spd7PPOugqlYZPJYZ4+u?= =?utf-8?q?Z8q9DS/xK//WrfCghL+nCLoyUTlbhNUwts2BXuv0L6XxyvXJ5LPazRp8MXCN8YS0K?= =?utf-8?q?Qwatt38PKuG8D9EXAZ1jU6k11Y2IQ0iYhuihKy1mC1Xuf83pJ/cM3Vqxs+3uXNzgp?= =?utf-8?q?nDj+DGCvneGpHFav2J7Pa+AOP9rus2RRcL3CJx+AtDnhZS82Rr0vb8Fj7b9SJ76gm?= =?utf-8?q?NeDR0d/WvyRhjwWARf8RH9HTnXYug4rvDOgD8s+X3AbSJ0ITe70n+99DuEpLwEILt?= =?utf-8?q?6XL9u8/nepg8KMIPr43wLMA8vC7Me3M9uU4X7Gw7ouVix0RZPDZKt7a9JSkgCqIjz?= =?utf-8?q?LHo/hVOTD/S67BPY9moqLjTXrOlkXBHt9hKzqInOBNbpmHlM5x8b8DnfPUPwv/F5Q?= =?utf-8?q?4IPFJikxs+HI1a7KkvSG2r6VXAwFMv7E9TQIuDJY08A425mU0JqcjsfzJciU20t3g?= =?utf-8?q?z2Y6adTtasKgZcr0lpctnemQviUuzY3t7bvYN4f7ncoSHkjMV5svrxKk4iU1UaYGA?= =?utf-8?q?9/TiBEsU2Oq?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1Nm+KrtEhi80Q1uRp/tfn5bw3B5J?= =?utf-8?q?QdI3NrBEyaMjb3dxa0IGYNio7no75vZtoSxqWoRuws4UZhAGQX2pwqzL+L72JMUUc?= =?utf-8?q?zSJcRnetSMO+QbumwxmKSdgwHdTqJ5/hHY2Yvx1rQTZqOvK8V2DfoA1jVJNFWnL9C?= =?utf-8?q?k3UIuhgaGH+W5aBrESm/NMnUkxe0jW2g6dY8GtGEa4BkT4xKsgj0nH19ERkDxX1GI?= =?utf-8?q?P0AAmbmPoGCVQVD/7m7s3n0MwNKAGR0ek8LvFP6dZUavWFYyYgc5zPpPGXAGcyFhm?= =?utf-8?q?Uq0/rWyh+Hkep8ZFM4+C++HE+UHWcU3vjcspc6QySLJ0f4aQ/7LAWPd84GiLK3mYU?= =?utf-8?q?awpNjvA5Mf8J0hXBGowrHcJGvmCzs+rCejevSsWQq480pYb8N0BJL6T2CjDJARHky?= =?utf-8?q?IzbY6UAA6nFAvN+qCZhQvpQir6iV8Dz52DvP1ShcS2XV9LOVkJPFE78R9jhXuTWZT?= =?utf-8?q?8RITla66zOhCv/nTZrx626OktZm6X4U2J2hfyFoz9hl3oN/Ru1z/u6ENlRpeVelxs?= =?utf-8?q?E7/H4mixF++BL6S8DMXDVIwRFaJy+hsycV6F3c3XnnbixxbyDNSX/teHN82obffAF?= =?utf-8?q?jV4RFWyeNEUAsigHLchP13vaLxb6+myWRX3hD3NofvC/Wpr0HTHzLfwYk0fCjMGjF?= =?utf-8?q?NaJ1/Ng8SUrc3OXxCChFzaGVSBhNA2nnf/WUBXmWe2ppF4T9+UD5iLXQIVsStpxQ5?= =?utf-8?q?jO5z7IMaa+F4gOYM2uENJngG/PEJJYHXHaBJgyrxkFRL4bCCiE+onl0yQoYylz8jj?= =?utf-8?q?QreuojiG0ZRkIXAdeYyYN7LjyF/TP51ITjofOJMcycWorgp2ruXDr65mB5I2uIHHy?= =?utf-8?q?HEs+WSnhrGqIPOVpm9pP7L3C9BjppY3bzwpFDKz0RzsR8hzeygxNDi9K/+Gsvd+Wr?= =?utf-8?q?96HKvUNc5zOIWv+Kqkh4i+NXgUFT18fHq0TAY1kgieyagrdqwmQTBiVvSpudqD+GO?= =?utf-8?q?XfuWt+hnB++FtvLK+cEIZOpEixPpzb75pa3LJS3mDKhVceMXet4SSUu2I0Z46A2s1?= =?utf-8?q?2HzyttJI+6arOaG/basf9Psd9RU9igFZOjO/NtCqAr4KuNV8dx5r1AKTuS7cPfG17?= =?utf-8?q?bOUmiyIK/hBIg3TBXl5fpnEGOAdxoVALEDx1xNE+rguFJF+NGI/ALkZ4UZHNNQ20E?= =?utf-8?q?qjCadzTXYrCJUSK9NyHK6A18wtO069J+gb2QFrYqtt3bGYHhY6Fc4dFyw4Ep4g3+5?= =?utf-8?q?gZhAI01ehc8n0YAcrgsR2/kMeVMGyNy1KatSAt3IieE9Br3gQbVzCbBeVXPHu0xYj?= =?utf-8?q?3PbJxG9vEW6P2mCbVoUaH5HF7uzGjuv0MnfcpFCBglLJvGNkCPrYwVatWUnS3+gB2?= =?utf-8?q?W/oFccTasetIjuUVbphFzxAgoPXCi82MHDGorpGcgPuv+9Glgfum27cZBKfgOCv9R?= =?utf-8?q?iHU4G2bj9ghWrKQ+5QEujU9TKFU31R/gSM9p5990GPn6s4qmz5d2f918qoBaQiCAP?= =?utf-8?q?C6iwvGtH2wud4U0TT8Q//2zD8Jrsb9JetTBadQyxuItwP7lN2/SVn5oa/IgKd8wPh?= =?utf-8?q?vwdD/8BfMtc4?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 729e436c-d24a-45e6-8721-08dd75f3d2e9 X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2025 16:47:03.6415 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MD41jmgC1HCBN19heYLdiokj+8oUxIrRgthP6oekL3X0DXEdVZOWwWvhPC55/lGLe99xCGB7uBX/W2ZLZQDgkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7029 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_094707_015379_CE69E7F0 X-CRM114-Status: GOOD ( 18.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Joy Zou Add the edma error interrupt handler because it's useful to debug issue. i.MX8ULP edma has per channel error interrupt. i.MX91/93/95 and i.MX8QM/QXP/DXL edma share one error interrupt. Signed-off-by: Joy Zou Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 30 ++++++++--- drivers/dma/fsl-edma-common.h | 18 +++++++ drivers/dma/fsl-edma-main.c | 114 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 149 insertions(+), 13 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index 443b2430466cb..4976d7dde0809 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -95,7 +95,7 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan) } val = edma_readl_chreg(fsl_chan, ch_csr); - val |= EDMA_V3_CH_CSR_ERQ; + val |= EDMA_V3_CH_CSR_ERQ | EDMA_V3_CH_CSR_EEI; edma_writel_chreg(fsl_chan, val, ch_csr); } @@ -821,7 +821,7 @@ void fsl_edma_issue_pending(struct dma_chan *chan) int fsl_edma_alloc_chan_resources(struct dma_chan *chan) { struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan); - int ret; + int ret = 0; if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK) clk_prepare_enable(fsl_chan->clk); @@ -831,17 +831,29 @@ int fsl_edma_alloc_chan_resources(struct dma_chan *chan) sizeof(struct fsl_edma_hw_tcd64) : sizeof(struct fsl_edma_hw_tcd), 32, 0); - if (fsl_chan->txirq) { + if (fsl_chan->txirq) ret = request_irq(fsl_chan->txirq, fsl_chan->irq_handler, IRQF_SHARED, fsl_chan->chan_name, fsl_chan); - if (ret) { - dma_pool_destroy(fsl_chan->tcd_pool); - return ret; - } - } + if (ret) + goto err_txirq; + + if (fsl_chan->errirq > 0) + ret = request_irq(fsl_chan->errirq, fsl_chan->errirq_handler, IRQF_SHARED, + fsl_chan->errirq_name, fsl_chan); + + if (ret) + goto err_errirq; return 0; + +err_errirq: + if (fsl_chan->txirq) + free_irq(fsl_chan->txirq, fsl_chan); +err_txirq: + dma_pool_destroy(fsl_chan->tcd_pool); + + return ret; } void fsl_edma_free_chan_resources(struct dma_chan *chan) @@ -862,6 +874,8 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan) if (fsl_chan->txirq) free_irq(fsl_chan->txirq, fsl_chan); + if (fsl_chan->errirq) + free_irq(fsl_chan->errirq, fsl_chan); vchan_dma_desc_free_list(&fsl_chan->vchan, &head); dma_pool_destroy(fsl_chan->tcd_pool); diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 10a5565ddfd76..205a964890948 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -71,6 +71,18 @@ #define EDMA_V3_CH_ES_ERR BIT(31) #define EDMA_V3_MP_ES_VLD BIT(31) +#define EDMA_V3_CH_ERR_DBE BIT(0) +#define EDMA_V3_CH_ERR_SBE BIT(1) +#define EDMA_V3_CH_ERR_SGE BIT(2) +#define EDMA_V3_CH_ERR_NCE BIT(3) +#define EDMA_V3_CH_ERR_DOE BIT(4) +#define EDMA_V3_CH_ERR_DAE BIT(5) +#define EDMA_V3_CH_ERR_SOE BIT(6) +#define EDMA_V3_CH_ERR_SAE BIT(7) +#define EDMA_V3_CH_ERR_ECX BIT(8) +#define EDMA_V3_CH_ERR_UCE BIT(9) +#define EDMA_V3_CH_ERR BIT(31) + enum fsl_edma_pm_state { RUNNING = 0, SUSPENDED, @@ -162,6 +174,7 @@ struct fsl_edma_chan { u32 dma_dev_size; enum dma_data_direction dma_dir; char chan_name[32]; + char errirq_name[36]; void __iomem *tcd; void __iomem *mux_addr; u32 real_count; @@ -174,7 +187,9 @@ struct fsl_edma_chan { int priority; int hw_chanid; int txirq; + int errirq; irqreturn_t (*irq_handler)(int irq, void *dev_id); + irqreturn_t (*errirq_handler)(int irq, void *dev_id); bool is_rxchan; bool is_remote; bool is_multi_fifo; @@ -208,6 +223,9 @@ struct fsl_edma_desc { /* Need clean CHn_CSR DONE before enable TCD's MAJORELINK */ #define FSL_EDMA_DRV_CLEAR_DONE_E_LINK BIT(14) #define FSL_EDMA_DRV_TCD64 BIT(15) +/* All channel ERR IRQ share one IRQ line */ +#define FSL_EDMA_DRV_ERRIRQ_SHARE BIT(16) + #define FSL_EDMA_DRV_EDMA3 (FSL_EDMA_DRV_SPLIT_REG | \ FSL_EDMA_DRV_BUS_8BYTE | \ diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 756d67325db52..32a52a6acd60b 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -50,6 +50,83 @@ static irqreturn_t fsl_edma_tx_handler(int irq, void *dev_id) return IRQ_HANDLED; } +static void fsl_edma3_err_check(struct fsl_edma_chan *fsl_chan) +{ + unsigned int ch_err; + u32 val; + + scoped_guard(spinlock, &fsl_chan->vchan.lock) { + ch_err = edma_readl_chreg(fsl_chan, ch_es); + if (!(ch_err & EDMA_V3_CH_ERR)) + return; + + edma_writel_chreg(fsl_chan, EDMA_V3_CH_ERR, ch_es); + val = edma_readl_chreg(fsl_chan, ch_csr); + val &= ~EDMA_V3_CH_CSR_ERQ; + edma_writel_chreg(fsl_chan, val, ch_csr); + } + + /* Ignore this interrupt since channel has been disabled already */ + if (!fsl_chan->edesc) + return; + + if (ch_err & EDMA_V3_CH_ERR_DBE) + dev_err(&fsl_chan->pdev->dev, "Destination Bus Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_SBE) + dev_err(&fsl_chan->pdev->dev, "Source Bus Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_SGE) + dev_err(&fsl_chan->pdev->dev, "Scatter/Gather Configuration Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_NCE) + dev_err(&fsl_chan->pdev->dev, "NBYTES/CITER Configuration Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_DOE) + dev_err(&fsl_chan->pdev->dev, "Destination Offset Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_DAE) + dev_err(&fsl_chan->pdev->dev, "Destination Address Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_SOE) + dev_err(&fsl_chan->pdev->dev, "Source Offset Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_SAE) + dev_err(&fsl_chan->pdev->dev, "Source Address Error interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_ECX) + dev_err(&fsl_chan->pdev->dev, "Transfer Canceled interrupt.\n"); + + if (ch_err & EDMA_V3_CH_ERR_UCE) + dev_err(&fsl_chan->pdev->dev, "Uncorrectable TCD error during channel execution interrupt.\n"); + + fsl_chan->status = DMA_ERROR; +} + +static irqreturn_t fsl_edma3_err_handler_per_chan(int irq, void *dev_id) +{ + struct fsl_edma_chan *fsl_chan = dev_id; + + fsl_edma3_err_check(fsl_chan); + + return IRQ_HANDLED; +} + +static irqreturn_t fsl_edma3_err_handler_shared(int irq, void *dev_id) +{ + struct fsl_edma_engine *fsl_edma = dev_id; + unsigned int ch; + + for (ch = 0; ch < fsl_edma->n_chans; ch++) { + if (fsl_edma->chan_masked & BIT(ch)) + continue; + + fsl_edma3_err_check(&fsl_edma->chans[ch]); + } + + return IRQ_HANDLED; +} + static irqreturn_t fsl_edma3_tx_handler(int irq, void *dev_id) { struct fsl_edma_chan *fsl_chan = dev_id; @@ -309,7 +386,8 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma static int fsl_edma3_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) { - int i; + char *errirq_name; + int i, ret; for (i = 0; i < fsl_edma->n_chans; i++) { @@ -324,6 +402,27 @@ static int fsl_edma3_irq_init(struct platform_device *pdev, struct fsl_edma_engi return -EINVAL; fsl_chan->irq_handler = fsl_edma3_tx_handler; + + if (!(fsl_edma->drvdata->flags & FSL_EDMA_DRV_ERRIRQ_SHARE)) { + fsl_chan->errirq = fsl_chan->txirq; + fsl_chan->errirq_handler = fsl_edma3_err_handler_per_chan; + } + } + + /* All channel err use one irq number */ + if (fsl_edma->drvdata->flags & FSL_EDMA_DRV_ERRIRQ_SHARE) { + /* last one is error irq */ + fsl_edma->errirq = platform_get_irq_optional(pdev, fsl_edma->n_chans); + if (fsl_edma->errirq < 0) + return 0; /* dts miss err irq, treat as no err irq case */ + + errirq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s-err", + dev_name(&pdev->dev)); + + ret = devm_request_irq(&pdev->dev, fsl_edma->errirq, fsl_edma3_err_handler_shared, + 0, errirq_name, fsl_edma); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Can't register eDMA err IRQ.\n"); } return 0; @@ -464,7 +563,8 @@ static struct fsl_edma_drvdata imx7ulp_data = { }; static struct fsl_edma_drvdata imx8qm_data = { - .flags = FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3 | FSL_EDMA_DRV_MEM_REMOTE, + .flags = FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3 | FSL_EDMA_DRV_MEM_REMOTE + | FSL_EDMA_DRV_ERRIRQ_SHARE, .chreg_space_sz = 0x10000, .chreg_off = 0x10000, .setup_irq = fsl_edma3_irq_init, @@ -481,14 +581,15 @@ static struct fsl_edma_drvdata imx8ulp_data = { }; static struct fsl_edma_drvdata imx93_data3 = { - .flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA3, + .flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA3 | FSL_EDMA_DRV_ERRIRQ_SHARE, .chreg_space_sz = 0x10000, .chreg_off = 0x10000, .setup_irq = fsl_edma3_irq_init, }; static struct fsl_edma_drvdata imx93_data4 = { - .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA4, + .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA4 + | FSL_EDMA_DRV_ERRIRQ_SHARE, .chreg_space_sz = 0x8000, .chreg_off = 0x10000, .mux_off = 0x10000 + offsetof(struct fsl_edma3_ch_reg, ch_mux), @@ -498,7 +599,7 @@ static struct fsl_edma_drvdata imx93_data4 = { static struct fsl_edma_drvdata imx95_data5 = { .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA4 | - FSL_EDMA_DRV_TCD64, + FSL_EDMA_DRV_TCD64 | FSL_EDMA_DRV_ERRIRQ_SHARE, .chreg_space_sz = 0x8000, .chreg_off = 0x10000, .mux_off = 0x200, @@ -700,6 +801,9 @@ static int fsl_edma_probe(struct platform_device *pdev) snprintf(fsl_chan->chan_name, sizeof(fsl_chan->chan_name), "%s-CH%02d", dev_name(&pdev->dev), i); + snprintf(fsl_chan->errirq_name, sizeof(fsl_chan->errirq_name), + "%s-CH%02d-err", dev_name(&pdev->dev), i); + fsl_chan->edma = fsl_edma; fsl_chan->pm_state = RUNNING; fsl_chan->srcid = 0;