From patchwork Thu Feb 29 20:58:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13577654 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2041.outbound.protection.outlook.com [40.107.7.41]) (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 981E7157AF9; Thu, 29 Feb 2024 20:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240354; cv=fail; b=UxA70I3GoItLY6YLAB3wmYqUZAGPdvUjwlEHQnufwj4RMBtCjUuZxg3LcJJtwmeKr61O7xRps6Mv4tMxcCL0/twF5jtuEhU8HhuhT0P4sCAvLBjUMsjjBsTW+tqFs6NnTIuR0ZFyKZ8I7NBk1rQb6K5/aFnB+2fS8IJVVf93OcY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240354; c=relaxed/simple; bh=sVHqn6H+sRc+UeESOOt1xPOX/umNA7g2fhLtywnubOI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=jRBqIojmSwc5q/YkINXcwAulLyN4+vyNHxo1ifvcZ4Yy/J905F4TRPDIupOn2jsTK8I87F607Q7DUvWDS2NM6e73rVCNPijLuL05TMj+dhx0yGekTnx5b1s5f+l243bsmLuYen7wVdiQhaKI2DI0WMUdTs+yvAsNgghSSbxLV4k= 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=dJcqudQl; arc=fail smtp.client-ip=40.107.7.41 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="dJcqudQl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oi1hMRVHilYOpAdzMdQR9FFgpWlsyAwk2nEIbONbHljgoGv0SrwqNhAVEa1hEUmMVA/Gup0rlXujrdYSmRJbGl7N2kImDrJ+7VrywL4kGUi78dMfSG6B+CCiQU/EAYob6PPgkc8xHhMS336oyXMVvFuann4Epg079FBwlxuadRCWzTTTS8yB4aPC5F+jap65PGKEbvLtVB3sglPfTRqAJgMOMONQgiSbV16GdM60I/6Bmmd2h6HBysB5F/kpicU8+0axM5iaIHNfWDCQQC51gIRkXdfgXkiotE8636sxec0NBFezgq8LdOV8gAsmUbxYDXQIYc5OoS5hRKbfADVK/w== 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=Xiz0Rtwc5CT1HzkoGwV9jE8Y6y1f6whfBWTv6CN9GT8=; b=ES8k9CNqAuhJnVcvdzREm0O0CmaDWDvcmKjuhrkjlts+8PeOugQ5N62y/vR4vZMo8EvTZv0hbFS7hphsxIQKDc/WT/9/1a/1ce90EH7mD2xtfJob0lGZiW4DeK8O/lycLPMfd9Sh1l03I8XsXGzwzeVVWYVCZCiyJvikI0wxtp3xWTU/4fYIRmm+is5VLgzAtoi9o4brYE8nBGMEFJ/mOGoFiZcx7y7dZuGV6lf/Y2gD4FgTdtArlfMwM9T0L8x9YkuF3QlEkUbIcMyPMrwShRWxRD1d/46ohd22KUIT6gA3EBE7lroD8z1HkjaAXKb43y/0ovsjdBOLbjLbn+JgBw== 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=Xiz0Rtwc5CT1HzkoGwV9jE8Y6y1f6whfBWTv6CN9GT8=; b=dJcqudQlFE9atGwUgP6veGL1pcc7pWxmA6/9PyzvaNWlFkUkjwK0wG08rfVfwA5ddolG5BHy8jjUWCSshdIR7YzY0ux7kbsoDAeYM1O8xe+xtfd8dUZ1XIWmrm30+0rChgJHzfBTSkKCwxR7A1e6qszAi/tVqswaLuh9qJtWcEY= 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 PAXPR04MB8750.eurprd04.prod.outlook.com (2603:10a6:102:20c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.40; Thu, 29 Feb 2024 20:59:10 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Thu, 29 Feb 2024 20:59:10 +0000 From: Frank Li Date: Thu, 29 Feb 2024 15:58:11 -0500 Subject: [PATCH v2 5/5] dmaengine: fsl-edma: add i.MX8ULP edma support Message-Id: <20240229-8ulp_edma-v2-5-9d12f883c8f7@nxp.com> References: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> In-Reply-To: <20240229-8ulp_edma-v2-0-9d12f883c8f7@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-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709240333; l=4648; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=mZwQhUw7aTNjqUrbP8MTrIFtWNHaiIzM6PH4ott4At8=; b=GocKVEUJOnuGokK3N8i0kHvko6GHWHDEfwLd/IkuE/c5DDU7vAHmopefrPkEWsqTDAa6Kj4ks Jgt2+eytIPgDlWmkBrOTYdGqr/9EEC0V2Hjf7tn5Cpq6kctrBEL17fs X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0060.namprd13.prod.outlook.com (2603:10b6:a03:2c2::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PAXPR04MB8750:EE_ X-MS-Office365-Filtering-Correlation-Id: c52d7cae-6465-49c7-30b3-08dc396946a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8qnqoIVdpHhocoDwRmV12iORlukSF3ARoMPT6qsYlY4dd19+xRylShHhC7gaseFSWGs7vUUe0IvpFRvx+qrT6+USBld3+2yy09wSN0eed2UuqYmaqoEiPOVCnyvX329qOCykcZ8n5XEui2Q/PnF8VLxZxDjyVT73gN9S2n3km6Wmr5SjWc503BAO23qFXXdrOumjOgLWePj9aJHJkPU4xUE0K8vpC+wC2NJDtbRua7UhfV1weQTBfoGFDjEVpaW46RK1B9kzL8iNTE9zbRchBO+G2rtbmljbMGvFFMmgcsJEKB9/bN9JE+Gjw4vHwv1Lclt1G8VWsPVSsKXDeiAjmJ8dlrdJ+U6y0BaPSrwOp5keclzUemZFYXJGeYowv/jUxrWEn6bZbrGl4QDM/lSgYJAySCFy037g/ogrAqB802yBT5YoaEbn6nkqaa6qSpZpdVP66lPj60SsEd34MeEmVQ4k8aWc0Bm1kQD+NNPcEV+qc2Z42+mtW5iI0HmAVaqftU8R6z9YqXAPcqZE0X8gLFr6elfnC/4UpfcAg1haZ4Yczb9jRAsEduh38GrMS5Fo+oOxvMCPRwzD9/gp7NURjDGn4yhOTEWAMEprreNQsWRn5LFRfA1i/2z6mpOijjMIlQgfOvaTUlXyl8/8vM0ldWcMsJNLBdt/iagDbym+HvdgKX0lbbPuoKBg2M2mJZsPqRQ9YKYUk5wfkPBDi1D6BXLRytPZcsaYE+Pt264e/cc= 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)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/esJpUDMJTTL7h/BM1gwO11I+MK6?= =?utf-8?q?iuWqbJmqYOPrJWn5tIG599TGQDGWQaL19gl/Hwe4xWD198uek5SFnJtnrYvDuA4t9?= =?utf-8?q?3fxMLDkXmOY1/T8kaXujWFi0exbrqci4NirtRh0gdwt0XtuFgNyI4sPn3vCGmsUot?= =?utf-8?q?rIMAp7DCG/9ovNQB41C6oHoV9rxhm197VizhXJ8VvPhN6xDN9mpf2zwsvFBNRJXa/?= =?utf-8?q?zpBGE5xCx/ENmzNj3ksCP3iORlX/B5ntmrurymXbarLCFFN3H6NyYCHYgIbSDEiPk?= =?utf-8?q?seHH/fZykw1Oh7kbzN6rZWptrJNp7p+jp2Wks4KmM9btcDEa3SXQNTxf+8TCmElCo?= =?utf-8?q?k0h9yrsf4dJH898QNhFKy5d743EAG290z8LPPIt621rhSKehfuWER34EkI8gFLIVv?= =?utf-8?q?MvElFFUUeJI2kc2CQzlONDO4KuB5pl6SFjKUicN8SwvLiN9+tskuJ7QcrhMEpBX5l?= =?utf-8?q?zGJtA2/UbzsEv1JlB/sBEq+0j4uLDvpkCH3Rt5m7UoE6JLOc+IKEWYH6PBofufLox?= =?utf-8?q?LVbLUSPAMn8u/xw+BMZvfIfQaEouqtJoS6OccA37SeD0mR9cOtfKvpukjMr1o+xuI?= =?utf-8?q?oY7CtjpES5pR1CKS0kqd/Eirt4HIHpc7EIMLkR9r6AyL6nP7vUb/YBnmk2cvUJoaU?= =?utf-8?q?kV1ZNVI8xxqGw4O+QDJTkyHQ96hEtZfnRCrsvC54RcsMDGo6UmeR/2tytuAbQx4rB?= =?utf-8?q?l0p6N5IccKCA99bBGqNRFhy1uh7xEzDlVw/YDRCXQvGdIgss6Nb4O+of18wShZPnv?= =?utf-8?q?HTYx+goubvU+6FCKxg+YM1saW1a1HL55rdhQhzyoz2pCYti7FyLCAVG4mtfTivk2e?= =?utf-8?q?K2NIWdzSBnGQFr5kRnrTnDiagKdGSicxPJWcm99xF3I3wulrcxDMnZx2HvAuE8RFR?= =?utf-8?q?y+95Bd1deRHdXQz3d4cW5pNiEDedV4S4+swJDbI7c19nHYvwVEyBETr5R5U8/t1KX?= =?utf-8?q?zck65qqmNxQw2wYP7SEbUhcZg5mB5Lb4IhvoJ1q13PklZdoNEFNADkIZgjxSSTOIB?= =?utf-8?q?FKfql2eAqguIGBGVPuhKi5vRNCSXCVP8BU1U3706bAQ4hsLrbFWns3UWC9Zkj73Vq?= =?utf-8?q?IGcTnoFyWt8y1MRmF3zK6eBFKzH4BCHWa0tnUMhBqzZKZAMKjs/EpPDcDG2MxJUs1?= =?utf-8?q?QbvPAfgN2nVw7+ljyrWpWRJSQURnM3hY+BQQgVSyk5fd9rrU8wKl0laaUw6Agvvm4?= =?utf-8?q?kXCjXj9Rh1R/ZEnlsw/DPo8/DDe70M0IzvEs/8VDN+KKzveAlWwrCdDW44wEAfVWV?= =?utf-8?q?yyrHyet3vif4K8reN7Lp0XMFMMtv/i3milnbt4nJ1zN/P9JS4ve/LzvZTnWTF3wZl?= =?utf-8?q?8Ow5peXgeTTlghVCVsVXTA3e+auYH/WPtg3wf7fQz7YYcDk2KJBjAFbxzDFj6SbtI?= =?utf-8?q?EUrz7CDBmir2xrGsdq9Msza0F/FZ36T0tksN9nW+DRZ+8dtZmSchRAQSa7fohk/Xa?= =?utf-8?q?RIIwK0AYooSYSYZtPAM8oxjYff6o29wGGuE92R848TVk1+5Q2cG5JrGSqzmjoGGiY?= =?utf-8?q?Y00Fv5i+oEol?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c52d7cae-6465-49c7-30b3-08dc396946a9 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 20:59:10.0754 (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: nAzqPHeLTZZI4GUC29fOOFxNBRhoEnGcV+N4Iww2+QXwgvWC036NPTzufQJ3bWSE7+n8CKSKVmNZ8dV8MnOPZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8750 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..0837535aa7548 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-clk", 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);