From patchwork Sat Mar 23 15:34:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13600676 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2079.outbound.protection.outlook.com [40.107.103.79]) (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 EA66C58220 for ; Sat, 23 Mar 2024 15:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711208132; cv=fail; b=dKNqph5HU+rG8p34dTzZJqWjbzS4iwAxNngSxLo8uddpzuh8hSf4+qm84JZb26cwB8O4+NPbFMU6KxVSWGQZRqqUZlIW5B+C9B9xV7xijyK9IoTF0tBhzVS59eI4DVeWiUDvVbzscoPF40Uh3yjlTm/lbZekPKJX2prPKMrIuz4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711208132; c=relaxed/simple; bh=8eI9Fc7v/8q6cY8qBofpxebszDcOATofWW0mh+BZOmk=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=iUHRkqt1GUgF6qGraI/JsduosNq25ROkLwYKfu7lK5U0TvXbq5n+/6gwiTANDCLwHsa1/iv6pGuPtBNfEk1ypSQlkgffx94ob06rDe7Xx06kCctHfUn1Ui9bLCFj0//UiWoD/J9BJNoSQVm6Hz1VkDlkmSaT0w+fvk929EdFhjU= 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 (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=lF+J4J9W; arc=fail smtp.client-ip=40.107.103.79 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 (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="lF+J4J9W" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LPHqdrsQkg0cLnsW+xIw8RXqCCysb6REL4RpctW8rF3AAdXI4CursDpESiscjuO4IfankyeDAWOe8/OlwnJRhVZH4GbPBrrq61nx/x81epmmxufmQ2yhp50wZ+vwIOsrIMUeB+u/+UNG4f4XeRISyQHM/QCefxEZ9rgbPW0LrN5xA1BwJXmqAPvZvflTcSsfcH+4Gnvpf8+9X0hOsCLGax95xHBz5zRbWGp2H7jcvhbnTFkQe2bfQho42cInIcVZ6hWp2xCoZ/+vvodjgIXVtc20XA928+jCKpRwm19HDWylR6BeGK8U7FCBiz0imfJ8dq6kqysQYF0O0iqPC3P8iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=mG2T4jmo6RJ3jDnBL3dbdXaECokzNHyYBvUVc8YJujA=; b=LBhrbGgXlH7nW9PSLe60cl5RyQJvajm3q60O7hzWnYC0nQygec+rDazzaGoI8irqtbBKGl6l8MEOzkLX4EhYHFBdBHrT6cEoassVP5XDUCV9HEt/Tk19cIJVtwnsXSYtT2DgQfYRcU5DkRENu76FrFEn+2K63OX4MWCftSt9luWPjDexwiSyt0y+h65vpU9PeS1Si5d4mTRGb5XBO434PTKBy++9fjauoUzshxelYl8X3X/ZKOMQ3bb5mZlcS426+OiklliJFZkqaDP+ikWIafdJLcvERELkgv+ql3eYp3hLXdV5h/P921tIkdRsJsua871ohlId9O1R8GfKHxuT3g== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mG2T4jmo6RJ3jDnBL3dbdXaECokzNHyYBvUVc8YJujA=; b=lF+J4J9WthzUpI5umiqlqoffiTzHOgLkd8LqkGEyivBqaH03Wzj2/ShyAhJbc2qw2ONKVnjnk4fnD/F9wpveYot3MjxknPhpVPvmGZPONFglBvqI+wRhOauhq8Xph6dXWprTn1bqFDXeMmFjkNBsvSR5BdtiSCet+rP0XUcXYnA= 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 PA4PR04MB7981.eurprd04.prod.outlook.com (2603:10a6:102:c0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.26; Sat, 23 Mar 2024 15:35:28 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::3168:91:27c6:edf6]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::3168:91:27c6:edf6%3]) with mapi id 15.20.7409.026; Sat, 23 Mar 2024 15:35:28 +0000 From: Frank Li Date: Sat, 23 Mar 2024 11:34:54 -0400 Subject: [PATCH v3 5/5] dmaengine: fsl-edma: add i.MX8ULP edma support Message-Id: <20240323-8ulp_edma-v3-5-c0e981027c05@nxp.com> References: <20240323-8ulp_edma-v3-0-c0e981027c05@nxp.com> In-Reply-To: <20240323-8ulp_edma-v3-0-c0e981027c05@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li , Joy Zou X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1711208112; l=4644; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=rQTmYHe1Hb3Zayn1uN7RFTKdzjmWN287sa/6NJTu2vY=; b=PCstv2pDAG2RsBvgVrYibsgBRkDCbPztO/AdnD+dZ1XjG+5S73PRvgVQqMI62y+8Z76E14WGw xKet1OkV2B5Cfw936x8OG2Y0SNwU/PQG+THwsTZ6ai8AdURlsQZZ3Jt X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR05CA0026.namprd05.prod.outlook.com (2603:10b6:a03:c0::39) 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_|PA4PR04MB7981:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fefcb54-21eb-4441-b388-08dc4b4ede10 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zLPS/2Y2Kyiw3xAcD5XILMxJf92vPsgZYVac/QLgR0nvnP9u6WNoROTUW36UadsLPQx0T1mgTe/reZsSxahAlT9wNSAwz0BwXmKDY3SxTS0VL7MeSlaa0UCaJu/0sVxw6atST73wvU3PKSjWf8dz4vaOxkGn5RQFUYuSLAmem2Dqz7EQl+PXQep8Lya58B0oPeAUcUmXKVII46bgZ9VX+xhmcv1QgyJgpzfAtQfUXlBs9GwaavQg8js6+kpafyZyDKYkALwKHTyCZPTbRHUe7yyBi2mttU5lsb4yVXb5W2eaoy10HxRaR9RKoxcFmnWzbOa+HpZrMt9SJ6WAAKLWek26Aw8Xfp4d0nIULZCX3OA5e3jed0nHebVJctx7MdWm94qhnIWYiUG8CaxvTm7NP4x5PeaSkbgaIpUptktdP242JeTY/zHy7AhEqlnL8dkyn3rDsz86OUWjzo56MCgs+Y4xBFG8h0QPZbI+k3cZBzRuV+I5uoeac/nnoVjgyNz1K4WAgl2i2ltviMbFjc7mcWLpDLHGfyWXKXv/klwgB8L5dSKTNWgaTejRj/1q1gDZo1iVpdfllL1JDhzxu5VqvBmT1w/UGrHvw/4eLEtZDAzHWlK36+1nAanb7912+aExBdeFAn5kVngKtqeKkuYVI7fvxMNn/h1iX9vT+Rtmhpo1t6Dy/7psmyZJvzLHeWI2XVklZFWdRXY0AZ4tBunVXVTVTfIaVK7u8/aa5D8bbKg= 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:(13230031)(366007)(376005)(52116005)(1800799015)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?GfVM8Bigdv7jQJEcscDj+w5bB8cb?= =?utf-8?q?adTIFWHhiWjzw99WNn2Qfde34+q64wZS9GX0XmkIMXQ4FE1UzkQXFd42GN31zUj+f?= =?utf-8?q?n6KcokXkmuyItXG20hbASXfwqu4Oleg2x1N1qpJQ3rGFQnXfEWn1owv0rMLBbMv3h?= =?utf-8?q?lHFY06QJwsicD3/tR64cIkvXjnz73FLYrGCvgmhiJQFd9d9SvPHeQno7pgYdtYJJd?= =?utf-8?q?6t6WnH6EK1X168cd2yQDgrT/Gy6FsHFnrvhSSxv0IbD4rQjd/3du4LM7QOgG5iTPB?= =?utf-8?q?7cPAPu4RLpbXG9hbCBb39qkFlgBKn/0rhPxoaMZRQa7r009OQ+nqjeEescUngpbsD?= =?utf-8?q?pbs9x/Kmp8N1IxC//BQJAu8ENFJakEnP4W+jm0/G7xFDy5EW3p7sCrb5x1JeUnEmY?= =?utf-8?q?rEqXtkXueQd3qP4FDqWzJ4f6/SPM269s9EorF7ukchNcikaAivraTqX0quXaCzva+?= =?utf-8?q?qPiiaTNVybM+SyMea/++7lYHsDN0d3ZEc3mOawpWcS0WBSGmSdINH3zoUnWYxVGkh?= =?utf-8?q?Ymou1EbvpoUn77eVvQxTYSl9vvxLJ3qfAaIoA1pP3VWPI+L2/B9L93XorW1lD8aPH?= =?utf-8?q?TTQSatfirgHNGoalhHvhJ1p9M98NK/U98n3+PiCtuFf9BcdQrng6n9nvmaOwh9xlS?= =?utf-8?q?1TePH02/PGD07sSU1e1YcZHtrwRFhRLYd+qhel8FxSPlKFROUc+yhqp6Utdp13Qq9?= =?utf-8?q?5uCx2wFCzFu0JEz2ZQvtH1MDpWQrHj+l+5lwc+CEPWiYd2x6pklNjWS71XCUVHOG1?= =?utf-8?q?GYjOfalUe+YGdKgl9KGlcz95aFKxXsGhGXJriP5NFj3GHBvq4L83re+Z1H8WZRtW2?= =?utf-8?q?dB4Lsrna2yDLEo+ZgP7wW/jOb06SUdP7hhIpwdZ5tsqI3DWh1OmjE64jWwyfHmju7?= =?utf-8?q?KwTezYDdI9B/1aOSets4w06kavgmeirGy6+hOFAOnNl1aLw47BoK3Nl8vAEi3XAaj?= =?utf-8?q?ETWzSqKYgvl+OZHoqvxWUqILVou2b1gOjrVOy5ga2hF2JcEBgx2gxY5ZcfJnm7erJ?= =?utf-8?q?ZIBK6+upAgAhua3qHiYNn7fTSvL+nbZWLuH8rqZ96SifzqjK5y8xO0YqOA8P4LEiX?= =?utf-8?q?Fu+6uRcYei1NnKSxO3tgTM6n1A+RWyUpApeQUWwIw12GMvagxjVho+hX1FPLhTb+b?= =?utf-8?q?uXPUQaWM6ups6RNkzmJ/JvIw3c1Ydmwa1Cihiyk3Wi0YS5+7siIuM5Fe+RCAzRv/c?= =?utf-8?q?enuQBljfpVXkbzWy/PA9AuLl5HKSlmKS1fJW8Wf4bYSNWlIKk7LRbjr7SvO/c3xT3?= =?utf-8?q?NF27aeP+ZmZ4XVvz0uubdjB7THpceCGKLYMQ+cKdkZnjmoaanb4EGXOGL/HTC2O85?= =?utf-8?q?+rjXzTzaWGtaqCKtTAfl3R+f9MJcEr5ZYzVEnd/X11rPHJv+73e38AXMIJeC/XnKz?= =?utf-8?q?1sYRYi1Z66PMQ4Q3+1+TWSijE7CrLjbrlzA9yb1UZv8NVg246HHnOoui0fFzrLzKu?= =?utf-8?q?IIN/Q9vrQjS4G5b93aFnB3XNHgqNIse1gdAfH1qJ16OIOyW8I4TsveHoggkChO/J1?= =?utf-8?q?AUaZvmOaUUDe?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fefcb54-21eb-4441-b388-08dc4b4ede10 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 15:35:28.5623 (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: qEHr3WvrkZQknuvPhO7EpTPwGc7usUQJ7kfIlYx7yn9wk/Qv2AmNkUDgZDr+uz9YSLYX8m3vHjo6XI34RzjaXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7981 From: Joy Zou Add support for the i.MX8ULP platform to the eDMA driver. Introduce the use of the correct FSL_EDMA_DRV_HAS_CHCLK flag to handle per-channel clock configurations. Signed-off-by: Joy Zou Reviewed-by: Frank Li --- drivers/dma/fsl-edma-common.c | 6 ++++++ drivers/dma/fsl-edma-common.h | 1 + drivers/dma/fsl-edma-main.c | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index b18faa7cfedb9..f9144b0154396 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -3,6 +3,7 @@ // Copyright (c) 2013-2014 Freescale Semiconductor, Inc // Copyright (c) 2017 Sysam, Angelo Dureghello +#include #include #include #include @@ -810,6 +811,9 @@ int fsl_edma_alloc_chan_resources(struct dma_chan *chan) { struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan); + if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK) + clk_prepare_enable(fsl_chan->clk); + fsl_chan->tcd_pool = dma_pool_create("tcd_pool", chan->device->dev, fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_TCD64 ? sizeof(struct fsl_edma_hw_tcd64) : sizeof(struct fsl_edma_hw_tcd), @@ -838,6 +842,8 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan) fsl_chan->tcd_pool = NULL; fsl_chan->is_sw = false; fsl_chan->srcid = 0; + if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK) + clk_disable_unprepare(fsl_chan->clk); } void fsl_edma_cleanup_vchan(struct dma_device *dmadev) diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 532f647e540e7..01157912bfd5f 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -192,6 +192,7 @@ struct fsl_edma_desc { #define FSL_EDMA_DRV_WRAP_IO BIT(3) #define FSL_EDMA_DRV_EDMA64 BIT(4) #define FSL_EDMA_DRV_HAS_PD BIT(5) +#define FSL_EDMA_DRV_HAS_CHCLK BIT(6) #define FSL_EDMA_DRV_HAS_CHMUX BIT(7) /* imx8 QM audio edma remote local swapped */ #define FSL_EDMA_DRV_QUIRK_SWAPPED BIT(8) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 41c71c360ff1f..755a3dc3b0a78 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -356,6 +356,16 @@ static struct fsl_edma_drvdata imx8qm_audio_data = { .setup_irq = fsl_edma3_irq_init, }; +static struct fsl_edma_drvdata imx8ulp_data = { + .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK | + FSL_EDMA_DRV_EDMA3, + .chreg_space_sz = 0x10000, + .chreg_off = 0x10000, + .mux_off = 0x10000 + offsetof(struct fsl_edma3_ch_reg, ch_mux), + .mux_skip = 0x10000, + .setup_irq = fsl_edma3_irq_init, +}; + static struct fsl_edma_drvdata imx93_data3 = { .flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA3, .chreg_space_sz = 0x10000, @@ -388,6 +398,7 @@ static const struct of_device_id fsl_edma_dt_ids[] = { { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data}, { .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data}, { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data}, + { .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data}, { .compatible = "fsl,imx93-edma3", .data = &imx93_data3}, { .compatible = "fsl,imx93-edma4", .data = &imx93_data4}, { .compatible = "fsl,imx95-edma5", .data = &imx95_data5}, @@ -441,6 +452,7 @@ static int fsl_edma_probe(struct platform_device *pdev) struct fsl_edma_engine *fsl_edma; const struct fsl_edma_drvdata *drvdata = NULL; u32 chan_mask[2] = {0, 0}; + char clk_name[36]; struct edma_regs *regs; int chans; int ret, i; @@ -550,11 +562,21 @@ static int fsl_edma_probe(struct platform_device *pdev) + i * drvdata->chreg_space_sz + drvdata->chreg_off + len; fsl_chan->mux_addr = fsl_edma->membase + drvdata->mux_off + i * drvdata->mux_skip; + if (drvdata->flags & FSL_EDMA_DRV_HAS_CHCLK) { + snprintf(clk_name, sizeof(clk_name), "ch%02d", i); + fsl_chan->clk = devm_clk_get_enabled(&pdev->dev, + (const char *)clk_name); + + if (IS_ERR(fsl_chan->clk)) + return PTR_ERR(fsl_chan->clk); + } fsl_chan->pdev = pdev; vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev); edma_write_tcdreg(fsl_chan, cpu_to_le32(0), csr); fsl_edma_chan_mux(fsl_chan, 0, false); + if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_HAS_CHCLK) + clk_disable_unprepare(fsl_chan->clk); } ret = fsl_edma->drvdata->setup_irq(pdev, fsl_edma);