From patchwork Fri Feb 28 17:42:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13996848 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011008.outbound.protection.outlook.com [52.101.65.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7290B26D5BF for ; Fri, 28 Feb 2025 17:42:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740764565; cv=fail; b=XgxUHL+mbxg5FVRcOfKZFk3TFTL2Hi7x87bYGNiM9ajwjANggyW4FcadXcFes7HVcZpLAK9LY7S/+OYKwWmAtVn5G+MGJUjdVP2cK8bm+jmL20Lkcz6U0naVDMB2B7ya7xc762l/Y41A3KcxM5P02kL74vlVJmwIIvazhOf/NoU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740764565; c=relaxed/simple; bh=Z8W3n6kNqIxL6eOG3TEULBRTOLFSmjiwur4x+uzA1/Y=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=CHbnwS+mgojSKrg/UNtD1RgAud5+xrewlRewbgQfMirDBQQB7MboLgxYS9fNi9l3tWCRm8Gqv5nD0k0PEFCv2+9IZcHqE/Bqo4Q+RofQhM0LY4q7LkhKTNYV4xcqRGDRPBWQIHRBUTLpecSnScJb+LQNeKH3tlXUZdMIh7abEJI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=ZLsdBeWm; arc=fail smtp.client-ip=52.101.65.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="ZLsdBeWm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Pl/Gdm3GD8NjgGcMGZ4HYTR+zFeXPYZKkH2gAsaitudzKItvv6rb6gf3NM/9cNxHQht1/77v7UKuPcXT4QwuJG1vUjwXvHa8LT4bWwAGT+okJuTFSNir+bfRgDAujQac+732Og4pp351226siwNscYsONApyNH7JtkEJFXQi7Ehiavt9Zz5FOPbxZM2pl69M+rT+167DmCM8TL9O/+UbXPtIZAsRhySrHk1ZryW8cgfMM0wEw8wdOelLR2k6L0LK+x6Poqg9HD1S55ML3T3wRy6/+l5eL0dKI9VAWmUl8EE/QHirsijwe4u0+KP4r0PxMCTvnrTPJUV/JukXcfSv2g== 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=bk90zrzM/+YjOb3Ny5hHPj5Cg13BdLiP1rIOJbKUQZw=; b=ET29AcpJ+sMyyiO+kWLLAGVqzmRWSvh2Shj7n9j9ZEvE7xfZ4au4Pa6L3iiGkUNwdDdEvN3Zpdjaxln/DnLGAymmofnJNpTFu1ns6AmOOAxgWRja2aC0YavwtX1N4AMnuW1Tj2acGbPnYwl1v+Uf9uXbGlCBjrfv60HorQ3KHJVfDrmINzzBDBpKNYml7+m03a5SxTYB8vhWOPUT0Bl3nGdG254Y4KItJNpThJlaoyjDmNBxIO3kWCtz7yasoZF53TURBqBxjI/Rh1iOpM5uFBFsEG31i50TzJFvzQ339jEhRBEzEz/YRfmBXJ3lFTuRBzNCEcwmlkOPD/bsqEYZCg== 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=bk90zrzM/+YjOb3Ny5hHPj5Cg13BdLiP1rIOJbKUQZw=; b=ZLsdBeWmATiCCH26ivwfP+MKhxbjZUj3c0d+EV53yWeRwZx6VSpL1nD/rtspf1evFEfglNovBvSFDs6ADH9oExL0cCkdD8dd7ffUmjJWw8PGMDhgspPecO10jxU225mBniKQ++yizcOT88kq4CgFtoGLe2Cu4TXMZtLW8YnvYAmUerruM3PsyUfC4i7rD2AyauM+k43CGkHp3Dmn3bx8IL3iQKdDB81sUVfAawbIiHm3uXrbwa8zIw2PBAQKxKqgPketV9miWqMwP5d615DBSnvXH3qnEImuniU8abs87pIiwhSbqkYlyNuYffLigTD1Y8bz0YeCI8hQpCC7XI3NNA== 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 DU4PR04MB10498.eurprd04.prod.outlook.com (2603:10a6:10:56a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.20; Fri, 28 Feb 2025 17:42:39 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%5]) with mapi id 15.20.8489.019; Fri, 28 Feb 2025 17:42:39 +0000 From: Frank Li Date: Fri, 28 Feb 2025 12:42:04 -0500 Subject: [PATCH 2/3] dmaegnine: fsl-edma: add edma error interrupt handler Message-Id: <20250228-edma_err-v1-2-d1869fe4163e@nxp.com> References: <20250228-edma_err-v1-0-d1869fe4163e@nxp.com> In-Reply-To: <20250228-edma_err-v1-0-d1869fe4163e@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=1740764548; l=10726; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=Q1pC70/P1OQQexCZsZePrl9IF0fRQ9Vjdy256MmnB4A=; b=Mc+aOwr9xp5Is8p/5eYsvEVPCIyvZ68eJhEKijDaddNU2arP09tghE9c5XfgagiMHW3HR4Jtq YmpIkgdUz0NDzcdEHi1ZbiVC7kDHSXfRqbY9Ojzrv6Cum1oXkOyfrDd X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0012.namprd13.prod.outlook.com (2603:10b6:a03:2c0::17) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DU4PR04MB10498:EE_ X-MS-Office365-Filtering-Correlation-Id: 97cda954-6edf-46da-acf8-08dd581f4bd9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?PLW2SpqoCpzFIhvYBCQTBzfJF8fRO3g?= =?utf-8?q?8PprAtpO6XXSjCMXPPQSRfNkNV20x2IFyMFh31uWPAj5ipAp0DHD1KTVhUus1/3wK?= =?utf-8?q?XVFVcQXDGZg2YMTsPJ66iYUJCXeet2iqNPgKGS9IC/s9zI2gxtExT0yUpUixlkjE+?= =?utf-8?q?WKH7bd5Abi2zFGST4/14BQmnLzpymUBWfUExlIpFUGMlIQ3pFK13SoXa6tfK86QR8?= =?utf-8?q?cORbQJliOP79iMSib7T7BW0lMADSq+AYBkTXBgRcXB8SoyWskQLk1KqaWX769a8iz?= =?utf-8?q?4oPpU7xMGIzx5wjMxWBXfXxIeq/EcK0PDHahLPs7XhZJyn7EfRLZLtiEOclR8k7cZ?= =?utf-8?q?hO9Pxt2ysY+zbJYMm6tm/Ermj0oCrwWaMtoEq9qTFNud9yYnME8l7zbCwa6kBjiSk?= =?utf-8?q?US2354/jyiPDi/Jl1uKfFOuaJLASZuajHB0LFP38hT/iujYzz0ry307hRZIbGSPd9?= =?utf-8?q?0NuLINB3YeWk17jw+UjpOhRQtHo+2TtccmoAZU/QCV3iMMCOAaccgnZPdjgPNL07R?= =?utf-8?q?o1EZGbVp6atgIU/ze6fFaqCBOnosAv3VZr0y/cPCsQeSbQFblH96zjGT7wHI3r6Qp?= =?utf-8?q?cbyA9cG8WRZpSMmwQZdR6VfYhekRPzPEFRhmaqp97tePEP8KySLL2hHyas1Y4TQN8?= =?utf-8?q?KkWo7mXzOQ/PZSaMCzdsf0XjEjAjLpwffociBEd5jYJ+u3+OOKPufMvhLEVdNJCT4?= =?utf-8?q?fE8TdnQ4GuZRPwqQKt5psmmyWMtxnKwNBgGrMZ7Le39/wEBLMeiyLr/Wsk3JE+5Be?= =?utf-8?q?TPyQxLkBDNfMJ+CE5Dpo17YcrsFdI054PEqCQP6xZOTt6RWZGxImcjDJ2rbhnDyhN?= =?utf-8?q?BPOAZZQ/h6SQgcWH+FpSYPj+KcNJOd7S9aTzejQ3rjAgVswtdS0afPwyg82wU+bsO?= =?utf-8?q?oMXPA05FPweONUXU5vHiX1dfO8MbCBrnTGoZAMlzV/1qC9P1Dio/F7ZtZqHQZPddi?= =?utf-8?q?XGa/pjxU96fGdVW7Gad/vG/NESxtnOkNpYV4DYQ9voUtsq311RCOsd2wDn8jFjaJf?= =?utf-8?q?WflTUlBpEPOF8DuZIi62KwllNL/es6A2o/iQaNPmldy6YxcVAujW90ZldJyExp3+O?= =?utf-8?q?UZFxUBuz1e30DppS466VOEt9G8Kump6gJw+UMzfWgWO7ysRlBcml15uYGvIjl917r?= =?utf-8?q?CZL3M4B4bRFvCpGDwAxqML3Z6lC0bJoHhGoNZ2nr+LYsM6fRxCpVu5Khipa5kRCHc?= =?utf-8?q?74mk/QRg/INqVnBcjDKQtld8IJrewv8GCwQ3Us0iIIbyulqbobbvm3FeIsJiZobVw?= =?utf-8?q?mmiUh/MeD4j+UL57he6ZvOLpRo5TNzUWgvgrrFeLugkyQg/k6UD3vxQ6W2SAH5xMQ?= =?utf-8?q?GzcgNMn/BruONB0nkUc2qK33BqaLC/GtpN4MASKNbYZLAKhA2ojnQEPD/gnOrkpQc?= =?utf-8?q?7TElkNaEKmY?= 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)(376014)(7416014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?icGqiKuHX1ra16i0IoYT7i4gwfhw?= =?utf-8?q?1g4w2oJoup5JGYvOsYN6N1MZvGyZZF8uvP6Dql7oV/rvOUiu70O1x97WNOXJoMZNs?= =?utf-8?q?5W8tHJsrwTg9jeQx9U1yR7UQKtab3pTj3nx54s0X4yzpyMs0KLeFgM1lQsiww3F3k?= =?utf-8?q?65Od+JrFx2ZO54cQS2lrqMzVKarQwuxAA6zuZ+8aDmLMxA941/gALvTcX1nfzzvBE?= =?utf-8?q?tN0IvUf+4sonfY56IG7gL8uSAvWXWZ57jLhJdRQ5M0a5UdSp1Md7Row33PyS7iU6i?= =?utf-8?q?gNIPSxa2J1A4T+gfSz1oXX3Jz911QXAfd6MxIEwF4/zMm0bLhlKBO5fvZCtZlJoPU?= =?utf-8?q?a+1nGasJiOX9mnyJg/jW1ifyzfK+tTroxJLA86/R7Y+ooDyDX8jHDrgPFXZoO8Mzb?= =?utf-8?q?5CzJdNM/4lrLjtMIQ8mhmRPEoTM/GxGk0X9jQYUXK4MtjMBjnC2eSXF2GqseW5UkS?= =?utf-8?q?FI5xU4t2B2mV9n6XxHNkR8nuARgfYRQA/POOZF7Zk12oj/SvuYGKT+4LOTGPUAf0v?= =?utf-8?q?u/e9pdRpNgUFfP0aACartTPL9btsSaBqL445LfS+rJkUE1S3V9Hh/ioSn6iHo6M6D?= =?utf-8?q?xxJHNGnBex0QDxlrgulwN7/q7tvmCXzRmFe05b/8Ajis9ltSYdUh6YPm9fNm08skA?= =?utf-8?q?uMAePo9m/2HIJJh057lF99125PE1BHG59irLvFQlvNL7MFMRddvUFOhKN+ael4ELR?= =?utf-8?q?4DjPAFbCRJBdruKGv21IgvN6nkSeWJxKeklsRgNG2I5asNTvZE1KPJaw8k1iuGSI+?= =?utf-8?q?fispcUzKtBTw9yJdB3jrs7sFcT2J6NayTZ/7ZBD7NbAWMwTUlZOC0ThZSBoViTstb?= =?utf-8?q?7mnxH5IdsL/BUG9rXf/YeHP3QCJHYmyQRFmDE9d7fIBfz7Xq7NdZgfs4jJwFNbYr6?= =?utf-8?q?s2RFlrtNKMwJ3UVk0zZT8cpYG4aJ9HyYY6ZkqJycH0Eyjfmgw1IrChgWFfoj9fB/X?= =?utf-8?q?ySPod/Tl6kewsuxjEHy3AX7EnLaRmVjajKrkGOQ8YVT+nAcwbT3ti3MEtuN7tqZ7w?= =?utf-8?q?NxjNkWYuhnJAQUmY3rCwoNlA4xR8RLY0y9Ackb6/OFLSFg7w0iV+Zz8u8bY0c/1TA?= =?utf-8?q?Brs77sOjacNQdmwMacVwWKuWtlwUU+9+2y3wUNEp2+u8gSEIbh04COXxtckq0vxX1?= =?utf-8?q?cLVekWPeNZMPx7Cj5Ebli0kmNiGYjLcPkqRGv+FHUe4snqVR/pB3SCa4fpzFVsd6M?= =?utf-8?q?pzAA7oYlAhkcn29ZWnnkZU2lS69a1+xkkqdk0BoIHRZ+nR76nDdsAxySxLPQ9GIGl?= =?utf-8?q?VqVZvroig6VbRh4Tnr8fTqQeoWBPCiVHvt1QWW6IqgGD5ZxoTgFcuVP+0280iqaEa?= =?utf-8?q?gkhsWmO7EGiJII90k7/UlRym6rmw1H8ug/lu4yIT/ktaM7T4zKSv3iE87FIfpHI2c?= =?utf-8?q?vb0wO/mVkvKYjlaT6ucAAvo4dqqaxkBjEH00b/6qk9hhAaK/+5lKYgbhMOtQHHc9q?= =?utf-8?q?zMuQzEr6WVemCjXKAMUzsxQCw/Q0UlVE+sv2FyegAd4ZK0gNJuOhsJIXHqFEOvKII?= =?utf-8?q?2/b9MUyS7QyS?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97cda954-6edf-46da-acf8-08dd581f4bd9 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2025 17:42:39.7325 (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: tVuz7HZivJjOjmvpBNuZtx7rLOOj/djN4Y+ZXycL6DFQQbzAdjHLRzhs4l84NaMhWOKPjq/iv/YtSpuEapnR+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR04MB10498 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 | 121 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 152 insertions(+), 17 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 760c9e3e374ca..cf309bd0a9473 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; @@ -419,12 +518,11 @@ fsl_edma2_irq_init(struct platform_device *pdev, static void fsl_edma_irq_exit( struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) { - if (fsl_edma->txirq == fsl_edma->errirq) { - devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma); - } else { + if (fsl_edma->txirq) devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma); + + if (fsl_edma->errirq) devm_free_irq(&pdev->dev, fsl_edma->errirq, fsl_edma); - } } static void fsl_disable_clocks(struct fsl_edma_engine *fsl_edma, int nr_clocks) @@ -460,7 +558,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, @@ -477,14 +576,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), @@ -494,7 +594,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, @@ -694,6 +794,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;