From patchwork Mon May 29 20:04:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258926 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0268EC7EE2E for ; Mon, 29 May 2023 20:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229830AbjE2UFX (ORCPT ); Mon, 29 May 2023 16:05:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229821AbjE2UFU (ORCPT ); Mon, 29 May 2023 16:05:20 -0400 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2085.outbound.protection.outlook.com [40.107.105.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17B41106; Mon, 29 May 2023 13:05:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ad34pKxjIJyOmNJICJRLAPIoJpytXwjoHfvFM9HkCaVaytQJ5dMBDAXiAXYrS6j/E/ciopyiTxG9DVUL2/01sUHAABvNcc/8CMSLC9mG+noPUBGM46PDHoayXhKfVhHPdQb/Rx3CUdob4Wkh9pe8SNOa4HyWYrV1u+XTRJ7QHNUuOAKQJowIWv5mYaqgYMY3eCLa1mFXO/kJ/iNDEpdv1VDv1gWwuizJkaL07kSSjAqfbY/rpZv04go8vMx2Qn/vWbClGizDcKVnBCZMVJSiEp3Bwb+7UsvTUccbysmLzFaopHq6fAmi/iNp6qoMj/iOabk5S43jvLXjlDtw4dNCrQ== 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=jOuNKw+yGPPLP4V7NnJ/FXD55i84pACgcY7tObwFyzQ=; b=dOKAB7zJ2ihPR2VkNlEzol7jSqdgzDw8pGyhRrWxH6QQ0tDBqw6/x4z4HD7tiYPGk6kHux943tdaXiXorhUFaAIKOLQBJdMjpJhdb5OblpGsdaUO765A1tDw4nphq4P1S8rUy0APBMZrMT9ufiuSVJcIa5HMc3nox32K0eKnsle/2djh4IcnUDP8XH/wOA2qDHyXpLTwxy/ttKsE3NpBiHilvf3dnh7cb8QsIj9iEOi7DaqEMJMvgWBkTurjRedNn2Lswan2tWAV09tu6parazZz3DngJlvdDK+lQ1hdsXu0HOwmje4COecwiqg0vJV1ZmK8hvVr55bkX7XjVNKdHw== 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=jOuNKw+yGPPLP4V7NnJ/FXD55i84pACgcY7tObwFyzQ=; b=K6OjpEj8NgaDluBWwJCJbuE6GPavlkXnp5XYzWMR52O7jdrSIYbb0UMr/h8revFfhHE9136xr0NktVUX6kt7jWKBkf9GGPQC8dRVR9jr6E8h0hqME42MiiBn2uzBZfSBCTbcBrk5EAxcyXGWxLQzbEJVSTYAozOexSZbN70lGUU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:14 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:14 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 01/12] dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL in fsl-edma-common.c Date: Mon, 29 May 2023 16:04:42 -0400 Message-Id: <20230529200453.1423796-2-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: df4ce555-58e9-4535-977f-08db6080043c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y4Zlj0GT3Pq+p+TLQPOwK1/w3tfQ/11nxvGkL007LYWZHkcAXbN9pW4RsV0X2wExD3QwFUyBGpg4hi6X+4rjIeFpYvBm8+md+9b92frtSB5JqCqBl3XGM5mFAx5ryv9VVlkhSLQOeNxlN3mmrI8zxNQpsr1HoRWhHoMee5Zf6Q4SzUUUIPMswPav9Em8uW8zuY/T4yAYPeLlcU5JeiJDDuMp29vOLsyLRsfsGuPBu/N2lRTbYMad+rCrT1HrYmT7i1n+leiw+wXQ60gEZZOLVjpOvvlot7qCax7fW9Fp5Va9yQzZjE7OsUDYykAJ7/Fb3FbPOgap2pits1wCyj6d+FNrhaG4YwjMQ7L6/DfEOKOhb3T3rJPqEBJuoUBTVuHIU47VyqbAhM5Z7/RBdZqRHxOo4t3RA1Xz2EVOVEPXebSHE1UtkZpTnM3fRKwbNWj7kML5i+2M3ZCH/6RdKdzpqxv5MwoEhiOWEcjpqgdLmRt5vbaw8ZpWeoaSPVYXQyI/Mkpl7guPgmqybiDCt6/F2Xq5A//jS708i2R07iWn5zqitR3jfwarhTk/4ibaYo9qij7m89Yeli7UIb1czfkY3w03L99CEbeuI60Ay2UVZeaGOr7XcalKZ1pYKgxwMTb/ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yy3BcES8VWSpV2uMSzRowu7b3q0sB+zoDyPVVMXBYyJV3nIQ11Aryseu7I0Mon+GRMRBTsI6HUt1ivN4ZWnmj6W36oTeW/9kkVFaeAzOLVOJ6IzrttqxuSXdEf/6qtohlarD1cfEFJa9DuRyCgFcsRICSYw3Fro0zUpAwU94PUeFoWwKHi5f1iIINcPvsTQQahKx3fBWCZzZX2qLlIE9fAW1DFftwpB1bgQRPH1HLbj+qO22NP2PP0ftW6WJsZp/dcpCwOtndYhG5jUYT9F/4swuhEgGkAEJMSwSulpFknXmToF3/8+boUTduqvcJX5gLlZRNQD2oAjSKuz5us1ToVBcY2g8rAW+vpXZYNoFOHWZ1+UzOYERkDnaUxyzVSY6iOMMDpwnluFXyWewd4RaocZCc8t36CIxID42pJlBCxfc6mgCARUpgQtGHbi08G7vvX3Ltve/kJr3FO1czvjORvOeKdP/wR9RHj7oQP4s6uKJXZoQHTd3nJ6rQyeTj54DGQyMonFHar/YZRdFOrAd5hoqjk8ffcOrJ32Pdm8alCBjCwxR1106YUzW9huKUoqCXeXNKPsHOYBNMlf5x0dV0JDhhbHyEBAfkt2mN4cFyW78zmmgEHjKPL0u8jANfx1VrFucRfwypUgCnsJfkvqew8rCt1dvsLmfIzCQIUZsrjQyTN2+glWORN+fMIrVyzB86r75nvM9XaIuwYvAL3CeVKHBVoeaf/6fpUFDWfvj9qHx9Sr9m0eC3VYjfVD5l7M9D6c6s+yQLxWth3hbHjsCR2OSIEUW8J8OAQtBzc7FhTOQYt5s0zWUPWPTAUpS6Jd2p3rf08vg2l7CQcI3O3tYYd+pTo+QdfAuBNgwxRIgMnVBZWpRUAUk8lpcgom3MdaxJL0whup+uZQ0s35POPxUreaPj3nPFt0YMb1gjE+gD06bkhP6+53ad8Zcwr73N6h5XQSy8/IWzZ+FdBQcqbXAvt4WynQfsfhYxpZZNMk4u5dqe9GPpdQhqeKTFNmXb2DCnZ4l+QZd6bwmklrA3aANMrks4FRVU627MWVcqVZp53I/5hb0usD8mGtkatMOmheKJrYcerXRkJjhL0RphwNZUOFNOUW0Y2zfanhxdicfRE7GAyRYc57E400ExW3kucD6ospqG0vTw86wwkYjbWbsG4MSatWZe5Yc2XSqns+1nWkhYhbumLH9KvfI9uLFekrXY7qHBxjPTcJEJfDvmLiJeNs16/HAltRaLq1dnK4vSIzA1VEDF4/Gy0j8/zhZNiSuROsJR5UR/xvj98L7m/eeMuVdfbTVc2fSLTLjIJJcYyMlQIJbu8ludkbHjpepeuDCZ2VHpTQ/JteHvrZMpQPeQPnhh0bkue33jyO92wgBu6eiWZIE9KPnwT3mK6jY9ZHjIWwp6A9wquvaJS/Tnyd3ImqtHhBgXtf0oD8eORFiAlPURRaBGU4sdDENQ4WXy2q3K9VhPUihrvlFswmB9awEp6Ouged17k+fMTs/FctYsLEBiJSwrrxVLYu+l8szc4LRN9vRorWMZAyKye2mHLRpZzw3TcC/i3JrHk6T2/eJIvyh1T8djEM5ocKd4hUMdrCN X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: df4ce555-58e9-4535-977f-08db6080043c X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:14.7893 (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: en3dbFdSp8VP4IE4Y9oK+j0vAV4eJYN3w203LvKigLQS3gsoROPE/JW0O6f2FwgNW532gzrMhCAg3S/1fkA0TQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Exported functions in fsl-edma-common.c are only used within fsl-edma.c and mcf-edma.c. Global export is unnecessary. This commit removes all EXPORT_SYMBOL_GPL in fsl-edma-common.c, and renames fsl-edma.c and mcf-edma.c to maintain the same final module names as before, thereby simplifying the codebase. Signed-off-by: Frank Li Reviewed-by: Peng Fan --- drivers/dma/Makefile | 6 ++++-- drivers/dma/fsl-edma-common.c | 18 ------------------ drivers/dma/{fsl-edma.c => fsl-edma-main.c} | 0 drivers/dma/{mcf-edma.c => mcf-edma-main.c} | 0 4 files changed, 4 insertions(+), 20 deletions(-) rename drivers/dma/{fsl-edma.c => fsl-edma-main.c} (100%) rename drivers/dma/{mcf-edma.c => mcf-edma-main.c} (100%) diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index a4fd1ce29510..7f3d62c9dee2 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -32,8 +32,10 @@ obj-$(CONFIG_DW_DMAC_CORE) += dw/ obj-$(CONFIG_DW_EDMA) += dw-edma/ obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o obj-$(CONFIG_FSL_DMA) += fsldma.o -obj-$(CONFIG_FSL_EDMA) += fsl-edma.o fsl-edma-common.o -obj-$(CONFIG_MCF_EDMA) += mcf-edma.o fsl-edma-common.o +fsl-edma-objs := fsl-edma-main.o fsl-edma-common.o +obj-$(CONFIG_FSL_EDMA) += fsl-edma.o +mcf-edma-objs := mcf-edma-main.o fsl-edma-common.o +obj-$(CONFIG_MCF_EDMA) += mcf-edma.o obj-$(CONFIG_FSL_QDMA) += fsl-qdma.o obj-$(CONFIG_FSL_RAID) += fsl_raid.o obj-$(CONFIG_HISI_DMA) += hisi_dma.o diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index a06a1575a2a5..ce8d7c9eaf77 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -75,7 +75,6 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan) iowrite8(EDMA_CEEI_CEEI(ch), regs->ceei); } } -EXPORT_SYMBOL_GPL(fsl_edma_disable_request); static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr, u32 off, u32 slot, bool enable) @@ -126,7 +125,6 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, else mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable); } -EXPORT_SYMBOL_GPL(fsl_edma_chan_mux); static unsigned int fsl_edma_get_tcd_attr(enum dma_slave_buswidth addr_width) { @@ -155,7 +153,6 @@ void fsl_edma_free_desc(struct virt_dma_desc *vdesc) fsl_desc->tcd[i].ptcd); kfree(fsl_desc); } -EXPORT_SYMBOL_GPL(fsl_edma_free_desc); int fsl_edma_terminate_all(struct dma_chan *chan) { @@ -172,7 +169,6 @@ int fsl_edma_terminate_all(struct dma_chan *chan) vchan_dma_desc_free_list(&fsl_chan->vchan, &head); return 0; } -EXPORT_SYMBOL_GPL(fsl_edma_terminate_all); int fsl_edma_pause(struct dma_chan *chan) { @@ -188,7 +184,6 @@ int fsl_edma_pause(struct dma_chan *chan) spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags); return 0; } -EXPORT_SYMBOL_GPL(fsl_edma_pause); int fsl_edma_resume(struct dma_chan *chan) { @@ -204,7 +199,6 @@ int fsl_edma_resume(struct dma_chan *chan) spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags); return 0; } -EXPORT_SYMBOL_GPL(fsl_edma_resume); static void fsl_edma_unprep_slave_dma(struct fsl_edma_chan *fsl_chan) { @@ -265,7 +259,6 @@ int fsl_edma_slave_config(struct dma_chan *chan, return 0; } -EXPORT_SYMBOL_GPL(fsl_edma_slave_config); static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, struct virt_dma_desc *vdesc, bool in_progress) @@ -340,7 +333,6 @@ enum dma_status fsl_edma_tx_status(struct dma_chan *chan, return fsl_chan->status; } -EXPORT_SYMBOL_GPL(fsl_edma_tx_status); static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, struct fsl_edma_hw_tcd *tcd) @@ -520,7 +512,6 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic( return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags); } -EXPORT_SYMBOL_GPL(fsl_edma_prep_dma_cyclic); struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg( struct dma_chan *chan, struct scatterlist *sgl, @@ -589,7 +580,6 @@ struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg( return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags); } -EXPORT_SYMBOL_GPL(fsl_edma_prep_slave_sg); struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan, dma_addr_t dma_dst, dma_addr_t dma_src, @@ -612,7 +602,6 @@ struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan, return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags); } -EXPORT_SYMBOL_GPL(fsl_edma_prep_memcpy); void fsl_edma_xfer_desc(struct fsl_edma_chan *fsl_chan) { @@ -629,7 +618,6 @@ void fsl_edma_xfer_desc(struct fsl_edma_chan *fsl_chan) fsl_chan->status = DMA_IN_PROGRESS; fsl_chan->idle = false; } -EXPORT_SYMBOL_GPL(fsl_edma_xfer_desc); void fsl_edma_issue_pending(struct dma_chan *chan) { @@ -649,7 +637,6 @@ void fsl_edma_issue_pending(struct dma_chan *chan) spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags); } -EXPORT_SYMBOL_GPL(fsl_edma_issue_pending); int fsl_edma_alloc_chan_resources(struct dma_chan *chan) { @@ -660,7 +647,6 @@ int fsl_edma_alloc_chan_resources(struct dma_chan *chan) 32, 0); return 0; } -EXPORT_SYMBOL_GPL(fsl_edma_alloc_chan_resources); void fsl_edma_free_chan_resources(struct dma_chan *chan) { @@ -683,7 +669,6 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan) fsl_chan->tcd_pool = NULL; fsl_chan->is_sw = false; } -EXPORT_SYMBOL_GPL(fsl_edma_free_chan_resources); void fsl_edma_cleanup_vchan(struct dma_device *dmadev) { @@ -695,7 +680,6 @@ void fsl_edma_cleanup_vchan(struct dma_device *dmadev) tasklet_kill(&chan->vchan.task); } } -EXPORT_SYMBOL_GPL(fsl_edma_cleanup_vchan); /* * On the 32 channels Vybrid/mpc577x edma version (here called "v1"), @@ -743,6 +727,4 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma) edma->regs.tcd = edma->membase + EDMA_TCD; } -EXPORT_SYMBOL_GPL(fsl_edma_setup_regs); -MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma-main.c similarity index 100% rename from drivers/dma/fsl-edma.c rename to drivers/dma/fsl-edma-main.c diff --git a/drivers/dma/mcf-edma.c b/drivers/dma/mcf-edma-main.c similarity index 100% rename from drivers/dma/mcf-edma.c rename to drivers/dma/mcf-edma-main.c From patchwork Mon May 29 20:04:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258927 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42993C7EE2F for ; Mon, 29 May 2023 20:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229833AbjE2UFY (ORCPT ); Mon, 29 May 2023 16:05:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229819AbjE2UFV (ORCPT ); Mon, 29 May 2023 16:05:21 -0400 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2085.outbound.protection.outlook.com [40.107.105.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C64D7DE; Mon, 29 May 2023 13:05:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fBFfWApCR3S8tKAjQco+Uz4K4szawqqu+97Z4xCEQQZDbv51fGtUqumyzcq74ZmGOULaT6kgkW+UtbDWvPNVxESa00xsXgiSjXlzybXbvG29rg7OnjMsBHmHpAqS1s5nsO8Xb7Wcb8EaxTSiU0vbFLX90cGXBt8d1kafpvfPVWudkdglfisIud3vzvo49zkQTRrqJVGsDvDhg/L6E5hjesWA4yY6Hwgk3dGXgkkOIx6CKsvCVdpSrFFFAcpPsaM1Ilep//Z6Fg55D68/XOdKNA5vRsjpKYzy0tY97zXSKe0meg++xETqR7M71YDJPVyzOHDRdR2LU3OX46tTtT5p/Q== 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=toliOa1Ni5BE7L0tZ2qu+bbIW1QVGvNuK84B+H1Qylc=; b=jtxsVyA5gCFfiU5KAssP3j1lXuNQeIT2IBr/Ag6OZwozUzVCWpCHL4qd/Zz9Mwh/NY5GiSHvWcGREceZS40g+PYTPiXZ7IPgGBS8mCWIpN6KI+QFCUJxdRPltXNgWYoFmGbN5n73E7NL99qJknMonJE5/eCTcO3C0sNcRdHvQ/juMPPWBaE7hz19QoeCEhKh7Bkb3HuYS1vmUkMYdILp+xeecs4fSSPjEUcAEhRm2cE2w5I1jAOq79xcEqyCS8AkMBB4CztN2PfPQBtSn59+ufuR2e+6dm4ci7q2/37DLqJeNEY1jlK1b2P8RZsrqiNxB8tYGWZdxGgWLtJJ1oQazw== 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=toliOa1Ni5BE7L0tZ2qu+bbIW1QVGvNuK84B+H1Qylc=; b=JHaKLriQdU5yw8fm34j9tHmYHNLp3JTnlL65VnD68KgpauJsXRTXcRtNi5joTSkQPnUCzterGfnYVa//L6GRyFbeX/dXOeVcwLRskkXcsroetf4S47/vUNm6r2FhSXE3ldrdGEe1USkDxLXAya6oOwwLFTL2H7ukOie0Nckzeaw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:18 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:18 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 02/12] dmaengine: fsl-edma: clean up fsl_edma_irq_exit() Date: Mon, 29 May 2023 16:04:43 -0400 Message-Id: <20230529200453.1423796-3-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 84681a75-300c-4c94-1717-08db6080060b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yoAAe8RRzRwOHcLMhnWWTNrFR8okVhVJ9JMmKzebtgl3Aveo0CvjlmRWvP1k0epNQRuE7ly/NKyDPg676PUy8DucHuV8pxiMulSqE+lZeNWJ2E06qzOlRkxToIiHcsaDWWgzVhxCUNBiXJwICvd+anUgbxnvySLhw+3jRV/nHxa2YHHkkecOJX5fiGV6ECu8PjRLjzQTKE5RbtY+GBWiX6vmItpYci45VLGXnqYGENSZDmcFUqG8jQoFE5i9FcixQjHe2EyLpI/OYp+vnjGFZtHgqxsrWlxn5Gd7NdPw18es66zCI2JESs8mlbZngcD6Mt2d3eTIkQcSPo4XHGS5FoOBfAp4bvj1OVNU8x7Bkl4o3XOhZY6WPqShS3vLGtpvNEa0Dzwq2Z9SX+XWFVPl+MiegbDDq8nvdEhyHe7yy2EF0iV7NvNbfj8pdK0WWosZuTez0GDwFSoNyms9zugHyy+jMVaIuFau6YHcGnxYLCm4NJ2pB0Js+YB+aCItij2xKO0PQYNHYHBowbzdXfr+id+YgOVXRPRefDJ4YV3gAn/kzQgdFfybSH2DazeIqPwDj8suNS4O1EsYFk0IlzWZ7+4qUCmEdFu2arMchJVl90XM7M1skEIb2i7bDsC7Flc7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fF78jNTGV1UDYmiu9Wu4lLMoIKJdneVYQ52tkxGvDfAxqNbGZpIgJMLpjPxh2Grcgqgb9ltB9jXlHySQcjb4RyhfGFYsi2wLSp5iO5F09wpZvx+rVG14HQgXjffB4pFSe1bIgwwmayd3rh8ExvBt/FZx8eW/LV9CqrCdPUAAQHHRpSlD6JsL6eYs0vjaIOlGkUTA4uI3hyPnYsNbsqip6UscNmBf3UKjyeQNfOSQdjD8hxa3gkhlj22Nj03RrTXh/x1p3rNPB5JS4yaMJoFhCSqc/ic7WHp8sXpE/GM6kxFOwZilj+r9bnTNnMSKLWgkkuvlvQuG/dwDxOIiLSed+wgnU83OCp+C7PN+RAOrFM+TTbOFIbVCUjOiewTSya74NA+Ch7U7XEMLcuoQhVzWQUB6JY9zktA/RkRq+emgkBpp+znh/SevbbmreMn9aKLfseK/ESE2NyNm6kKfs8rY0NbJh2RlfMzknzcx6ByPHQdGms7CxNXMNtx5niwDobi23XuD2az/SWzy7vn2wW8QDA9tDwdPBE22fBed9lyOR6T4EbgK+LnnQv2t0frM2H7bZZeUa1t1Im6I207lP1/Oze1KRgPkcNYGJs+XyUsnrxZ8590tSa7KGUxo0CjprcIWe0H5lfbJogkjG1ZZUgVwxMFLupNaqcQhxlTX5btO9MSYtZR9Jomxc0xtMYRjkou7IZ46C80ePi+bq9YsA7Mv2k1x+YRzHe4QsLsab9gfp6WZsayfFbrQy6s2Y4xOmbzgtgRpYG0JcT1VIsHdfJZ0LtDhtB9as4Rbb2/8wxi9mLq5aKL/jKgDwN/K+yE1meoD+yih/bn5SGhzfWgN30bn7tZwUN/vqmnpq0d+oOtArKPcQN7Ow6USpErsOojopxDoNeHR4xAKEJNXYvbaMLde0MdnRJrGQaqUmCqWmVGKiX1a56oKVN7MRTTr/O7yWKeHfZIX10g+srQ4woDKlTfFwB88Wt4bE3fy3449eBZpTzx8EkTuGnWicXmrzJsGk0qiRWH0KYjVc6G1xkaRXADcwP24nay50v1/CjAzI8LeOHZpUWZfE5r5Q9LaBjUKXJcjTxpEPh0rDMHkVRtBCAgudrHdsSalKZgkdLo19zYKPLCcH6U5jvMbOi3uNVYlsKDsy6FDa+muqseFwftjlHd9Rej0e2cBr9Ahfibi16SjUYAkRtA5l4Fp53mtNBr81hZgP/ajma5GobwAL4D77KyiqH0+HVZbownz5nknQjPZj0HAsn6VX6/zRHzz5kMlp5mT0dmk1ZrosBFRUC/OpOlACU/kWST8TZZYrj/UgiAKlRvIGlDe8ZrDyXer+EW5pJRmfE9Hq9FTqz1aR1GONjbwhDfvJlbp0tHyB8Qzk3n7LdYIv+q0m0I2WlzrAuGqJbt25e36ikzvNecDEXft1Y1YpiY+tosyr1bgYENaYkoTjboZ36fTIbI0Sop6SGLntwI2rsYjD2bG5p9DZpkdFCMdAj5rsBLKeOXkXrjkv3AMQZKxGGlVCZoG5GOEq6cdEOFsmjjypgMxebeDW6EDzYzE1TlJ7nQzu82qBrF4NmCv+GJBPGuu8BFeBc+K8GJdeOct X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84681a75-300c-4c94-1717-08db6080060b X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:17.9850 (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: XYdx8h+H9b6K6eDMeKuODwl8VSZb6/5SKLvoaYNyL7Gge6MZEa+cCB+CZE/hmt1+CZeoTzP5TyhZe759npjWfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org In the probe function, devm_request_irq is now being used to automatically manage IRQ. It eliminates the need for manual IRQ freeing during removal. Signed-off-by: Frank Li Reviewed-by: Peng Fan --- drivers/dma/fsl-edma-main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index e40769666e39..16305bb9a2ef 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -216,17 +216,6 @@ fsl_edma2_irq_init(struct platform_device *pdev, return 0; } -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 { - devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma); - devm_free_irq(&pdev->dev, fsl_edma->errirq, fsl_edma); - } -} - static void fsl_disable_clocks(struct fsl_edma_engine *fsl_edma, int nr_clocks) { int i; @@ -427,7 +416,6 @@ static int fsl_edma_remove(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct fsl_edma_engine *fsl_edma = platform_get_drvdata(pdev); - fsl_edma_irq_exit(pdev, fsl_edma); fsl_edma_cleanup_vchan(&fsl_edma->dma_dev); of_dma_controller_free(np); dma_async_device_unregister(&fsl_edma->dma_dev); From patchwork Mon May 29 20:04:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258928 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31C23C7EE23 for ; Mon, 29 May 2023 20:05:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229567AbjE2UFg (ORCPT ); Mon, 29 May 2023 16:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229531AbjE2UFd (ORCPT ); Mon, 29 May 2023 16:05:33 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2044.outbound.protection.outlook.com [40.107.13.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06F8BED; Mon, 29 May 2023 13:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NJuO4QX9TUAqCtglIRrk/jzQqOP3ZJ/0ndfRFq+hUdH/JqjP9Vui68+sw5V5LoWcdLnlE8wDWcsY5qycNE2f/rZ2tfkdhN0iCVDZdmANTsBi1YlBXesb62T+J2L1ZqDdbaoCAqfdosfzJ167JGbTcQ/VFGt/4be1lis7jWEXWIpB8Xn90TycHNgW6DN1O9coL/VfuNMMKi2GOyc64VvD2Zxjge7zQi/4isDMd+RBVzEleOUH2hdF4avg7Ub3VkpzLoEA7YkmiblOTs0BalJnI7dVBcJFmQad84ZTnK89lJc1PCI91LFPzQKgA6Q4ua7ONp1km0otVQ+V8DbdoFNNQg== 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=Z5IwFxfjsLIuwWG9lLuAPQ9Ft0G9NDt16kTGP8ogl6Y=; b=XqtRzc+sZl+LZSNHNqud2xHYBtgy7J+8EBm6JyCuNAkRAPyR0HuHePe/RCJBlBag/y84nSiFvzptSHZfzRVOv9NS6BpUbth29L/153kUOsczpaj2QQPBU8CG+E3wUWGncwuxlWWmmqP+x3ZuaGweof3U+lsRTRlgYOxnyg30xhRmv7VFh52DyWrx2+FXtq9xtevg3Q1H8bnDpeVEYr/ihllU1ot1N8lsPL6lTHRBineFov8VFV+8C5m1ivuMFbA5OSSl8iN9R2OuMFoggAd5KM9/G2nsU5QCRiwHpGokhYjXJTRSQYlzTtYG6fXqgMXnfquovCd7cRszJl/i1RVPvw== 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=Z5IwFxfjsLIuwWG9lLuAPQ9Ft0G9NDt16kTGP8ogl6Y=; b=E2Xz48k0k7RY0xmIpqe91bL1x1jFVYZUsQ5ZS6Ehv/hbqWhtLDCdc9CnWuagFsgBr+c6hZhHiHg1iItzh7XdQa3D+E3x1AbFPnnCj74kiR8DWOo2uwdZQye6ZKDyElikqIaDWMrJY3slycLbmwN/+1JqsNaOAk7a6A4O9/pfPOE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:21 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:21 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 03/12] dmaengine: fsl-edma: transition from bool fields to bitmask flags in drvdata Date: Mon, 29 May 2023 16:04:44 -0400 Message-Id: <20230529200453.1423796-4-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 86251028-e8f6-4ed2-0b5a-08db608007ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kqK37TcrZceiVf/tlwJGIJw5sJlw2sciY777NgG86zm5ZgRbS0XT9xXW/ioT9s8XjcwsIseyG97rsHnklibDcJeinN3VGW16zyGQ6mtq1xleRCBxPhD1mA7lYKap2TL7ryodArOHPTRO22qillVoT7hSVNbEzzsLH1Rj0pFueP8EwgrLrAoCTyPs2JKPPIl0B3AKt55dbBuRW0n2WkQS0zqjM6uN6HrslHo0nD0sYiKi13EsBvGyqdltwRLn3OHLwQNI3d0rS+UxtTcKbXWaMnvM4gqC8h/KKzenoQ4G7u/gVoZmHYgEiW+KrNbeji3C/9oBxZIRqRSU9EQl0djBkDeN5Lt2F5OgQxcBfqMMwEN/uzuGgcPgHmHQYWvXS3KmqjFJqOwzCTpu4NEJlwp84thd+/TsQioe154+MIi4fTsDByUYnzzdvFe1EaDRojP2phY+D5jR5MRAc/KZ+ckkN+0H5ojr3z6HesfjSUj1GntzTMTMU798QPnDbdX413OASMVYF5cgC9WZGwFNTs67Gho4xw78U6VBWozGGzR74Cy/Jc7z+9YEIdu9Psa6zAaq+9sFzDlKXCOZ7HXCB+hLQs9akkZoFCJUc5ZHswSn+7uOahZg0UN5wB0nesweHLnk X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BPP2nmANrKXzFsWHEd2Ypgm4S6dEicfXTsJQpT1P8ivMoWGrG9SdfdwWziwhBXisVt+ZLg3e3Vm+/KxVgz9dqxQGRD5Q7oQNktbKPL7Mamk+yxRYhdmC3J4j/EB/2zvATXG174x8AReRR2RfBludjXGvIMF0Us7ZT2AJt08xKENXwYH14tifxHrHHTWOADbG+XzHm3LbhTcojQDqYaCeJ520Q+v3IDJoeYG2kWjBcwP9foZy1AODh0XttXWfKn/gMhQV77mq0X3gqvGRRIuvUFroPgBH4T64KAB5QbExjUxo5hovblueF03ce92MIv9n+J7no9sPNFKkZyOpbIKiesrgdNyXkklJ7LdM6UY5c/RGXcNodYTifXxBMy/AuFqoZNI1IVNDme6RbZ4CXED+IcG/kILW1W5KcxR5tpNeLKLiXeoF+4hsytjWojrKujMACfgSDQA+u02GsvyADtw8ZHg9wQ3+NNotz/J/ldpfgM3oAsErVPa+1LmZUnYQOGWzch8wlEIEIFW5oXl7n+ruW3wAZgzaOFgg6h6KysQVSxkGduXbb1ruIqHIRfXs3Wp9TbiHMt1PpHIzmM9FNaPak/SZbt8/hEvcZUHGUcu9w5uVsZtbwH7jgQV92lOali+pmwPklkKg+RRY5EHz2zPKJUttfxEkiQ3IC+w+LoHNpYj0VyVm+WEBYUx1H4fnjfhbYnha/BNYfHaLc87Ue7o+C1HTf7mCdDpoU95zFp9s66jFonuNrHiPpwzGOvpxta7jvCXZrm3ItmSpx91MxcHvPB/JDbK+s+kMFlDa0wfK0QWZonR/w2scZQIbn16TKk3w2alj0ggje9V7XmIYhW9V8CfAGKJHG/NtH4HFsQSc3/BkVbDnKH/uSWo4qEsJdlTra7BjIokGiP6cE7LduAqTW3bgsiucediRLTtKPlt+6nbsx4SLAqYlCh66qDhWk6xDez5VP//nuZ1gvaY04+zkBKXHjRtOJ7rgDSVkvmj/THeIjiJS7Hv62l1K6mQVXYdY5iWCYJZL+KDvWJDpS8IzstQIApHduHsUoGNdx+FXRl6YPHbGWKn9ohz1VvHJfy9j5v+Mf9i8hVXdzqKE00QAfL2d1EQSpeyuYh1tkGm1zePysfTs/XZ2j13goVXLtw3/1UlTJWTUBUye36DNC+2YaQx2AAlFB7if0+r+sMMjaPC7yQYCVx2I7nz/+l4VT97w1u9IiRQKViVgSCmLA4Lu/3Bzw6/5jQl47cCW8EDtq7vfMAu1rOPlPFRiO5PKYCR4EZ/y20SHWiKdh6U/UbnOONKml6vMd+QxoasQ6B4HSZY1sua0vhQo/Qx+G0PcHoGa62rDX5MJUfqrTTdX8zx9Qw8O/A//ExjayF7JNrT9gJUxM+1i4nXpnxqZDXIJsSMnY2hpbJOOnuscg63ZJr/d0yXizVbLaHzgcwnYP8Z0+vznyQMZrBYMKTpyjzq+HaLQNc3Vjgi6jMYon1VKGu7G31jpL7+pQhbnU8FcEMlyevc3zwUb1e0D74H3qwVH9J23kquyeMNITXnCpyDAXFgPiI4YnimpjxdsSiBCV7m28yhKyGmVK9146KzCxK/YJfaQ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86251028-e8f6-4ed2-0b5a-08db608007ef X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:21.0020 (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: fj6PhR7Eq8bhodmoFaMsY2Ega2c7Xnhuftxm+CJo3c6N00Aw+J78GV6DSHlGuqGBeSJwYA+PiXhiF21wECZgfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Replace individual bool fields with bitmask flags within drvdata. This will facilitate future extensions, making it easier to add more flags to accommodate new versions of the edma IP. Signed-off-by: Frank Li Reviewed-by: Peng Fan --- drivers/dma/fsl-edma-common.c | 2 +- drivers/dma/fsl-edma-common.h | 5 +++-- drivers/dma/fsl-edma-main.c | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index ce8d7c9eaf77..10dcc1435d37 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -114,7 +114,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, chans_per_mux = fsl_chan->edma->n_chans / dmamux_nr; ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux; - if (fsl_chan->edma->drvdata->mux_swap) + if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_MUX_SWAP) ch_off += endian_diff[ch_off % 4]; muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux]; diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 004ec4a6bc86..db137a8c558d 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -144,11 +144,12 @@ enum edma_version { v3, /* 32ch, i.mx7ulp */ }; +#define FSL_EDMA_DRV_HAS_DMACLK BIT(0) +#define FSL_EDMA_DRV_MUX_SWAP BIT(1) struct fsl_edma_drvdata { enum edma_version version; u32 dmamuxs; - bool has_dmaclk; - bool mux_swap; + u32 flags; int (*setup_irq)(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma); }; diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 16305bb9a2ef..f5cf95d185f8 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -233,14 +233,14 @@ static struct fsl_edma_drvdata vf610_data = { static struct fsl_edma_drvdata ls1028a_data = { .version = v1, .dmamuxs = DMAMUX_NR, - .mux_swap = true, + .flags = FSL_EDMA_DRV_MUX_SWAP, .setup_irq = fsl_edma_irq_init, }; static struct fsl_edma_drvdata imx7ulp_data = { .version = v3, .dmamuxs = 1, - .has_dmaclk = true, + .flags = FSL_EDMA_DRV_HAS_DMACLK, .setup_irq = fsl_edma2_irq_init, }; @@ -293,7 +293,7 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_edma_setup_regs(fsl_edma); regs = &fsl_edma->regs; - if (drvdata->has_dmaclk) { + if (drvdata->flags & FSL_EDMA_DRV_HAS_DMACLK) { fsl_edma->dmaclk = devm_clk_get(&pdev->dev, "dma"); if (IS_ERR(fsl_edma->dmaclk)) { dev_err(&pdev->dev, "Missing DMA block clock.\n"); From patchwork Mon May 29 20:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258929 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17D3FC77B7E for ; Mon, 29 May 2023 20:05:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbjE2UFt (ORCPT ); Mon, 29 May 2023 16:05:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229836AbjE2UFg (ORCPT ); Mon, 29 May 2023 16:05:36 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2044.outbound.protection.outlook.com [40.107.13.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21640124; Mon, 29 May 2023 13:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPA+TXp8g1XnIwmjr5ikwgzAD/KzQNTYu/UQfYL1ysAq/dbNgTbeRWC1LmqK/zzb3pXtZ/B1kO51KWW3lbwMdzl9wwgCz7CmXcRdusC5b8pNomokkoEQHMj4nC6I31gjEk+TrX2PITDnj5tNxxd+meU8D8SmtGI/lQfWNaQwL/KL1t0U4OVrllPTV9Uf6lSgf88O7WZA0GtAeXKqBdqIxNLIcxnKxA6CtIDNJT+l0nFsk+uPt0Z7mhbOUfzzcai6OhBxVmnFMQctmZGk5AYgbDtms22dV3QKwyzf4f7+xW+HTRlumKOxfT/cHvMEu1UD0Vzt2+Yv5cVXGbor7P7aHQ== 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=ouCBlwm7fIzHEcTW7UBupyDePR7cnWUmtikSOmu98+k=; b=RNAfK1xkvMLkjjuhzIIL2lglWv51wlMYkzRxAjdg+ce2p44CIKOGqU+XS1NKQSeoazeqLcQduaMFrA7bdbIMERRl6HItVVI0hcte5w5AY8sconCDHCCqVZE3TD4zG5evseAj+p4IEZxCsIlFXpzpEMmTmdKZPVHxa+h/Km6T5i4ET5JgcbMP8FPhKROMnZhuD/vQnlpRfF4b7omDH0UD1WIinOAlYZHQYmnBwkQgm7Q2GVgI6pS+v0eUoyT0cBHscU7FWLKtInQq9ZkIkRXFPQE7OTVkoiowPmMnZSc1hwnr4bD3ATC+TFVjXs3w/Kz3aCT6FynmaiLHplwzhY43tg== 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=ouCBlwm7fIzHEcTW7UBupyDePR7cnWUmtikSOmu98+k=; b=SQ+0zEXiSmKVWiZT6DtSgRL6Ab97RU6l0pZKwIPU+n31I4wA/A9MynMl/382ppYNudrwCW5Hp82cUCb8/O3yzDo88DNp/18af/UidIikllTa0j0CTaUah3egzRrByHNVmn6w7EAF1SuCX38/K+fHk9SmJfBPRwlmBML8iLVqDGo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:24 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:24 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 04/12] dmaengine: fsl-edma: remove v3 from enum edma_version Date: Mon, 29 May 2023 16:04:45 -0400 Message-Id: <20230529200453.1423796-5-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 784fbf76-cff2-4e75-9f5f-08db608009b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r+XSaWnWXDbuGErEckgeOCnqBzhEoF2Fx0XvYgXvfpyr+2ZSR/0ejqCpM9PjR6Qu1PCXi/LBgb5Vz7/n51CLOq5raxn0iQ6vnsC2uBraq3ZUBjUGAOYnT/HVblvCtVaa7n9KJ4QbkbXW13857EoPDCte2cFNacMxEDM1JFvShxbTulvW2AG13/4gATSwdSOWpIUVuO7sNrIzjUAJszdoqxhD3tuVw4tncT62Vmr8u3yJQn57cph+uIScDOEVVaNzefSMTz1BigmVUJYwzd8AnSeIHNV6QCVfcHMhHm1NWkSt+mgSPEYZjpyWNff+pdq4lFprbCFtePtUq+LuOFtCP5vfpJBIhICZphEVaBWsof7UsGoQiLPFSxesQFutJY9R14HOEAYl5AePAvj3p6qrMGC4PajYpPc5HcIKaXhM36h+xnAdTVZVImv35rxtGDcCgzf5LRsrvdCqXxhyOF+V4r0fxKdswVBJ3Cs3F4RLu7EnH7A9448dXiEUIKp/Jy4U5+cXrbwawDNzG2uNBFBfb8IkiowdqMTAzH/RHZYjvwRzki4TEEhap6rWFBeYafZEzm1XPfywU9M52huGx37gDCH5kElnJVRlPVjt9AxIuVQ7oYQzTS7R9sdeqAjne4Ch X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KIU/HJ1X4AYiA1MNsBLO2iqZ7jtR8Z9/3Sof/9Qn0LtpnUEa3G4yRo5AxQT5g+Y2dUXe44P7/vpCi25uCrLqX7mM+3WAGEvBEO733Uk03rwHzxAzPBgIgeDR630EfNBh1294jq/h+psO+XDJJRMpniN4igYvbKnnQL2oh3MzTMEQF478Qssedrzv6nPkLk4BT/mYE9ei1d8TXGphTCfROOgi4qyAPtTYNdvEBhZsLJjUzNNouvY86+Bi6nMUPfdsKgNpkPj6ujuXbnqDIC/12YS8JxpeHuf3w0zl9k++TbjXNXgpC1chOA5FLLz1h2uEPHDNPPiYgJtjaZNpJ4eshZoTGwtvdM4wWHtVnZV79R5V38cbtpPeVRQD8N1zJgg0IwSj/qkYvbkrhVfdExPRX8Ry94wlh2jrS31AlWTaH0xoTaWiH20GcCU5BIFbSlzwE2eShlra0iSB9lr9sHq+weXpEFArm3KsLWaiWZQ2tnD1dq5m2xUL9Xlj8yPe731EERVwkKHuXPCIrf+rWUnxD2smSOkRTc2nSwU1huW1qh8qAVGfZNqYelznNhViAcThGOcs5D4nv/URccBDXXiKPZYF4karx7FlAnU08cMo4CB4QXQ6KK5JzN2G/ZWNhv3VVeJI9okBPrvw3FaTATlhVKKhNrKAhi0mKc7AXHO3rnFBeHCDjIAbKcLkdCTgVDBE8aEKClWWJeSGKjw2oZzWOucRdtHr03cPuHm68AjCBcGREcRMon1MTqKEgtNXm5QD1wAafxiW4Z5TK9VivA+jsyomVkrdjS+7HzPdEMSh9d/Tdqo2n9Wk/0xj5aF4BJ9SmkUECOAXNARM9hrEW26bhm9LJws8cMUfEeNtmgPlgNwdg5tQkZTB6TQazq9v1bdyv5yDRhyg8e6YvutYs9g3rVPv5O+sdyTLv4mUZN+5qb19eTDHH6+o8tHAzFyzuORErGC0l44JCMpYVKvL2gYQO52hSESy8EV1vsqzLCydXY6axJOjyDK1hIauuDtMLFXc1cWP1plNj0FL05ZIxjq9FOJVltmsJdEweLwl80/T9srulEC2HOEcl9nJI6ZxsBIl2l8LxK9iG6ll/k1kgwG0M/9ET7ghymsob4kLrK3W36FXQxCQMBG46N4O8TXO4yIZ5m6HuKe59hLTctBWhaOTJ6mDBE3TJr5KOKlJF33gB+vHEmgZezfqFtmQzcIvfF3IsXyRFpfOgveDDpyqX63nfJpYDQB1LaNJW0/HhAn72LkLTh8VfcceY/nzXkhzhTyVpjMPuk4a2Iqhu+0T7b+WtMP1HJZDJKkXPAiasoANTJjJVEdXBnWeiSrRX1p2m4whAkMxAIh1QSg+5TfyR5KMirYqYbgQDcxURDTW6ZubFb7tL1kj3PFvuxMl7TcwVxER5T4qL23cY6FY6mj0586v0Jhpf6KQbkYGbYEgTAyddP1gloXieVJkEJCuJa2NIhy/1c04a1L6Tft/5G+cazbrKbIyHXt8D2tYzzIrC3l/JQzcBfniDe9twZaJF5xyrMY4Ue17R1JV+25tKXVQANJ1+GR93uFgU2CbGWrKXhY5edKhns4iRFaaK39DPJIyNXSb X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 784fbf76-cff2-4e75-9f5f-08db608009b1 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:24.0286 (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: TBL1KdU5h84u/0gu/Px+HRIq3TuncDxy/9Gb8Lb+GSTGoa1Wnatvf0cFucxJlfQsHjPu47Kmjpec3AB81nJvUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org The new IP of edma refers to version 3 in the hardware documentation. However, the presence of "v3" in the code is merely a software indication to differentiate between certain chips. To prevent confusion in the future, this commit removes "v3" from the enum edma_version. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 2 +- drivers/dma/fsl-edma-common.h | 2 +- drivers/dma/fsl-edma-main.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index 10dcc1435d37..e5c7497c1ff3 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -120,7 +120,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux]; slot = EDMAMUX_CHCFG_SOURCE(slot); - if (fsl_chan->edma->drvdata->version == v3) + if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_CONFIG32) mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable); else mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable); diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index db137a8c558d..2f13e687a721 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -141,11 +141,11 @@ struct fsl_edma_desc { enum edma_version { v1, /* 32ch, Vybrid, mpc57x, etc */ v2, /* 64ch Coldfire */ - v3, /* 32ch, i.mx7ulp */ }; #define FSL_EDMA_DRV_HAS_DMACLK BIT(0) #define FSL_EDMA_DRV_MUX_SWAP BIT(1) +#define FSL_EDMA_DRV_CONFIG32 BIT(2) struct fsl_edma_drvdata { enum edma_version version; u32 dmamuxs; diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index f5cf95d185f8..31531b8bde78 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -238,9 +238,9 @@ static struct fsl_edma_drvdata ls1028a_data = { }; static struct fsl_edma_drvdata imx7ulp_data = { - .version = v3, + .version = v1, .dmamuxs = 1, - .flags = FSL_EDMA_DRV_HAS_DMACLK, + .flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_CONFIG32, .setup_irq = fsl_edma2_irq_init, }; From patchwork Mon May 29 20:04:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258930 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0818C77B7E for ; Mon, 29 May 2023 20:06:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229531AbjE2UGI (ORCPT ); Mon, 29 May 2023 16:06:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229536AbjE2UGH (ORCPT ); Mon, 29 May 2023 16:06:07 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2044.outbound.protection.outlook.com [40.107.13.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD9A7F4; Mon, 29 May 2023 13:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n2uZR2cA+Ak0rpxz0I5lVZT07vLWFvOZ5as53qfsevH7aeDATCFq7y+1OLazJd0ToAwBjjzCvcGfeTH64FEWc9GD05xtQx6LD572pnjiRdE9Qv2ytrJe0zx5pEjnizFEFW0BsHP3OHUVMx/87Ld8NpfufwapQZyp5qpokbjcR7Jo5yqqh4ClDAD+8PC6pP1ipIxZYYCcMKLXQKziYLo8suXHVTlE5UGT/TeReND/ehoJ6DhVm7oSXxupuX/qArq4wmnbCFXvc8jYO6ndIEX3UelQ4Z0iTBKCS6Ge4WPSaDBh9/bFZIHhYefXQOkk4pylqDlI3WI8jeG4n/bU80e85A== 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=msrt5RHHs6IHX/f7JbgffOTIryNu0J13mXMJS9oOE4A=; b=QbzTL+q47Jt4eoIqoyaEQlRNMD250pW/tnIU43Y8J9lHjDWYQkV12acHim2pK9PeDf+tfVeIr9yzPcD/PSxp7C+a96d6Mgsuq4cor5Doz4GtedgQ/Sp6ODdwjz9rz80TcbZUAVKQaDeX+bsqF+zLEnpgqhVuUsXBMksMdNFMTeRcXF5W9oqXJ/9QurzALU40+i0tGshttqglEahcmGFv1C91z6ntH3/JzXpvjwQYryYqzmHk9mDjpYZwbAIcqYMX7VT6fxKKXFB5hoNRsHmGFd6AC3ngBxdKPHuh4N0aYD6SYHbTMqsDXvzKArJ98qinpld+zPpl5kn2GvHtORpJ6Q== 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=msrt5RHHs6IHX/f7JbgffOTIryNu0J13mXMJS9oOE4A=; b=NuEoz7GOku1LRwgFfEfNXhLTVGZEYmbpZpFQkekATcx+bjyLXVYvAEUGF+f8YTOjoMZxz+r/pqgrmi3uV5U+M7cRsJArmiH7xvl5TCXWsBguTbIdST9oblrl5fJ7+ZHE9mIKWcI+8tj1haYxe/5k/wNOevhW8Fhe55BPjmZIOyw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:27 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:27 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 05/12] dmaengine: fsl-edma: move common IRQ handler to common.c Date: Mon, 29 May 2023 16:04:46 -0400 Message-Id: <20230529200453.1423796-6-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 0567357e-1c7c-4131-e38c-08db60800b84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0vkEMBs81wWdr04XI6AXmW+wl7G3yN7Nq5f7t8MUfeMeXbIde3tGyv2C3KiyBuYOvcxGrZ1JUB0IGQ//TxO4xgoq6YdBtGtdI3K9fXNwUufj0OpbUKcjYC6fZ4O/cl9pxS5sUYFIqNxtuG6TC/+UctkMDnKm0qS28OinvttohdzgdugXpi8GEqXhAKbyqVeOUInpPb5bqThTGYJmwLfm8BD1qV6uzhzhJjmF9YbN4UCnEEKq31gTFlXnU+U5bAe7zMqh/Tt5e6/goJ9eq/zeWvVGXRXuZponWZehbjJUUzZcwZUH4lxBZDHGuMb5TLWmJXz9ePNJCQTmR1O1wOrW3ROhAf0lhmfjPcr+3QAauHH0BuxhaEEBzq6I76rvuxkhuw+xmIQHMtpiLqCKs/b95fOYSY+bUqVJqq2G6Aim9Z5TIxdboybM1vvvzPZn/mw+CjZ+IJRODLX2BT3nBX2/yWa8CcLvlPK1QPu9q/fXSqyYX/LQk0oRThq40Xp4u9QbXU0wrknNFwkXNpxfwUvxWkvpfTEMjZPyTV2Q2pPzNl9MIteT3lqHPXADs43xUydDvBqMekJeIvzlxg5OwFETSpyglY1V5T7168T60pGXb7p0XYrqkOCjoMoF0Jb9BrC0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 218cP+w7Mbkan/cWw4You4P2WEpHyf4EhYtQAKhEcZ438TXEyj0EA9krKdv/uEo3cHZmdEyao6EymrNhYVG8v0HyBvQRiFngIwSnLrS+bW+8z9j86fVSVQpkTnahLBZXlE7xFBqpDTwtgHzJ7syatdzxQ1LtGCOVbmRHNV6LkuAH3hqaY/HxcTJcIX4zVaO+9umH03fZYamXmYYPU8nyp3a7mUx982XLqdAbxTE52zeRF5x+CaAvcNj9ikNFJhqqVD8hZBiocUTqKlkf1ddltQ64qTew2cBy9WFpyhQu4MrBdj7whDbTptAQvs2xQdzCbBYTNihRlr4meQSQ8Y2Jl19kU7/1zT2ektvyF83c4ckSARXE14WLvyFIzxs4CRjJCOrgJwaowuNIMO6+yPY0esf6fAspenoyJUQ6herIf+Xgz8YK/QwLKb0WmyXSyKO7K2ne8OBhbNb5Dy7TgsFx2GR1cqNdFmgvXjlSZ/byzqluCAolr4SQ99B+FmZ7svquaHbEPKPyv5UlMI4peE5cWUefpA3m03Gyhiv4mM9XkndMuYOWiZfoj0ZEexfiv6dO0N6wHnvOY0Z4t1iyIqfUDRb7/TxUM+xD1vRYtS2m9eMh23xGQGDKwtvpvNfQo8XCj27g7PLPXwSeBa3SFw2/fegbeYgG23mEJUMDpKHx6LT/AMQvc/L/Px3/LBUna2XBN9PW57eMKrltKdm6qiihara+rxm04KLrw5z+cUfynghB2bqVlJQD6f4X2m7j//ShEXqZLOufj4sPTDJj9T6qYEjT7bo8OG3s/Tsgd8rjLXaIsPQ77vuOTTEemc1JxiV6x1JSWzRiYOsQJPcBl2ZempQgYtOFbnF4YG7n0CKj0SM3xbFDKFwc31/3oEns189cHIFtTFE1PWsto9Dbz9qG1cIsOv3uAF4fGwCzEAFPRyUwgpciNDumRWiF8VRzazrCdfKnLTJ4204og06vIz+Vq5HuVYF4PKtTNcIfpyAHn2MOqKnfAOD0DnzR1FYCZpA37mzFyPMUaQUi0eJORzHy48BpRAyEayRou5f4mdrUR4Q0rHaAxVG+Z4VEoVttEc+7/zZJRyJ/TpkgTgQKYdfinLsobVbQfkVcpURhssxFIDQLqD3u30nSzYnk3BKUvyEpMu+7C4ay9PD8OPyRJPqZVCDnBnKT2u6vwWGskEhq68rDfud4AcY8HgQJtQdzI7+gG3fu/5/b3K7sQAjkH5cgaqwPpVjcWLF8vhj/aaVUabMNGB5vZkFe3jUIVTAeZ2tNmbXcFJUwXh0hleWAXKbTTfHAB3MMG9a2D1XOBvRlY6kz8tj8UikeCXiG8QrhzxDWbLesrCrriupwx7kdy7WZ/uU1pzKSQaAJ3A4574qOaLEI3hMTGPXnkO8BPiB96up/rs6tyr1lSaj9WrvpB2MmqwpZFc2/Z05G5X+XBb/yMkWhTvhQhvyg5sfethkIeuNNxOLjFDAfATq0ghDaqLVvTDyDJ2/uHW/1qRjf8kf86Ifm9lDOhEJEjnWtG/AS2WMuhnlIiAzOqLAqdizfPH00nS+LY+wF01rb+nduBGVYCHNUnevhf3F5jeHptXK1NE/b X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0567357e-1c7c-4131-e38c-08db60800b84 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:27.0322 (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: /N9vSLKP6CiOeyFu7KwtmZISncXOrzBq6zCfPyYDUYBvJgKD6/52m0sGa4pLqMkfzIjAo8Cpi/spVZlvqmJ1hA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Move the common part of IRQ handler from fsl-edma-main.c and mcf-edma-main.c to fsl-edma-common.c. This eliminates redundant code, as the both files contains mostly identical code. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 26 ++++++++++++++++++++++++++ drivers/dma/fsl-edma-common.h | 7 +++++++ drivers/dma/fsl-edma-main.c | 30 ++---------------------------- drivers/dma/mcf-edma-main.c | 30 ++---------------------------- 4 files changed, 37 insertions(+), 56 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index e5c7497c1ff3..839471c42758 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -42,6 +42,32 @@ #define EDMA_TCD 0x1000 +void fsl_edma_tx_chan_handler(struct fsl_edma_chan *fsl_chan) +{ + spin_lock(&fsl_chan->vchan.lock); + + if (!fsl_chan->edesc) { + /* terminate_all called before */ + spin_unlock(&fsl_chan->vchan.lock); + return; + } + + if (!fsl_chan->edesc->iscyclic) { + list_del(&fsl_chan->edesc->vdesc.node); + vchan_cookie_complete(&fsl_chan->edesc->vdesc); + fsl_chan->edesc = NULL; + fsl_chan->status = DMA_COMPLETE; + fsl_chan->idle = true; + } else { + vchan_cyclic_callback(&fsl_chan->edesc->vdesc); + } + + if (!fsl_chan->edesc) + fsl_edma_xfer_desc(fsl_chan); + + spin_unlock(&fsl_chan->vchan.lock); +} + static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan) { struct edma_regs *regs = &fsl_chan->edma->regs; diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 2f13e687a721..71e19e20f1cb 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -223,6 +223,13 @@ static inline struct fsl_edma_desc *to_fsl_edma_desc(struct virt_dma_desc *vd) return container_of(vd, struct fsl_edma_desc, vdesc); } +static inline void fsl_edma_err_chan_handler(struct fsl_edma_chan *fsl_chan) +{ + fsl_chan->status = DMA_ERROR; + fsl_chan->idle = true; +} + +void fsl_edma_tx_chan_handler(struct fsl_edma_chan *fsl_chan); void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan); void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, unsigned int slot, bool enable); diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 31531b8bde78..9c0b6fb4cb8f 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -33,7 +33,6 @@ static irqreturn_t fsl_edma_tx_handler(int irq, void *dev_id) struct fsl_edma_engine *fsl_edma = dev_id; unsigned int intr, ch; struct edma_regs *regs = &fsl_edma->regs; - struct fsl_edma_chan *fsl_chan; intr = edma_readl(fsl_edma, regs->intl); if (!intr) @@ -42,31 +41,7 @@ static irqreturn_t fsl_edma_tx_handler(int irq, void *dev_id) for (ch = 0; ch < fsl_edma->n_chans; ch++) { if (intr & (0x1 << ch)) { edma_writeb(fsl_edma, EDMA_CINT_CINT(ch), regs->cint); - - fsl_chan = &fsl_edma->chans[ch]; - - spin_lock(&fsl_chan->vchan.lock); - - if (!fsl_chan->edesc) { - /* terminate_all called before */ - spin_unlock(&fsl_chan->vchan.lock); - continue; - } - - if (!fsl_chan->edesc->iscyclic) { - list_del(&fsl_chan->edesc->vdesc.node); - vchan_cookie_complete(&fsl_chan->edesc->vdesc); - fsl_chan->edesc = NULL; - fsl_chan->status = DMA_COMPLETE; - fsl_chan->idle = true; - } else { - vchan_cyclic_callback(&fsl_chan->edesc->vdesc); - } - - if (!fsl_chan->edesc) - fsl_edma_xfer_desc(fsl_chan); - - spin_unlock(&fsl_chan->vchan.lock); + fsl_edma_tx_chan_handler(&fsl_edma->chans[ch]); } } return IRQ_HANDLED; @@ -86,8 +61,7 @@ static irqreturn_t fsl_edma_err_handler(int irq, void *dev_id) if (err & (0x1 << ch)) { fsl_edma_disable_request(&fsl_edma->chans[ch]); edma_writeb(fsl_edma, EDMA_CERR_CERR(ch), regs->cerr); - fsl_edma->chans[ch].status = DMA_ERROR; - fsl_edma->chans[ch].idle = true; + fsl_edma_err_chan_handler(&fsl_edma->chans[ch]); } } return IRQ_HANDLED; diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c index ebd8733f72ad..af1b0e8a3021 100644 --- a/drivers/dma/mcf-edma-main.c +++ b/drivers/dma/mcf-edma-main.c @@ -19,7 +19,6 @@ static irqreturn_t mcf_edma_tx_handler(int irq, void *dev_id) struct fsl_edma_engine *mcf_edma = dev_id; struct edma_regs *regs = &mcf_edma->regs; unsigned int ch; - struct fsl_edma_chan *mcf_chan; u64 intmap; intmap = ioread32(regs->inth); @@ -31,31 +30,7 @@ static irqreturn_t mcf_edma_tx_handler(int irq, void *dev_id) for (ch = 0; ch < mcf_edma->n_chans; ch++) { if (intmap & BIT(ch)) { iowrite8(EDMA_MASK_CH(ch), regs->cint); - - mcf_chan = &mcf_edma->chans[ch]; - - spin_lock(&mcf_chan->vchan.lock); - - if (!mcf_chan->edesc) { - /* terminate_all called before */ - spin_unlock(&mcf_chan->vchan.lock); - continue; - } - - if (!mcf_chan->edesc->iscyclic) { - list_del(&mcf_chan->edesc->vdesc.node); - vchan_cookie_complete(&mcf_chan->edesc->vdesc); - mcf_chan->edesc = NULL; - mcf_chan->status = DMA_COMPLETE; - mcf_chan->idle = true; - } else { - vchan_cyclic_callback(&mcf_chan->edesc->vdesc); - } - - if (!mcf_chan->edesc) - fsl_edma_xfer_desc(mcf_chan); - - spin_unlock(&mcf_chan->vchan.lock); + fsl_edma_tx_chan_handler(&mcf_edma->chans[ch]); } } @@ -76,8 +51,7 @@ static irqreturn_t mcf_edma_err_handler(int irq, void *dev_id) if (err & BIT(ch)) { fsl_edma_disable_request(&mcf_edma->chans[ch]); iowrite8(EDMA_CERR_CERR(ch), regs->cerr); - mcf_edma->chans[ch].status = DMA_ERROR; - mcf_edma->chans[ch].idle = true; + fsl_edma_err_chan_handler(&mcf_edma->chans[ch]); } } From patchwork Mon May 29 20:04:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258932 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92093C77B7E for ; Mon, 29 May 2023 20:06:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229557AbjE2UGr (ORCPT ); Mon, 29 May 2023 16:06:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbjE2UGp (ORCPT ); Mon, 29 May 2023 16:06:45 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2042.outbound.protection.outlook.com [40.107.13.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB3DDF9; Mon, 29 May 2023 13:06:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dhomHdxFmKRFAoWeF2Q3/f6fxe7kEvfhEi3KIDXIrfbv6aIpyQeL0NgX5SCv1dqLY6PAxxtB4Ujh7sN7vRc6LyXa0WGzCFWtDeorhR7klXUp0cyzlrwJhwqQKjp6M0pNiFufwkuhxGT2sV9Z7SRZwSXEjcvBOTejSDfeOnO+bPosbD95jQ2IAoVhsjqSxmwUuhsuAUUQwAkPHH/IX4Z29iG0Qa2zukHgdb/ADVIQAogS8GwCq2AFyRKiXZaxJ4EBeTqq2VjiYi1fkE/IkeJ74sGc/cqVgIF0cvEJYZNjury5bxNgmw1p6IKxuNZEtidXwAxcxWIicdhu2q7KRyBjZA== 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=RYC6iFkeYIBf1sHD4vzUmRzUWEV8BcYvdT86nMRXy30=; b=C1Ma3kxY888SCnswEpBstWuRF3w30SIgop9vFvSNjfiMugI/y3BkDAjLv79nQ/Dqqa36PmdvvQsKtUVO0411R7hdpR7lpWfXJq3d5QWQr3gTuUP2jru8jjxuiwz5DgMd21N2UpBrrxn6IKSa6uEMDT/lc8GwJx/2G9QvM5Klx8HNJkhX7YwjI0DVqBZOtlXIjTISFQsWD2OHqs7flYSD1hGuxYG4w2jrn8hRb+r7EdA83kdc2+7yVj+DMO4q5KbkZfyqtfMdF1ZtXh0pL8E8TK4fXFYVQLYrNZ+QSeg8cSjRW3WfTnt5eV7xooXyhpw2f/abSeLxXykj1VyXo6LbAg== 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=RYC6iFkeYIBf1sHD4vzUmRzUWEV8BcYvdT86nMRXy30=; b=oV/eSRF+P4tn6YnVUhKaZ9uExt+GfNASP9IX0BLuJFHLGJsdnA0Pwrs+qBc89VUx5EUFsf2FS9YWXbCeiMqYLNjsXLs87eH+SyOlRl4WZNcOk+gQ4SpmsSIoid3twSRJAR/M6uY42kiUBj5ZHaPiSMNsXULwGbfcz0gY7Cgt0g0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:30 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:30 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 06/12] dmaengine: fsl-edma: simply ATTR_DSIZE and ATTR_SSIZE by using ffs() Date: Mon, 29 May 2023 16:04:47 -0400 Message-Id: <20230529200453.1423796-7-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d09193a-8fd0-48b9-c565-08db60800d55 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +pr/HA9TuCBDXxknmXvwNz3fd5ncy/DHTWRQ3q8Joek1QTO3E02viPpgiaSgrNb5B3jlG3fmjuaU9HH9cQf0hGDmdIudlqwUTEmOcjOeo6x9Yig/b/Zz9qVr2iqpN/P/Jj0ThMbWtyEs/DHMDui4Di8ldVLUyf9v5q4mPs0q5W7L2CN8CiiTr93GVngIuctbnwVum8KhpgoraInU/Et07dg8IkdTfqTZauqt3y0qkxxJAE71L63X2CCjzn+iA5NsTIcBxiDtLrwku91mY7MxJjGByQv4NlB+EyrluvgE23RpYsdCH9egV43aHXruzWQEY2ebdmHUWfQovhql3404ShbAlwlP0cq8ewgMlv4mK5B9wbtVjFbFrJg8fqSGlGu/pgUDlhohJh4HU/nEF+esjUMkAWXIQNf7MQ8o8yIf5tLga3MDkbKsl2h3WHjVqm6mxKMvSIATsPD7ezYL8KVmyY9eR0W+Nx03i0RdAyj9Z2wco/qItXnyEjSWBDIYkiq6xqZI5fv6uT5H+6EaFXNy8D9sNr2DjflHrHB7/xV8R5+PdMctrj2eWIiB3SLHwNdS3jC+qixrYy3lDMoc27Op64btWLfrPLTM4VseACnM7Z2Wq90yMmiE/N+FWn6+8LBQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yQlGzrPhQlD8q0OHS5t9+AyaUcHODS5P6RGv/7ijcmq+YNgQ7eTssX2PmsXGXO3HgqjXLnpxNfVq9+cAddswhL6smT1oAyqvLnO/z3KAZ3ctQTiDI9tiMtc1ck+fnN6FxaV4JqyRH3Bm0vDRoSTdL0kXOb94kM5RXNM7t1hx9puszGDFOdYI/cSmp+AX8H3iCLtYaX/aa4v/iBQfNiIyc7631wfKd+KEr5kAALmkKuYCYGQSc8XasRlkmI+26g19hyVOoKQVD+YOVTXy+0QyNGm8EJiKDJDIuxzR0Xpv6euH0xpdxsvSmOSnoRgkF9++pMu55gwuI6Xs3AiaUU0lA4tdkW8uWns0fciwkSacuZ9PVZpAqJcQ6KXUy+X2lfpCIQlJLd12CBSZCvOhWMEKasnGmR4Rz4+zbf2ZBLF4AsMSfKn6h0V5Zd7AaSNaXcJ6+V5vWrJSTJJQDLAIZdsxf1m2qUkYfUpDNLihNEazZkmceJu37tQiTvJVnXyp8I19dKzinbgdOLD9Fq8BlYGlfLgPJ2R6yKfrRxg05gAQoqG1DlvJ5DIw8PuIrBmFVp0/eMHZBuqlF/QMSNCvE040Z5kGs2ZNBmpqRBCgOwsq4ZX0cjvMh1NQX6ulo2jlX+0vgyv+dz2MohEBJswm1HQ4vWijZz1uy3HObF73/SMPfyjYEz1L33L4r/WjazLOfHMgOvEu4P966WdTKb9AzlE2polsQM7TZTQ05R0KNQSy9tou3TZe1KMiwo0q664pTwrCPZzZMSj8VIa2/80kEiciWB943y8fvp4EV19OuR9gD9E4Ilqjhaf0uVxXjIDb9m4jDFCraJa41f28LLFFLCtrcWiXvcAomzah78pm0JkoE70Zw+zevfgOSM3p2GVW7jRsxbNJebLVsoYg+1PC9miAOeUIIXip2wZCvH592yHUc7Y8/C5BvzPL4oFBGveEfflUNGy45FAiNlEZ/Nro/1IxGn3Ldbt4HEXbLWGFxMCLxui9czjoXUZNnueJRLO9dDBt7epf8KDwSBFdz2rVEPzYXiQcNX60g9oo+h83A4LdE1FL1fX46V5z+Sag8CNmEZ9cHymUbY2JA9sgLQ7KV6ux2gcWEnuDroYqy9LxJ7tRf2WWq7lZXwNlWVi8Pt8XI1Zyf/VQn6u02QHj58Pwi0PjLaxz3cb0jwUAsCNOCBwJI6O1jX57HwdqSA3vU6aQQk35scsCXTIvt8EYdwhhIV8apETRxfoBUnmyIRid7tLdUeXN5Ccuz0GRatzFlnZPlhnmvEaDDQ9HtfRpH8F737T6THHS3Bmpitk9ftr1zRXp3hT33PvoNsqpx7c8x0K0yisRk3e4075u/19s0bDN2QZDa67LwBb88TIfzZnv3zNc5AiEMKVvFONw5ehRo4F7BD3l/aQYNj9/6iObbH7rrFt5GXAKTwsQjdGru2CpljB1HnmN/XEgO0JohponIpXczJkDIRmp0gRkjpbjd++d1WdvVuz/Ub200iMIDvvE3x2vBNaUKO7JPkZhKqpT+eMCXAxSLAf8ZX0atFgzCrazcTyIWtWfISEHk18n1K8BVrJlxoxqz2/Ae+Q29yOW2X2Mtqkc X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d09193a-8fd0-48b9-c565-08db60800d55 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:30.0558 (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: u+O9oNlNSyBzUF7zb3vwqAPra6D8Ni1Cg/nGxlPs2j5qyvSo/YawnQHvyoENHXD9B14zW2vCsJDQitopBxbheA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Removes all ATTR_DSIZE_*BIT(BYTE) and ATTR_SSIZE_*BIT(BYTE) definitions in edma. Uses ffs() instead, as it gives identical results. This simplifies the code and avoids adding more similar definitions in future V3 version. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 21 ++++++++------------- drivers/dma/fsl-edma-common.h | 10 ---------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index 839471c42758..659bef4a3b23 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -154,18 +154,13 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, static unsigned int fsl_edma_get_tcd_attr(enum dma_slave_buswidth addr_width) { - switch (addr_width) { - case 1: - return EDMA_TCD_ATTR_SSIZE_8BIT | EDMA_TCD_ATTR_DSIZE_8BIT; - case 2: - return EDMA_TCD_ATTR_SSIZE_16BIT | EDMA_TCD_ATTR_DSIZE_16BIT; - case 4: - return EDMA_TCD_ATTR_SSIZE_32BIT | EDMA_TCD_ATTR_DSIZE_32BIT; - case 8: - return EDMA_TCD_ATTR_SSIZE_64BIT | EDMA_TCD_ATTR_DSIZE_64BIT; - default: - return EDMA_TCD_ATTR_SSIZE_32BIT | EDMA_TCD_ATTR_DSIZE_32BIT; - } + u32 val; + + if (addr_width == DMA_SLAVE_BUSWIDTH_UNDEFINED) + addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + + val = ffs(addr_width) - 1; + return val | (val << 8); } void fsl_edma_free_desc(struct virt_dma_desc *vdesc) @@ -623,7 +618,7 @@ struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan, /* To match with copy_align and max_seg_size so 1 tcd is enough */ fsl_edma_fill_tcd(fsl_desc->tcd[0].vtcd, dma_src, dma_dst, - EDMA_TCD_ATTR_SSIZE_32BYTE | EDMA_TCD_ATTR_DSIZE_32BYTE, + fsl_edma_get_tcd_attr(DMA_SLAVE_BUSWIDTH_32_BYTES), 32, len, 0, 1, 1, 32, 0, true, true, false); return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags); diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 71e19e20f1cb..3991956dbc11 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -29,16 +29,6 @@ #define EDMA_TCD_ATTR_DMOD(x) (((x) & GENMASK(4, 0)) << 3) #define EDMA_TCD_ATTR_SSIZE(x) (((x) & GENMASK(2, 0)) << 8) #define EDMA_TCD_ATTR_SMOD(x) (((x) & GENMASK(4, 0)) << 11) -#define EDMA_TCD_ATTR_DSIZE_8BIT 0 -#define EDMA_TCD_ATTR_DSIZE_16BIT BIT(0) -#define EDMA_TCD_ATTR_DSIZE_32BIT BIT(1) -#define EDMA_TCD_ATTR_DSIZE_64BIT (BIT(0) | BIT(1)) -#define EDMA_TCD_ATTR_DSIZE_32BYTE (BIT(2) | BIT(0)) -#define EDMA_TCD_ATTR_SSIZE_8BIT 0 -#define EDMA_TCD_ATTR_SSIZE_16BIT (EDMA_TCD_ATTR_DSIZE_16BIT << 8) -#define EDMA_TCD_ATTR_SSIZE_32BIT (EDMA_TCD_ATTR_DSIZE_32BIT << 8) -#define EDMA_TCD_ATTR_SSIZE_64BIT (EDMA_TCD_ATTR_DSIZE_64BIT << 8) -#define EDMA_TCD_ATTR_SSIZE_32BYTE (EDMA_TCD_ATTR_DSIZE_32BYTE << 8) #define EDMA_TCD_CITER_CITER(x) ((x) & GENMASK(14, 0)) #define EDMA_TCD_BITER_BITER(x) ((x) & GENMASK(14, 0)) From patchwork Mon May 29 20:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258931 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53FA7C7EE2C for ; Mon, 29 May 2023 20:06:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229866AbjE2UGq (ORCPT ); Mon, 29 May 2023 16:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbjE2UGo (ORCPT ); Mon, 29 May 2023 16:06:44 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2044.outbound.protection.outlook.com [40.107.13.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7091C194; Mon, 29 May 2023 13:06:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C8/CfK1zFSmXcjvebzp8huA5uWkgFYlnSm068AgFkfuCBBcKEgdbqew4dNWI1wehuxc3er6O4FjbJhvYb451kdbu35mC2Q0MjioLLUT2DIIn55DAFMlb7DzzsnlHfPiyJViX+cmLu8+UrpSjPXi5tF2qsHfrYJE3bVpX1tfM7kDN0f4+DIET+QpUBAYecWuQIkQZboTHdtLCOkNC0x99FGDWrcC0AbjfAgKf6kdotYwLb2MHgR01ED20xEnX8RAj6pkimuN6BGCoSTLCWmv6Q7lNpfRPodUcLUGbQcPq4KPvB+FFEjOFwN5jZzVeivvUEjfJT+JnfbIT2e34/l5Cww== 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=v3P8AoOS+eHwcaqc5bUfUnf+Uxj1PFHD3YCKbldbyag=; b=nzBxkq0QuYJpuGs4q9xF2pMahv67UiFxY2pCvDX2wmzVK8B45kCdFwP5NIn0+qCufs9mjC2Dloi+pUQOYM7KNCBH/PJgNLvqcZK/+SzHU4hlkhuSOsDNLBYaordjV06cxgRZxAXV01vRnXqHnpaP0vBGanH+naf9qIchPY85gmE0xGilAACldoUUvWK8acBZ9iibmDsoLpxguFlhiDoBhnFJebqIHMZaMgloHXcKxGhubxAmUrwALI1r+nN5e8zupSaKG6IQRLYqFKVlBA5APZs7A1VzA+N7UUXuD/3radamCumCUwLg02n1T7fiFVjipOpvr1sYqUmZNphtol7W4Q== 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=v3P8AoOS+eHwcaqc5bUfUnf+Uxj1PFHD3YCKbldbyag=; b=oYFWP/zOE46/oqwrFinGnUjKJuRC3w4ZsVA+uHfJYO75g5WW0QPZ6ZRkQF+cAStfp41fTFSFyGNjVvKvGxjb0LqNFQW2Y7ec8/i5rG5LVNO4OmPcdDoyipvkKo3H6wAFHZHPfqliKfaRqRurgMojerSS4zWYgGfYUOB5obNjFCk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:33 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:33 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 07/12] dmaengine: fsl-edma: refactor using devm_clk_get_enabled Date: Mon, 29 May 2023 16:04:48 -0400 Message-Id: <20230529200453.1423796-8-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: ca88c6b1-5c4b-43b0-5967-08db60800f18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VB5PyEqHo6hbz04RIqO70xPUt4TmgAJKz9tU20i8pI/XGCzUgxbMFunplcx32+HO1AChZMTLtmtFqN/0umNly7Eqsx9DaPYSYE0lOt7aAjO9ic+VxVLs05xCunxRIIR2XWJ1UM8pJA6NDc65wkIigOgRk76cDvXF9AE6KvvaVbva1ov0+lMS94tkZuj/2xn5vlIo9HIE84CyJ2vAXXz8JYbSMWRBsyZ8ExIEhbABaomYjVBAN9xgLRL0NjsN17TZHF9DSH+PiwcBitrmr/noH2kS4Hk1n7lRFT0COu5XxpHXtbLczATcnDHRvQT+/YPsxir+gH7e4zXlBuWUMU0/RJDBlQlKsQt3vEZSKmeCDBHWZ90iIkuHsGycBObTKib52Csi/5tTQPIXDjeWzfFGg2UJIhFgApUBwIgqNrl9fyK0cblbgWjWxiF++Vo58+8JNUEXLN13YAnt6ZQXzsjpQ+Bj/HLX3FNWOn936RW4epkr9afnn/P11pVNJ2pF1Q0R7HFVktzjdGjJNLIIXbPEk72tKlL1kFwV2qrukNQEqr5LKqLQLzjaQqOKNNYz9eIx83o73QP6saJ8/X8EuP0DeyvWdDB0AvvCqtqO90fULn9nUuhL8YTOgznb3kt/ImkH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kpRt+N40Lu4eb5ug+2y6+hByG/SesFBR9vL7Ba59B3YGDxchez8H9rzSE9HNP2O2TYmig3SGOE+A2FLuuCpCbun55XvQ8ucbu1JLNpurKTBqhjXlHSSFkdafmRHavprsSWbihwwr9cBpIrnwxmtTOMsvWdmfB9QiOkMmalo1kby8NuraoRtTyTmxGaddAWYHYtfjY5HuET9lFxrv8wMmfI0vsjCbTu1eez/wmalxG31GMRQgCth+LbeXg3w12jP0Z5C3USmXYFjCvmCdW6bp7y2c5h7D67Ec+LWj1a28s6ORMMJd1yHDQWMUdyiOvJALcB6oyNjbvDXC8RyhUmh6DfB08ZQLOfeSuBglo5FxCrusL7LiSMpekSCsR/nMv8FFApRgeHAiqBmVgar+CG5StlhumlAa7M1AIMbnQNRKQQqJAf9hODtCXXMvDNMZrChvbUfrQDYEwIlRkk5PDzqgriXmli5n+QGdtz1+9BxQBx46GcRn833yT/Ozg5FMdpTzLv9UwYsL0GeagwB7L957J7Ievqf/75xGY7dHkr4jmRmiWqS+Yg+7wLSfeTsbQTH/5O2B7CBEvzcew08I8/UhILOagm6fezpH/juPijYBkU7bYHIXjZHOz5ONrAzJCSLw8TTOYQn3tjLAq4aoKBlMy/3UaKOyYn+ugwsBbXjBCsNjL8XMrfC5oR1Tt6/wmC5d36SNX29ZDTMPnhKZjEoCGW6H0R3A3g729LcR4uvGmCKbWKlCw6eJrdbHLm57Fm88szNAXmTWyhfrca2F3gyTlYiLI6pezod4x3REpRkoQ5vp7u9R0bnPHniUvmOXyncKb5mVxVGskV1k98aE6T5jzKTLTHwFEErt86NCEHD0ZDTeIh1/FeuU+QJxeJWioICNoUccV9KXeNbqGia/d8OZ7bSb/psBIGEz1DyQHgYMPlS17k4Anq4jZ+flCRBKEcj8LGHwb6cn1nvbnyQBqKXqkFyKb+aXYFF6hDTIjVsPz9uvh9/erQWo7FYa9jXgPGqQyMDTXvkByr4d2fMaz2h3YQxP1yjXv3JW7yaFDOAyY/YVHvr9Z/bBWyiGLwMRcNq/vWSM/B2rrrtJpqKHBTYeW8WLtR8OpSpmmwHEgnA1iSlDUPE1SgnFN8ggvNM51hI9BNxezNTtYPlx+SAtGzc/M1bGr19GvRjbS7puIIqR28TsGf+voR+P9bvWdRFlW6irkdYpqRAHfq9RgU5FOr7vxKro1FpWw5/Dpjxu6LDl92Z99FPiVQ7xPZIi/JSycHoIsSOWFMKFP00uXiWArxv0o+sBcRcij0vK/5kshTTe/rd5Uft+so6RkwwXB0EfAimGpf40/CSGRIpWeDbTqlBZ/SwVOSY1g6yLn3Y0r1CSxmwwXDrYOTxo9ct/te3j51JArGykZysBtThWgDSAdoA8MaLM4hbrieYD9LsywSoEkcvZ4sn6bMlXRkmwXYvx7lfHlPgd9FrAWsteafeKGwbGdaHQMnssKxDY8KVU6y4v3pO0mW3BzKmKP7iC9QOrYWfVei88fNN2nJhDikjoVROLxmhKcfnkJqBxbGgv866IBKxYLFXPXLB+Z8disPP26UR2 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca88c6b1-5c4b-43b0-5967-08db60800f18 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:33.0074 (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: hZDsbsP7Xtuah7duJIClH4NLLaZHsW7+oQwCZBcJecw0WtxrpFVMU28n6ivLp/RGRADURxyWLZaQkrXFU8i00g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Use devm_clk_get_enabled in probe code to reduce error checks, thereby enhancing readability Signed-off-by: Frank Li --- drivers/dma/fsl-edma-main.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 9c0b6fb4cb8f..6126717fc87e 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -268,17 +268,11 @@ static int fsl_edma_probe(struct platform_device *pdev) regs = &fsl_edma->regs; if (drvdata->flags & FSL_EDMA_DRV_HAS_DMACLK) { - fsl_edma->dmaclk = devm_clk_get(&pdev->dev, "dma"); + fsl_edma->dmaclk = devm_clk_get_enabled(&pdev->dev, "dma"); if (IS_ERR(fsl_edma->dmaclk)) { dev_err(&pdev->dev, "Missing DMA block clock.\n"); return PTR_ERR(fsl_edma->dmaclk); } - - ret = clk_prepare_enable(fsl_edma->dmaclk); - if (ret) { - dev_err(&pdev->dev, "DMA clk block failed.\n"); - return ret; - } } for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) { @@ -293,19 +287,12 @@ static int fsl_edma_probe(struct platform_device *pdev) } sprintf(clkname, "dmamux%d", i); - fsl_edma->muxclk[i] = devm_clk_get(&pdev->dev, clkname); + fsl_edma->muxclk[i] = devm_clk_get_enabled(&pdev->dev, clkname); if (IS_ERR(fsl_edma->muxclk[i])) { dev_err(&pdev->dev, "Missing DMAMUX block clock.\n"); /* on error: disable all previously enabled clks */ - fsl_disable_clocks(fsl_edma, i); return PTR_ERR(fsl_edma->muxclk[i]); } - - ret = clk_prepare_enable(fsl_edma->muxclk[i]); - if (ret) - /* on error: disable all previously enabled clks */ - fsl_disable_clocks(fsl_edma, i); - } fsl_edma->big_endian = of_property_read_bool(np, "big-endian"); @@ -366,7 +353,6 @@ static int fsl_edma_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Can't register Freescale eDMA engine. (%d)\n", ret); - fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs); return ret; } @@ -375,7 +361,6 @@ static int fsl_edma_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Can't register Freescale eDMA of_dma. (%d)\n", ret); dma_async_device_unregister(&fsl_edma->dma_dev); - fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs); return ret; } From patchwork Mon May 29 20:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258935 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DF41C7EE23 for ; Mon, 29 May 2023 20:07:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229655AbjE2UHp (ORCPT ); Mon, 29 May 2023 16:07:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229672AbjE2UHo (ORCPT ); Mon, 29 May 2023 16:07:44 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2042.outbound.protection.outlook.com [40.107.13.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87AD1138; Mon, 29 May 2023 13:07:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NG6gg8W/HU1no2ZLESBtMtRxQDWqbcD3GJ3RzlOtVIzKhNm5MI3jcgvmdnEXqcpNqVrc485URydfDo2tq6Srf3d20u6mmeSanw9K/GfcKGl9XyiKJ/cJNbdNNJ7kM+2sKhMdjpwJwXsiv5B0byAJTzIr68XUNjtOA3WQNC6+k2TyvcOqeQbP1csmSsbcqJ4DkvNPjwYb6A0GKkj3QEkUDUuwTKT2871rnRM3hSopbBzw+H7qr2PcmzxUQv48yWEYPb9ZMKd1Me3xOJvZwdduAYyxsgdHVqveMXDMrLZFSYx3i60x8ENQKgGQ/4mMX0CKFEMy1BxILS1WiKYtYBRpuQ== 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=ZX5uQiZbWlSQBsI7bxXuEwcbNQRhGGX00lAlSQPYFEQ=; b=Tx7ZMLfilLFpdSE0VInqAD9Ty8IVSnSYaqnnliLqeObdX+MQFSNU3R44Oj7Mt8AoLamHxelJywACzzNTAvFRjYFzyByfpG8u7TvkZ3ftdhahdFqZYWbjgvm3aNmFVMRoSZOmeqh66x23MYmimQeKzf67j2qISWxe9g51843VnXPRyuZrc7jvCu/Y5+ZTeslsAQh8sJXRMdXADewh2NUbRSQMEPASKL5Es64o4ucXDmsfpArXZxJa8TKVFhpRTtvu8SNFZr6b44aFQ2I73wnDlZjxSHtwL1HrpiabvVKpy+oJRIjZbiZpZBjQOUaSBNzZJ8Y8vhy4J8SdyT0nfxKTBg== 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=ZX5uQiZbWlSQBsI7bxXuEwcbNQRhGGX00lAlSQPYFEQ=; b=oNwp+4s+d07ypORepAGrmD393Fk6abFPIto+eoYscPXTz2NIFSrHsvBLcTyCsMZI+qaUv2fOLytofGehd1+N2n1hUO2nis0w/etucwk3N9DHNe0mBB7CgONOoSB/RtE3SWsFpTqVcoapPadI06N7rHzLZ8VWosxcachQmApLRZU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:36 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:36 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 08/12] dmaengine: fsl-edma: move clearing of register interrupt into setup_irq function Date: Mon, 29 May 2023 16:04:49 -0400 Message-Id: <20230529200453.1423796-9-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 82effa4b-9143-4981-ed6b-08db608010da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WTRpEqLxnkviaI1M+Ygvm26qCfX5rJxlhdfq2U9/9T0u/4RrRI3f69DZ5BCIfN0i1R2uEwHPJQSaQK4I8bbnT6d3LH39lNw87BOglTfj3k+ipLOSwSVL8v3mVcISWyc9prUPTL4hOQ1jMhlDWRiH0ZHMdiA3NF0Nzc3Km6JE8bezMP4rQtOlzDJuiGdHGs4eupQuoxehbCaTrrytu6W8ZIjkbzwUv+ZYLoGzWtelk3DOf3jYUpDm+OTWejMyt1Ys5O4TNNpYMSBCenSiszXSeaaU+gvCRwem1LjJe7MhB2hqpV8rfTDPR52LfnbS5WLtv74Ebud7foAgdzdqjlo1uc5qm2fGIzcBenUWol/a6hIasYJTRl9a2tbDVJm5mnXMcxjoe8QroZtD3yd/Ttf7i7mKxOc+iw/ERPTAgdANmW/343+60KhObENvrekPt+0Q8cCXCO/zsBuaA7FtgLFf8szEdKyMUtis/Kyx02zOQyYeR/7o1UJJZRMkdNn+TSj2lWpneBfWA/rGXSXjVik04Ucn7gLyswZs8fhtQtytkhgZFEdwGUsA8FJt4lHCjCoo895iNYeZru0DW4jCIqFWU2OcRADMHK5c41EqvXVOMn1eyG5DWqNM4XDAnowKuJYz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eRg6DO+I7+GtmHqX9vc6CcddX1i7qp9ZvEDCSCJuMYXdPd5XgzpZ/Tj/yRWSuOU1sOPmi/fDWm5nC8WpIRgSXy4wLp0OWrkk7blULNdClmtUm7qcijA+q3BGP6/CkGtFIlbe80tzViKPGHMct6cqYbdKclMFvvFipRFySmHhQ9cu+A74xVY8k+/JaoCaR1Ifvwol6xYznu+WMpYl6lZFf234zvFcGwCWTkDXpLZGxnkK/988DlWxSkBJOqBrkf9tv13m1mxF2roY7R7tMhN1jhrVtOFmTMgiNCM5R4F/mKtbntf0xWTGF6EgxrL8e3NshVV19vau7u3ZPbdp3VVBaV+GnpC6p2l3QqmwYkz35mhO7BfJMiyXB1RfvS4UCC+7ONFTreF7b/4wP8YLSxK2gUKTCktLHjhSjdDjyYNgoqBaZjYMj2DR1v0mARJQ9E03MpWnrLV+fphyITtaopEwfv6XbtgwKSR2PpjGD+qCksrSH8F5NEnXM5jBLCITysrbruz/ieCQswseLHCJaxKQ3+7HCwyKCYtVXyByowzYwAgdV5dtuf9wn5FNUMaALcgQP+J4yOhsdJgIWAPVeA/e5zrir659PB510l0JDpF9qeepGeg9uwA7YNH9T9x71cQTpDRBJ8cncDY2hMACGaXGBu7aLJJlZc7z89OqsPqG/hlAFBjiC3dxUwjJk18wh2MlQr3upSeGplu97WNUmpLGy+RYve/CXtRDDvkYxoEJv3qVy79OG4kKA6XK02ISFklwUD+4OhbC2a7Wt0Fz6PZ8qme9srJGmvzXYXi8Cr3uBSEYJ5su1ZPjw39P4f6tcoQA+ktbYKVZbjxY0fB0yhrxVJ8UrjP/8lGwvSpiM+PhFSb21Sni/aCsMk63ILCBDfGbCiuVrkTzs6/ITFDDxgUYW/kNg3RtxEziV3K7xKfGu1yhpW6A/yYL544wFbkAN990keoTSTjFG+vc5JrD0MJ+AOufwMZnovzVWngFhcHlY6zNa4mVoNfN6g6ZGeN9ZgRVNR4a4WQhbq3vWEfC2ZcUud7Ygzk9XzXs5xw35HmgxVQllb76zG1MH5Zw/HCeDkn31BLWFNP/owLTcoiVitfDOHKV1//0hYaGjbPMGvS7VVvf0/9zig+WwCiNEAUEpjXvDC0dVjMIbwJZmYRC2KHWi2FGw9xTnYL25UKlQHqMFEskU62VI6wUKiHYRpQoIBRSo6B+RjzyY2DQ9snCDhrWd7miMy6uAWxEUqitRL9MbKug11QXACZjNF2QKd2fOnkgQey2Yv15jDAMNk1LalfZJC0w+xaE4pT87BSkM3JgfxRdOVXYdIywm2ldQWc4mO3dgiGQ25eFFQDnSOT3SHRr4ploizrsOUfhTGWrQkIbsnmELUFc8Qwwhd84lczWLFq3lutq1WnVWv4cW7pFb0O4jF2+3sI54HxqGjkdZu4D7VSgMkBYkGqeyeCrqs5+418dg4j+PAuKeD+MFqJ205ImBeHLCs2IjuxNddlm1EAksluXFAW7oYTl9lF2zfrW24oooJ1MD1Ri5KXBlMhAhv3r0GwqkCuYrvNt0gaIzdXEESMEoNq/zzSSNuu9oZzahCgs X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82effa4b-9143-4981-ed6b-08db608010da X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:36.1058 (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: 0FQQ498di3kYlnI0cqLh1fR9FFsRQACdu1kdJ/uNJ4Ok05fTOhIO/pPLllz/IXFlmYAF/ynHIX9Qvqokz9W3ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org This accommodates differences in the register layout of EDMA v3 by moving the clearing of register interrupts into the platform-specific set_irq function. This should ensure better compatibility with EDMA v3. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 6126717fc87e..cd734779f2eb 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -113,6 +113,8 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma { int ret; + edma_writel(fsl_edma, ~0, fsl_edma->regs.intl); + fsl_edma->txirq = platform_get_irq_byname(pdev, "edma-tx"); if (fsl_edma->txirq < 0) return fsl_edma->txirq; @@ -154,6 +156,8 @@ fsl_edma2_irq_init(struct platform_device *pdev, int i, ret, irq; int count; + edma_writel(fsl_edma, ~0, fsl_edma->regs.intl); + count = platform_irq_count(pdev); dev_dbg(&pdev->dev, "%s Found %d interrupts\r\n", __func__, count); if (count <= 2) { @@ -313,7 +317,6 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_edma_chan_mux(fsl_chan, 0, false); } - edma_writel(fsl_edma, ~0, regs->intl); ret = fsl_edma->drvdata->setup_irq(pdev, fsl_edma); if (ret) return ret; From patchwork Mon May 29 20:04:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258933 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDB74C7EE23 for ; Mon, 29 May 2023 20:07:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbjE2UHQ (ORCPT ); Mon, 29 May 2023 16:07:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbjE2UHP (ORCPT ); Mon, 29 May 2023 16:07:15 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2044.outbound.protection.outlook.com [40.107.13.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAB5DF0; Mon, 29 May 2023 13:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F6Ty0sOJmlA46Gro5uH3gH+tOFhQtnK7Jqidt6tZKET4cEb0twHMdgJTNpl9O8lyzuGAXlh/z4eZInamQ7DaTIL+6g+h5uK1VfMhnn8eF3rFh2mrOslA+pR7YRjeKN9sgOIOEqKk6WnS4GIPFi4HQFBsqiYR6dZzSisaDeegti/MJ8is1AywfiqUT0zE4P+hzAUdXamNrUfKUIH6LEI3ouTZgXbDrHn9bkgkE25pD+9U4FPwDeIk2WAoLb73anIvSLryHeeIGrD7fFMxSO00K2QCQJQwfOwWExz4wuVcVEfcM+odnr0iZt3TB4JDJJ17EdBIpn+YleeHAi1CupMT+g== 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=ISKgrdPrxzKwoDu3CGTHqw8SLWtu6pWcUHBCYREGJL4=; b=h1esUkpDAISOtIIki7PNyb6izY68+7Ejgc7zCtVX8JOOmBzHFDdmrcamqcGEnwTrt9SO6IIzCS+fIDT1E6Arg3BHVRU47ZSNslXUUwlkZgbYVHyKy0j+3E+X9lS9S5XyD+O5SiLLaqFlx7XeXklD8x0PqkrThKLY7kJmX2zPn08QvJ0NxgAl9TXwtaFpiUD8pHAbp1Z3lfW5nshbSgt9fhZUM/oHKOBQePnvNIjoZyDsE/zdm8sExOJpDfM6je9Fo0leXpM3LAEdbsVuEC7dOJ/I/xcHjiFSo/kU36GKq6CG8DCuDTnS1o+U8WHoZy92AvdtWZRD8S3uMHsAF/0O4w== 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=ISKgrdPrxzKwoDu3CGTHqw8SLWtu6pWcUHBCYREGJL4=; b=CDzKy6qKgq/bAvxvDOq7dF/O7+C2k8PIAgvIDgGsYWV1zNon1FXwHkrbVNXwNTOnqdRmJiWd0H2jysdc9Nha4t5wK5LpG41jLaslBUeYbWp9dNG78HJo74mgjDIdFi4zqEm4KbD60Ev40g4mPLmcmGjVOho4cDsRmg4B5GJJd/o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:39 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:39 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 09/12] dmaengine: fsl-edma: refactor chan_name setup and safety Date: Mon, 29 May 2023 16:04:50 -0400 Message-Id: <20230529200453.1423796-10-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 24561677-2850-4824-8fe6-08db608012ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hWB1KNm169G0LqIDUMr9rDXbd4UL8iVZWw1QwYadTxiOlKd2+DRcG3uS2Yg5cIXBUTc8OgBNAVs3uUDRcLnW30H/ycrIsMKsTJ/3tHvTMsQ+vl3kjqM0fFqUehnqJuWqgjDuJZxSSX2IAqk7fE6DXM0FyfjYlQXZDj43mvrdonM1iUYlrrFoGVz1PN4Os0v3ON5snvZ3UOjuaUwm6vBQ10WpFCfKlr1f9qa/6AtXtAGUMbp2GH/wvvg/pCZyLFh21kwtPL88elIRY4V5l9OFfZBfdK9m2IRstzR2+e6sq6IaoJgJHTwMILlGGcwS2JbmMbIDs3HvQlbwC4uce9cFRCOCC5AJlq/MUUMZaJOyD1mX2ybn9dW7N39cTj1c1fjsAVuzWFlHVmahOjvttvyWhqG6LxGULARAsKXgfSNCPb0TYcNyDxdtz15bV7HtqmQzAdU4AaCKB/IkiWD92untre/LMuEMuAzqonrljJMN4/5SAI/2HPfJDDJnSaLzBO1uqOZQ8HAIE1PpneDcqdNSsLn31UgWS8JVTW46c+l4ushVHYBHpREkS4z939s28I+bM4jE6k9d03spRdfcrLQar8LLYu15FY3LTRKmy2KSf1Ry+/UbsSX8G7/YFnKYjEVH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6JgEcWxyCAxw0HA9GN4/ZCjtPK9fCC1+h5MlUz9iMkyXHCToGOfkOCqYkiHiB6g+un2eZ4WmGdpOKZ/I/JwARk9nMwQAmP0KHcNkG/M5iXBVOdmad1A+9TF8il99mkjqkmYl0qJ8onIBqx/WZEByMA9V1mSAVIvhdMK/5GM2hf3TtXKatE4tfi58Q04PPizSL6EClJFvUSnsHsY98cr15hdZvcASpthjO2BDM7K+Vq4qVwDKaB/JHl7fNuxMK9eveQl9wxiHBazIwJb7eQFFYMpwYGsIcZp1lBmS7K90017b3Xk6A+mHN02Y1H2JVKNGoJ0SwX2Q5yxW7btaxsgGGxxIUjOJIn4/OpZNHVHlDr/U0L7ydXlbCcVZiQH1fDRash78nVtkbO+6Fxltmo4QmpllEOhzy3POHjvg6t9KP9JfFKThKyCeYjXAKSYJ1rzK8FOUTAyUS8aEjfJISh25/kBjRUkCWTveOhbkc1Vu8hSbfIw0UPuSiDvHs5n/SpGYvHyEMGqGvfZgv8oNnVKEW0fSwLzG6hTYb/0csfkWmPcq9flnC4wR1XO2lFcocXxkZ6B+6F/cl7km/1bDlVNgNMyfool8sJf+7On73gJfCGIyIQkha+D2Dy4S3m5vRHYZQKJG1FKwBO0TIuCuvEz857HefyHDhzK2Qmq00XnRIRVb1H196Wr5NtWyBoedGsUWj4Zp/7+e9S/rTAZ3WRQBhH/+SHo4e3OVib0tC2AAyhWm4wkkUltqMJY9WLxaZTtAGHxDFuIyJs0BMmMPigDi82krivoXlPvz7exu7g3a6aL9NfRyr1Q9XMjHORUcKu6tN5r8fNd5UGACFMYWGSF8IyAQcBRNlIgA0fcBGNeeI2N5tK9jja918IbXzmYUU7iS1u/emkIgE8AeYZmZNK5IwFQDNUvkvoh9t83I1Im2CtU/7b9UeADrrXpzWY3Nc6VljER+3hi5uw4fg66QQ9IsCP00n0DnRLoOzG6MUwUMO4GT8je4klEE3kHAECMNVtZH89WiORvCJonyav7dF95mlpFrnGVdQQCOPZypk+VdzJv0/bs6qgZJPWrzrlMrQormK4Ato2e4vfT7WUWYLh52Qozpb0wh2yTzl8s5MdYSOzCReQlup3KU3S3grSco5rgVqOBH/GXYy+94GHJzzQj+N9V7sqpOOdbTK6vscb+UAJSTz9XyxyE4+G2YPnH6qya52ptUVqqJX2LYvljVJiZTEykxK1imamE3KU/4mt4LNIHrMvfTpG7QQiSHcpKFiEzn1XU5npn1y1HB6SFQ91OZpdcqnywdWfg0G71fmlZAdrXACPAKew5PXlB0zxbMxZSt+3+xOsqtNPkrZT1ctjSNrFnwuExgeHEUaaBjF4rnEI39sVSYq+meuG67/DJ48og9ZEz8OqHOyukBKawtruEdarzI1FTIaIefV1Se4xk6W+kc6yvf6T61UkVTyQHv8Cv+/IVC8PYNadq4j4x0A6fenNduSTyr3LrxaWB11dvARUuFfK4P3HLDuA4TxtwX9MZeo4jHv93MQfUB2TeEBRwF8xkF07Vmg+u6hQONJ7KgstwTQbqkp0cf/6D1Zvojo6ay X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24561677-2850-4824-8fe6-08db608012ee X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:39.4434 (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: zDhq1+tpj6AjNyjkjCfcbkosHSTHdoGN2E5Jn5a8GU6sJpBtdkoiVVqtjx7nXDdF2creHF64BctHSCKLekDRwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Relocated the setup of chan_name from setup_irq() to fsl_chan init. This change anticipates its future use in various locations. For increased safety, sprintf has been replaced with snprintf. In addition, The size of the fsl_chan->name[] array was expanded from 16 to 32. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.h | 2 +- drivers/dma/fsl-edma-main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 3991956dbc11..39b5f903ba87 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -116,7 +116,7 @@ struct fsl_edma_chan { dma_addr_t dma_dev_addr; u32 dma_dev_size; enum dma_data_direction dma_dir; - char chan_name[16]; + char chan_name[32]; }; struct fsl_edma_desc { diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index cd734779f2eb..722ebecdc894 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -175,8 +175,6 @@ fsl_edma2_irq_init(struct platform_device *pdev, if (irq < 0) return -ENXIO; - sprintf(fsl_edma->chans[i].chan_name, "eDMA2-CH%02d", i); - /* The last IRQ is for eDMA err */ if (i == count - 1) ret = devm_request_irq(&pdev->dev, irq, @@ -305,6 +303,9 @@ static int fsl_edma_probe(struct platform_device *pdev) for (i = 0; i < fsl_edma->n_chans; i++) { struct fsl_edma_chan *fsl_chan = &fsl_edma->chans[i]; + snprintf(fsl_chan->chan_name, sizeof(fsl_chan->chan_name), "%s-CH%02d", + dev_name(&pdev->dev), i); + fsl_chan->edma = fsl_edma; fsl_chan->pm_state = RUNNING; fsl_chan->slave_id = 0; From patchwork Mon May 29 20:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258934 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 735B2C7EE2C for ; Mon, 29 May 2023 20:07:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229885AbjE2UHR (ORCPT ); Mon, 29 May 2023 16:07:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjE2UHP (ORCPT ); Mon, 29 May 2023 16:07:15 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2042.outbound.protection.outlook.com [40.107.13.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A020FF; Mon, 29 May 2023 13:06:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b25xXy5Rw6GgYS4ef/HFlhHwpMetip+1U7OxKSwI+H6HpgM5Km1PtI0YW1A+nn8WImRJVtFHYdvssc/rB24dBkiK4cbExygj2RLDC4lCbxjZni4IYvpJ/gEwFuJR5tsft3JmqhK/UqMriM7MZD6nSTdKpP+Gw6+y+ELyYP3vthnfmlYHUZ47E8lCn0mPOR/YtzJD7WvA8g9GugU+uPyPiCJJ4hFxwkIzQLd3pN/bB+SZlYupDcbiFeOQHzbteKhJxfj2oeL3eou3rSR8E8Wx7rC2yUvxJ2QnwcZApv1BmbIMXVgcOI1R7Nq39rGebRGJeOdtKHL31xugRtrROI6TXQ== 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=eZQBBtSk4cUImx65qukNzrsozHrl9czSuN5Y3QoTWkY=; b=aZ4J8wNW79y11UEgZPfDOcdNBx2qqUl+CabMZyaxZJrPlM3Ncqm8cIOT7s6ystGbxEq1Ma8pYQ+S65s59meqABcF0x8qE9s8foW+gQksJzMvu//3UD/PENmaoKfXv+WjAtdNq74Nb79hFCeoPK/OQGSLVGiYoA6xLYLVc6mvIzsLBoz7FJfVUxi4c3LjOug5/R4z1CCOgjMEqkhQPyDWN67MGBUCRoZzFxMf+tTcBgD2mJ7JkPO2/K2zRxuvQatQR66onTzLEwbXLi12w75rISvmpfiMbkfojBnXjf+bf7U3i5ktWiQUmp5AlIVu4xSxBYlkUM3mvmMHiXxcFJcasw== 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=eZQBBtSk4cUImx65qukNzrsozHrl9czSuN5Y3QoTWkY=; b=RC5Cdqja4UMsgx4HMcnmGg2sVOuh/52C87ESD+rxXmFiu6EIkmxOWIYgC6cnVIpSfrjeMMYTHVcclYjia9U2jKvPjBHGpOVTaOMbkCdjFQEsM2Nu1DoWAmi5WWa6dI27/aeYc/VtWL5sErO4VJKFyYeEw6vbp/t8IBD9BOAcmvg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:42 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:42 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 10/12] dmaengine: fsl-edma: move tcd into struct fsl_dma_chan Date: Mon, 29 May 2023 16:04:51 -0400 Message-Id: <20230529200453.1423796-11-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 970da16f-3230-45e2-ad23-08db608014ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: agGlemy/ChCsYECnyvye5yOUX46V6PVUiuhDKVZWt2Ig47baU2GgKNtqbxn91OE4eTLPerk1GPQaNuxkQOLjR1yZ8jsKzqnc36FKq7/JgmY1svYAZs56UcsMQiEKSXP6b3EnZvctble65NLfbXFm8sytO60oWyPFek6aqtC49jutQJTbuZ0zCpOSa1vE3YIPgHPRip/qSfNgma+yKEqt3cmFYdJRZDKvFyGPuDd9fU4GYBDUl+KicrrXQ5ZFhk0QeesaS3NuVBQejHI1ezpul+EYubkhbTII1KxPR8Bc5ILETRrJJAF8BjXOcFw0AjOJ/jEG/5oZmMNjs/H218Zh0+hG5H40eQxKvJngGFxoftve28v3xU0UgaiaEeSamDphpOtTDuGNudbGONZSfOAodtEnv+FhNbc10XHpfgYMQcol/9QWWsYBfFsEdMloYV5pFILwFLPI691qtZwZeK6bliIrE576BbRe+4urj50wiWHvPQlvA8ryiP48RWSWD5A9exaMQVEIFIgiGNVTpGr2fmSEND1yfpo5BgIGMvuipSVjSPKUc3c8BizfiTKQB5UOkJnZ5xarT2fDAtb1gOZENL5UGAICAgdP74FtmZvjKCA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(966005)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q33fXZ/CpbLbEb3n03l+1ACKDrdXpt7hy3+nuuWfdewS6ly8qxGQ+bUGo/ID+boSmz//9I0IYULvvhkLjpeMr/aM7Uk+tAMvophQFAQFLp9rcHMV4Ua83fDpy1GXt9FvYUC1Rnru3ZAo16ZsolT1WEPc14OWjZE16XJOtccRTsZkLyyfBrRYOzaS9m64ArtjFAU09SDZwY8c1UtS0z+XDZYfcC4289LZmgbfGU6Nb3LG2LuiVxssu3xZTyDg4PgWOOJT4pdpwCIENJUJPA9+/dmAkLq+lMc+4QWaaptc04/vgF0+n2tPg3GUhiH+Ej0NE1xQvYJPqy2MxSNF6JtQrsWDbUwRl9mvExLYMUgr20MeGwupgUzgyY8J58jhLSWD89dIT8y3LhTlGlt/bWUk/fJswI1szjaiqjzuEingM0BzAJ4MaWM6+yMi/y0+5J5OAKk6y+hKorHs3W9GLYTYd+VqQHQoEss9CbmVg9vfokVUxMMAZmLXJmH3sEiOlQ6lst6PqRsm9/Okk4hz9ScjoXUlaWRNlub6vFmAHg/VVOFhSH5uGyppCNNZ1X2PE820ZfmdHTubmwZzdMMR2iy/oFyWPt38KfGkT0aBZ1v9MAMOe4NsWcudM9Ta4ryaaw148XCAEjvdkIhTKAeWfzhM0UZb97YNH9kVsBTkeOTfDtCmQQ9gHCbH+yZq5nryYSv1o0pQQipD29v68slRm+Pyt8wMb3vgM8CZJY6kV/iiEsEY1NKPttdGHR5Ano2u6iR8qb4SgSzNxS2OSYprmi8fAdfVYEareU8By2YccTloMmN1Fp8ByQO5yF9amrtoSNVYzIEXDOeOjd2ET7pcm8oxg1ZPCOI20yWmeS4bWEfzTOFJllugJIc/kz4NV3XcARjcBji7eMlXOzc6LF70SRtsFI/mLFq63Qm8VekLKsarFrQdtLk7253iUesMpO8rfm/OYvB50jOicfDyFqbDJHB0x/AVqtVdPzylRqDVQRrLHsKRGcSaJB7SWKVyHnRxv+8splGAn/Wodk+DjiedQvSXuN6CjOplp/8HF+YpJbgIHHZhUafad/p+9rR/HQLWP/2bKNnWcw8GvLK2aQddjnFWALDt4DI2ZxFyn77uhDNoNWt3m2nWHEmWoLRgtAzC2Rgv+iXfF3d1wThrmFbzfH0wkYrueU9molhaVCHHcOu+Mu3pQR9sQ7bt/5mDkHLYQst0Xt+BNpdbGQkqjG27LsHl5joHULJMTzeubyDRLQbaDjQVqhKaJtJertddsKjN61pW5vrNwqZX6/mXWpPwL/nQWBQyB2QBxQhnMzu7U8j/5b2/5mcgvJPDHmH6SPRrX7edjDZxdgNJI7vgaG6MLbVGwzKxedbwCcFDPiojm6+GXceoi/BWt0eoRh9j5mlvJWTTG7EQOQvEZC9DHN3c+v/KGhyPAUQv1GBUKmzCROsn8Rc5LeLViNRnYtr320lrrZindDwyAnhsOY/YPi0HhV/f9WjwzZ+DiYCpb7c1p1IoAECEjhIBbU1rQjaMlJAahOUlLc3BohP2cX/xK49i137Z8WsOxLQ9hUDtVNrkoKgm15GVuwZ7RHbhvJHZa/zGlOHE X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 970da16f-3230-45e2-ad23-08db608014ba X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:42.4896 (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: NTmlVV7q2Vuq/LYzL37LaqKag3LUjd4X5d2HoluMfJFqVX615mP5Bi0n/7O+wNoU7TH+MNcdVj09EdcnpfgsgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Relocates the tcd into the fsl_dma_chan structure. This adjustment reduces the need to reference back to fsl_edma_engine, paving the way for EDMA V3 support. Unified the edma_writel and edma_writew functions for accessing TCD (Transfer Control Descriptor) registers. A new macro is added that can automatically detect whether a 32-bit or 16-bit access should be used based on the structure field definition. This provide better support 64-bit TCD with future v5 version. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202305271951.gmRobs3a-lkp@intel.com/ Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 38 +++++++++++++---------------------- drivers/dma/fsl-edma-common.h | 22 +++++++++++++++++++- drivers/dma/fsl-edma-main.c | 6 ++++-- drivers/dma/mcf-edma-main.c | 4 +++- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index 659bef4a3b23..d56b100a8358 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -40,8 +40,6 @@ #define EDMA64_ERRH 0x28 #define EDMA64_ERRL 0x2c -#define EDMA_TCD 0x1000 - void fsl_edma_tx_chan_handler(struct fsl_edma_chan *fsl_chan) { spin_lock(&fsl_chan->vchan.lock); @@ -285,8 +283,6 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, struct virt_dma_desc *vdesc, bool in_progress) { struct fsl_edma_desc *edesc = fsl_chan->edesc; - struct edma_regs *regs = &fsl_chan->edma->regs; - u32 ch = fsl_chan->vchan.chan.chan_id; enum dma_transfer_direction dir = edesc->dirn; dma_addr_t cur_addr, dma_addr; size_t len, size; @@ -301,9 +297,9 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, return len; if (dir == DMA_MEM_TO_DEV) - cur_addr = edma_readl(fsl_chan->edma, ®s->tcd[ch].saddr); + cur_addr = edma_read_tcdreg(fsl_chan, saddr); else - cur_addr = edma_readl(fsl_chan->edma, ®s->tcd[ch].daddr); + cur_addr = edma_read_tcdreg(fsl_chan, daddr); /* figure out the finished and calculate the residue */ for (i = 0; i < fsl_chan->edesc->n_tcds; i++) { @@ -358,9 +354,6 @@ enum dma_status fsl_edma_tx_status(struct dma_chan *chan, static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, struct fsl_edma_hw_tcd *tcd) { - struct fsl_edma_engine *edma = fsl_chan->edma; - struct edma_regs *regs = &fsl_chan->edma->regs; - u32 ch = fsl_chan->vchan.chan.chan_id; u16 csr = 0; /* @@ -369,23 +362,22 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, * big- or little-endian obeying the eDMA engine model endian, * and this is performed from specific edma_write functions */ - edma_writew(edma, 0, ®s->tcd[ch].csr); + edma_write_tcdreg(fsl_chan, 0, csr); - edma_writel(edma, (s32)tcd->saddr, ®s->tcd[ch].saddr); - edma_writel(edma, (s32)tcd->daddr, ®s->tcd[ch].daddr); + edma_write_tcdreg(fsl_chan, tcd->saddr, saddr); + edma_write_tcdreg(fsl_chan, tcd->daddr, daddr); - edma_writew(edma, (s16)tcd->attr, ®s->tcd[ch].attr); - edma_writew(edma, tcd->soff, ®s->tcd[ch].soff); + edma_write_tcdreg(fsl_chan, tcd->attr, attr); + edma_write_tcdreg(fsl_chan, tcd->soff, soff); - edma_writel(edma, (s32)tcd->nbytes, ®s->tcd[ch].nbytes); - edma_writel(edma, (s32)tcd->slast, ®s->tcd[ch].slast); + edma_write_tcdreg(fsl_chan, tcd->nbytes, nbytes); + edma_write_tcdreg(fsl_chan, tcd->slast, slast); - edma_writew(edma, (s16)tcd->citer, ®s->tcd[ch].citer); - edma_writew(edma, (s16)tcd->biter, ®s->tcd[ch].biter); - edma_writew(edma, (s16)tcd->doff, ®s->tcd[ch].doff); + edma_write_tcdreg(fsl_chan, tcd->citer, citer); + edma_write_tcdreg(fsl_chan, tcd->biter, biter); + edma_write_tcdreg(fsl_chan, tcd->doff, doff); - edma_writel(edma, (s32)tcd->dlast_sga, - ®s->tcd[ch].dlast_sga); + edma_write_tcdreg(fsl_chan, tcd->dlast_sga, dlast_sga); if (fsl_chan->is_sw) { csr = le16_to_cpu(tcd->csr); @@ -393,7 +385,7 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, tcd->csr = cpu_to_le16(csr); } - edma_writew(edma, (s16)tcd->csr, ®s->tcd[ch].csr); + edma_write_tcdreg(fsl_chan, tcd->csr, csr); } static inline @@ -745,7 +737,5 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma) edma->regs.errh = edma->membase + EDMA64_ERRH; edma->regs.inth = edma->membase + EDMA64_INTH; } - - edma->regs.tcd = edma->membase + EDMA_TCD; } diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 39b5f903ba87..991408d59e3e 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -48,6 +48,8 @@ #define DMAMUX_NR 2 +#define EDMA_TCD 0x1000 + #define FSL_EDMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \ @@ -93,7 +95,6 @@ struct edma_regs { void __iomem *intl; void __iomem *errh; void __iomem *errl; - struct fsl_edma_hw_tcd __iomem *tcd; }; struct fsl_edma_sw_tcd { @@ -117,6 +118,7 @@ struct fsl_edma_chan { u32 dma_dev_size; enum dma_data_direction dma_dir; char chan_name[32]; + struct fsl_edma_hw_tcd __iomem *tcd; }; struct fsl_edma_desc { @@ -160,6 +162,16 @@ struct fsl_edma_engine { struct fsl_edma_chan chans[]; }; +#define edma_read_tcdreg(chan, __name) \ +(sizeof(chan->tcd->__name) == sizeof(u32) ? \ + edma_readl(chan->edma, &chan->tcd->__name) : \ + edma_readw(chan->edma, &chan->tcd->__name)) + +#define edma_write_tcdreg(chan, val, __name) \ +(sizeof(chan->tcd->__name) == sizeof(u32) ? \ + edma_writel(chan->edma, (u32 __force)val, &chan->tcd->__name) : \ + edma_writew(chan->edma, (u16 __force)val, &chan->tcd->__name)) + /* * R/W functions for big- or little-endian registers: * The eDMA controller's endian is independent of the CPU core's endian. @@ -174,6 +186,14 @@ static inline u32 edma_readl(struct fsl_edma_engine *edma, void __iomem *addr) return ioread32(addr); } +static inline u16 edma_readw(struct fsl_edma_engine *edma, void __iomem *addr) +{ + if (edma->big_endian) + return ioread16be(addr); + else + return ioread16(addr); +} + static inline void edma_writeb(struct fsl_edma_engine *edma, u8 val, void __iomem *addr) { diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 722ebecdc894..8d1d0100f6e6 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -312,9 +312,11 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_chan->idle = true; fsl_chan->dma_dir = DMA_NONE; fsl_chan->vchan.desc_free = fsl_edma_free_desc; + fsl_chan->tcd = fsl_edma->membase + EDMA_TCD + + i * sizeof(struct fsl_edma_hw_tcd); vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev); - edma_writew(fsl_edma, 0x0, ®s->tcd[i].csr); + edma_write_tcdreg(fsl_chan, 0, csr); fsl_edma_chan_mux(fsl_chan, 0, false); } @@ -421,7 +423,7 @@ static int fsl_edma_resume_early(struct device *dev) for (i = 0; i < fsl_edma->n_chans; i++) { fsl_chan = &fsl_edma->chans[i]; fsl_chan->pm_state = RUNNING; - edma_writew(fsl_edma, 0x0, ®s->tcd[i].csr); + edma_write_tcdreg(fsl_chan, 0, csr); if (fsl_chan->slave_id != 0) fsl_edma_chan_mux(fsl_chan, fsl_chan->slave_id, true); } diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c index af1b0e8a3021..d79a04a03fda 100644 --- a/drivers/dma/mcf-edma-main.c +++ b/drivers/dma/mcf-edma-main.c @@ -200,7 +200,9 @@ static int mcf_edma_probe(struct platform_device *pdev) mcf_chan->dma_dir = DMA_NONE; mcf_chan->vchan.desc_free = fsl_edma_free_desc; vchan_init(&mcf_chan->vchan, &mcf_edma->dma_dev); - iowrite32(0x0, ®s->tcd[i].csr); + mcf_chan->tcd = mcf_edma->membase + EDMA_TCD + + i * sizeof(struct fsl_edma_hw_tcd); + iowrite32(0x0, &mcf_chan->tcd->csr); } iowrite32(~0, regs->inth); From patchwork Mon May 29 20:04:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258936 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B64F9C7EE2E for ; Mon, 29 May 2023 20:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229672AbjE2UHr (ORCPT ); Mon, 29 May 2023 16:07:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229687AbjE2UHp (ORCPT ); Mon, 29 May 2023 16:07:45 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2044.outbound.protection.outlook.com [40.107.13.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 845B2E3; Mon, 29 May 2023 13:07:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QfmN1x/K8F2wCg4UDiT30AhhxAcpkXe0H7EMSpWEvpe1BwdgG2tCj/68768S1aQ3LFzZzYaBG11bqcBqD/3NIv6E9jIc/Nb4Tg20170IixxghBsSEKlaPgi2L2SFgEO50CWfHvDIar6PrNQ9SR08jkwsxbgp9tDEEr4JKS9wng1mdWSHLXXGWcHjY3R+FV+gaqYtLnh9nzKrg5UqtEQXF7h2wGMhBUuYn5P5EM90Q9ECJnnREY7uOeeSWloFvLTTM4z3NcSW8aEmrq0EUsMtMcseGUnKpuzg1MKr0cKjpIZZOS2ZJ9S/7iFddptIEpJaKBjsJejke+BuCTz8/W12DA== 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=6TzhP4HvOLM74JF/VlOrG0EepN1fANdJoX2tycKt5t4=; b=HgHq53IPaDB0LTOImf9CwBIevypNfOk/ouCGksFon4S8OJ6oE0/bYBK4dfERtXA1XATuAKZt8I+t5C1l9gE4FTBZJPUMgdZRvz4Q8djhi7qDtds38Mbk1O5QGO9MvXH5vR/enJiIbvHj1zTx/fMF3JiyEhPGIEGLJRdUhdFJMnnA21/fM99srT1CwdnEyZ9L5dBa9byywz0PLZqIq/Y915VULvR8VUApFAvp1W+6xfpWnR//fySk1GHPyKlLgM4c5HhfijegzrK+MRY7wSsRCs2o2OogwOyLNJXhBvcW1qODeIaG7rvQ6OhKmgBwPFGD3sSR9WhgCLOsOX145aU6Bw== 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=6TzhP4HvOLM74JF/VlOrG0EepN1fANdJoX2tycKt5t4=; b=Kf3ra9E4wcJGoCfyQ3QuGBBl9rxtWIvGlhWqeIkYS9ODa+9OnWOacq1AX7FDBxdgwkt16CY43KP5xMwMvxHzvwuhSSXEP8mxi40bHCj/bCubZwEZDmuH9zIEXCZB5dvIbIm69chjyjv5VadUTAE86Axqi0cDpWdtow/Td/QZAOQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:45 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:45 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 11/12] dmaengine: fsl-edma: integrate v3 support Date: Mon, 29 May 2023 16:04:52 -0400 Message-Id: <20230529200453.1423796-12-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b9a2e5d-33e6-41e5-ca64-08db60801686 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fsP/2RZhUZ9scBW+FW+/mUey+yS3U56e+qimUpDD4AlQlw6+Cmb/jsm85M06FuTTzOaMSAtrDcznwd4WZCDD0KGnlymZXYpCw8xV5dZZG2KegxQ8CLfOqr4TAi2AacFU1pPlMoDFTP+N4l9SUVb/1PdhfrtABPCcQ38CRJq6R3gH159PEdacdcJTS3vLjcHrf1W2p3vkrFl1Yv7NEoiVC3tf0z82Mn48dO+wilQyDKyekK3AuDTm9/3C9lqZ9ErfQsjbOfAGRF85R+KVGa5fuc7Wk/v29KwyC5hAhJa/h9BunsTnKQgjJNSCU2cHV/IV4qVNStx22gmN4aRMN8X6D2wd2FGXHilLBuqjT91n4qrPiJd9dc1lCA4q8HdJrXNhjjAKHpElVPGVlDj4U9Q8dv76+r0Jym6NlhTBVwxXd/+UYoj0R3fvP+PwWZiyYflHFUhkGVXcJjM2kTiLTW5whpcTV0uQ3zw32U3j528Y2oZwuJ5J+OVBfnzumIE5vs8HPqJUOXcrXm1iBojGVGjC52+K4DdmjIrkIuWb4jwrmIdkyDnSSQgxctMAh3B81qbvUN6U9N2KNZOi1vpYglAdPRE4X6T1dS2bGkEpEg6Wm40ALeHnutprYSoBpZbOGo/m X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(30864003)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ECqiQLb4VeHLJGdmTe+t2zp4Bt0jBDZuGUV+2+XPR07l+MVnnz1fl7KPCYItEwnWKNKVqW/afNJyF+GpYsOup94X+engj2XvhWk7NFGmgl0x/4bfHfSeLhhcnYjs/wp6/OypWu1Z2j3lm91Gx3KqWCcsRCjcGcM4RIX7Lo2qxf5c4RVJoP9ZDeQyuPJXXlUVWb9B6dJgDJrSTlmaackGKofyGUwL07jnxB5K2NCzG1AmE/KqrPtqpifdKW1ueU1QwaZeHsvZJPDqd4nnNN1lFGT6/3IHyKA3y5lNsv6HTHZikXXtr7GtqEB8lQFj1xnT4MFcqVCK6E/OFNYlldkQN8gKucspX1NzLvfX9XM79OPcnWvMAHhu2mJZu4gnzZDR5h26O7AUGsRw3zWfVkHv7YJUJiuTbEmvR9Lnr2UIpwzxwd9g/C5a4fof0se8aUX03j5OBaklM2SpmCm3qyM+14mRO/i+iSvEgTP9JOrF1GpGtz+W5YNqnsLpM+S40t1DlhOop453YASEMz8Y0pIiwUW1klF8GbyNO2QfjtMH6LgSOjhzl5VGwHnRkav3pDlWtoub0hwBlJt1fgIRc3+vmwVMSmmuPdAssnHGwvhvuFNVQRLxcJIna/MwjEQRE+7rC4zlXuutTPm+4dRkzN6UKrAPkwH7AsQZyZst4755vadvnmTD/wseT2zM2arTv/ouygQYHcZ+dNwhcG0H9jHj3dzba8Nqq7Vbn7jJnvaHDhBPWdvbKRdAkOFF5lINFzP+2i7rew6gUm0mm779FspRhzH9JtPCmLjib03DvRSrEtXXjsIj4GTyChlQWnYJqApflZ1Om3VxhTuEdHLCJghs3tAfyLkZqrwM8S7gPXxCpXoxIgwKEdLS6wSdOou49WylNCRbTm87H3ZR1taid5ZX7kX5L6Hc2nqLtJ9oTTIflwd+ka3C1UN9PQdQT/gYETQDpNCoxPFpEWxDuV4ULZBCt2AmutJLhlaDrFqCtaOrNUnEdAcw64EzTx1sAcVb+TmFsji16U3MeAHWXj5aMQPvuyh8Db2xvPMoeBLJ/7y3nM75Egjlq7+3pExEYcXhbRgi/uJL+2YGfv3rLuTLSj8Knx8Po0aegxYU3FjaEpAIuITv6azLxW5tIx5i2oxELJr3M5MP003fmCb+wy1oz4bgsIpDW8AA9pD15N6FgQQkcZNYmadtJpXvnJ3iT5io/HXt2VkTFv8T3xVFMhQCm+dVPSjncJFmuLYE58Z7LzsepgF/MydnPcUaG6bGTmYQt9Ym179dmsOYi4NNFpavo0hXD7aYml7uc4+/U8L7HcH4ZvBwPtk0mXuvHpynS9zI1OWWVDwm1rlcdF+v18kMoFZqBzvv3w4FuLprU9yXkKCErIPMcTRDJMkhk9RF/Ys4otq7Qi5tvNA18P1x7WOdH4QlJNpaIpVUDWxJQzK/X/zevI2Kb1lIoTOAnr0dYP9TYLafCyqgyza5YtMEcAjRYZvRCz8TqXxWbwUWoxRfjDhJzeRStupnbJH6vE13aLVglwzDp6Sap7h/NKC29PkXIib0/kHyWBj1vVFeYZB0GxYP8CLYHsbJbK6DSj/0v7UJgwPg X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b9a2e5d-33e6-41e5-ca64-08db60801686 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:45.6262 (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: KR9tH5AgYRfqHc29hu4yqIZVR7j8zVSEre7N3txtZURpD3dcJPXZO4FxOqc1hgx0KsgOyZhY4/aKXCUpzphMkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Significant alterations have been made to the EDMA v3's register layout. Now, each channel possesses a separate address space, encapsulating all channel-related controls and statuses, including IRQs. There are changes in bit position definitions as well. However, the fundamental control flow remains analogous to the previous versions. EDMA v3 was utilized in imx8qm, imx93, and will be in forthcoming chips. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.c | 162 +++++++++++++++++++--- drivers/dma/fsl-edma-common.h | 71 +++++++++- drivers/dma/fsl-edma-main.c | 247 ++++++++++++++++++++++++++++++++-- 3 files changed, 452 insertions(+), 28 deletions(-) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index d56b100a8358..66aa1f54204e 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include "fsl-edma-common.h" @@ -66,12 +68,48 @@ void fsl_edma_tx_chan_handler(struct fsl_edma_chan *fsl_chan) spin_unlock(&fsl_chan->vchan.lock); } +static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan) +{ + u32 val, flags; + + flags = fsl_edma_drvflags(fsl_chan); + val = edma_readl_chreg(fsl_chan, ch_sbr); + /* Remote/local swapped wrongly on iMX8 QM Audio edma */ + if (flags & FSL_EDMA_DRV_QUIRK_SWAPPED) { + if (!fsl_chan->is_rxchan) + val |= EDMA_V3_CH_SBR_RD; + else + val |= EDMA_V3_CH_SBR_WR; + } else { + if (fsl_chan->is_rxchan) + val |= EDMA_V3_CH_SBR_RD; + else + val |= EDMA_V3_CH_SBR_WR; + } + + if (fsl_chan->is_remote) + val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR); + + edma_writel_chreg(fsl_chan, val, ch_sbr); + + if ((flags & (FSL_EDMA_DRV_AXI | FSL_EDMA_DRV_HAS_CHMUX)) && + fsl_chan->srcid && !edma_readl_chreg(fsl_chan, ch_mux)) + edma_writel_chreg(fsl_chan, fsl_chan->srcid, ch_mux); + + val = edma_readl_chreg(fsl_chan, ch_csr); + val |= EDMA_V3_CH_CSR_ERQ; + edma_writel_chreg(fsl_chan, val, ch_csr); +} + static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan) { struct edma_regs *regs = &fsl_chan->edma->regs; u32 ch = fsl_chan->vchan.chan.chan_id; - if (fsl_chan->edma->drvdata->version == v1) { + if (fsl_edma_ver(fsl_chan) >= v3) + return fsl_edma3_enable_request(fsl_chan); + + if (fsl_edma_ver(fsl_chan) == v1) { edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), regs->seei); edma_writeb(fsl_chan->edma, ch, regs->serq); } else { @@ -83,12 +121,30 @@ static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan) } } +static void fsl_edma3_disable_request(struct fsl_edma_chan *fsl_chan) +{ + u32 val = edma_readl_chreg(fsl_chan, ch_csr); + u32 flags; + + flags = fsl_edma_drvflags(fsl_chan); + + if ((flags & (FSL_EDMA_DRV_AXI | FSL_EDMA_DRV_HAS_CHMUX)) && + fsl_chan->srcid) + edma_writel_chreg(fsl_chan, 0, ch_mux); + + val &= ~EDMA_V3_CH_CSR_ERQ; + edma_writel_chreg(fsl_chan, val, ch_csr); +} + void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan) { struct edma_regs *regs = &fsl_chan->edma->regs; u32 ch = fsl_chan->vchan.chan.chan_id; - if (fsl_chan->edma->drvdata->version == v1) { + if (fsl_edma_ver(fsl_chan) >= v3) + return fsl_edma3_disable_request(fsl_chan); + + if (fsl_edma_ver(fsl_chan) == v1) { edma_writeb(fsl_chan->edma, ch, regs->cerq); edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), regs->ceei); } else { @@ -186,6 +242,10 @@ int fsl_edma_terminate_all(struct dma_chan *chan) vchan_get_all_descriptors(&fsl_chan->vchan, &head); spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags); vchan_dma_desc_free_list(&fsl_chan->vchan, &head); + + if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_PD) + pm_runtime_allow(fsl_chan->pd_dev); + return 0; } @@ -286,12 +346,16 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, enum dma_transfer_direction dir = edesc->dirn; dma_addr_t cur_addr, dma_addr; size_t len, size; + u32 nbytes = 0; int i; /* calculate the total size in this desc */ - for (len = i = 0; i < fsl_chan->edesc->n_tcds; i++) - len += le32_to_cpu(edesc->tcd[i].vtcd->nbytes) - * le16_to_cpu(edesc->tcd[i].vtcd->biter); + for (len = i = 0; i < fsl_chan->edesc->n_tcds; i++) { + nbytes = le32_to_cpu(edesc->tcd[i].vtcd->nbytes); + if (nbytes & (EDMA_V3_TCD_NBYTES_DMLOE | EDMA_V3_TCD_NBYTES_SMLOE)) + nbytes = EDMA_V3_TCD_NBYTES_MLOFF_NBYTES(nbytes); + len += nbytes * le16_to_cpu(edesc->tcd[i].vtcd->biter); + } if (!in_progress) return len; @@ -303,8 +367,12 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, /* figure out the finished and calculate the residue */ for (i = 0; i < fsl_chan->edesc->n_tcds; i++) { - size = le32_to_cpu(edesc->tcd[i].vtcd->nbytes) - * le16_to_cpu(edesc->tcd[i].vtcd->biter); + nbytes = le32_to_cpu(edesc->tcd[i].vtcd->nbytes); + if (nbytes & (EDMA_V3_TCD_NBYTES_DMLOE | EDMA_V3_TCD_NBYTES_SMLOE)) + nbytes = EDMA_V3_TCD_NBYTES_MLOFF_NBYTES(nbytes); + + size = nbytes * le16_to_cpu(edesc->tcd[i].vtcd->biter); + if (dir == DMA_MEM_TO_DEV) dma_addr = le32_to_cpu(edesc->tcd[i].vtcd->saddr); else @@ -389,13 +457,15 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, } static inline -void fsl_edma_fill_tcd(struct fsl_edma_hw_tcd *tcd, u32 src, u32 dst, +void fsl_edma_fill_tcd(struct fsl_edma_chan *fsl_chan, + struct fsl_edma_hw_tcd *tcd, u32 src, u32 dst, u16 attr, u16 soff, u32 nbytes, u32 slast, u16 citer, u16 biter, u16 doff, u32 dlast_sga, bool major_int, bool disable_req, bool enable_sg) { + struct dma_slave_config *cfg = &fsl_chan->cfg; u16 csr = 0; - + u32 burst; /* * eDMA hardware SGs require the TCDs to be stored in little * endian format irrespective of the register endian model. @@ -409,6 +479,21 @@ void fsl_edma_fill_tcd(struct fsl_edma_hw_tcd *tcd, u32 src, u32 dst, tcd->soff = cpu_to_le16(soff); + if (fsl_chan->is_multi_fifo) { + /* set mloff to support multiple fifo */ + burst = cfg->direction == DMA_DEV_TO_MEM ? + cfg->src_addr_width : cfg->dst_addr_width; + nbytes |= EDMA_V3_TCD_NBYTES_MLOFF(-(burst * 4)); + /* enable DMLOE/SMLOE */ + if (cfg->direction == DMA_MEM_TO_DEV) { + nbytes |= EDMA_V3_TCD_NBYTES_DMLOE; + nbytes &= ~EDMA_V3_TCD_NBYTES_SMLOE; + } else { + nbytes |= EDMA_V3_TCD_NBYTES_SMLOE; + nbytes &= ~EDMA_V3_TCD_NBYTES_DMLOE; + } + } + tcd->nbytes = cpu_to_le32(nbytes); tcd->slast = cpu_to_le32(slast); @@ -427,6 +512,12 @@ void fsl_edma_fill_tcd(struct fsl_edma_hw_tcd *tcd, u32 src, u32 dst, if (enable_sg) csr |= EDMA_TCD_CSR_E_SG; + if (fsl_chan->is_rxchan) + csr |= EDMA_TCD_CSR_ACTIVE; + + if (fsl_chan->is_sw) + csr |= EDMA_TCD_CSR_START; + tcd->csr = cpu_to_le16(csr); } @@ -466,6 +557,7 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic( struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan); struct fsl_edma_desc *fsl_desc; dma_addr_t dma_buf_next; + bool major_int = true; int sg_len, i; u32 src_addr, dst_addr, last_sg, nbytes; u16 soff, doff, iter; @@ -509,17 +601,23 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic( src_addr = dma_buf_next; dst_addr = fsl_chan->dma_dev_addr; soff = fsl_chan->cfg.dst_addr_width; - doff = 0; - } else { + doff = fsl_chan->is_multi_fifo ? 4 : 0; + } else if (direction == DMA_DEV_TO_MEM) { src_addr = fsl_chan->dma_dev_addr; dst_addr = dma_buf_next; - soff = 0; + soff = fsl_chan->is_multi_fifo ? 4 : 0; doff = fsl_chan->cfg.src_addr_width; + } else { + /* DMA_DEV_TO_DEV */ + src_addr = fsl_chan->cfg.src_addr; + dst_addr = fsl_chan->cfg.dst_addr; + soff = doff = 0; + major_int = false; } - fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr, dst_addr, + fsl_edma_fill_tcd(fsl_chan, fsl_desc->tcd[i].vtcd, src_addr, dst_addr, fsl_chan->attr, soff, nbytes, 0, iter, - iter, doff, last_sg, true, false, true); + iter, doff, last_sg, major_int, false, true); dma_buf_next += period_len; } @@ -568,23 +666,51 @@ struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg( dst_addr = fsl_chan->dma_dev_addr; soff = fsl_chan->cfg.dst_addr_width; doff = 0; - } else { + } else if (direction == DMA_DEV_TO_MEM) { src_addr = fsl_chan->dma_dev_addr; dst_addr = sg_dma_address(sg); soff = 0; doff = fsl_chan->cfg.src_addr_width; + } else { + /* DMA_DEV_TO_DEV */ + src_addr = fsl_chan->cfg.src_addr; + dst_addr = fsl_chan->cfg.dst_addr; + soff = 0; + doff = 0; } + /* + * Choose the suitable burst length if sg_dma_len is not + * multiple of burst length so that the whole transfer length is + * multiple of minor loop(burst length). + */ + if (sg_dma_len(sg) % nbytes) { + u32 width = (direction == DMA_DEV_TO_MEM) ? doff : soff; + u32 burst = (direction == DMA_DEV_TO_MEM) ? + fsl_chan->cfg.src_maxburst : + fsl_chan->cfg.dst_maxburst; + int j; + + for (j = burst; j > 1; j--) { + if (!(sg_dma_len(sg) % (j * width))) { + nbytes = j * width; + break; + } + } + /* Set burst size as 1 if there's no suitable one */ + if (j == 1) + nbytes = width; + } iter = sg_dma_len(sg) / nbytes; if (i < sg_len - 1) { last_sg = fsl_desc->tcd[(i + 1)].ptcd; - fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr, + fsl_edma_fill_tcd(fsl_chan, fsl_desc->tcd[i].vtcd, src_addr, dst_addr, fsl_chan->attr, soff, nbytes, 0, iter, iter, doff, last_sg, false, false, true); } else { last_sg = 0; - fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr, + fsl_edma_fill_tcd(fsl_chan, fsl_desc->tcd[i].vtcd, src_addr, dst_addr, fsl_chan->attr, soff, nbytes, 0, iter, iter, doff, last_sg, true, true, false); @@ -609,7 +735,7 @@ struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan, fsl_chan->is_sw = true; /* To match with copy_align and max_seg_size so 1 tcd is enough */ - fsl_edma_fill_tcd(fsl_desc->tcd[0].vtcd, dma_src, dma_dst, + fsl_edma_fill_tcd(fsl_chan, fsl_desc->tcd[0].vtcd, dma_src, dma_dst, fsl_edma_get_tcd_attr(DMA_SLAVE_BUSWIDTH_32_BYTES), 32, len, 0, 1, 1, 32, 0, true, true, false); diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 991408d59e3e..656ba3591898 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -42,6 +42,11 @@ #define EDMA_TCD_CSR_ACTIVE BIT(6) #define EDMA_TCD_CSR_DONE BIT(7) +#define EDMA_V3_TCD_NBYTES_MLOFF_NBYTES(x) ((x) & GENMASK(9, 0)) +#define EDMA_V3_TCD_NBYTES_MLOFF(x) (x << 10) +#define EDMA_V3_TCD_NBYTES_DMLOE (1 << 30) +#define EDMA_V3_TCD_NBYTES_SMLOE (1 << 31) + #define EDMAMUX_CHCFG_DIS 0x0 #define EDMAMUX_CHCFG_ENBL 0x80 #define EDMAMUX_CHCFG_SOURCE(n) ((n) & 0x3F) @@ -54,6 +59,15 @@ BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \ BIT(DMA_SLAVE_BUSWIDTH_8_BYTES)) + +#define EDMA_V3_CH_SBR_RD BIT(22) +#define EDMA_V3_CH_SBR_WR BIT(21) +#define EDMA_V3_CH_CSR_ERQ BIT(0) +#define EDMA_V3_CH_CSR_EARQ BIT(1) +#define EDMA_V3_CH_CSR_EEI BIT(2) +#define EDMA_V3_CH_CSR_DONE BIT(30) +#define EDMA_V3_CH_CSR_ACTIVE BIT(31) + enum fsl_edma_pm_state { RUNNING = 0, SUSPENDED, @@ -73,6 +87,18 @@ struct fsl_edma_hw_tcd { __le16 biter; }; +struct fsl_edma3_ch_reg { + __le32 ch_csr; + __le32 ch_es; + __le32 ch_int; + __le32 ch_sbr; + __le32 ch_pri; + __le32 ch_mux; + __le32 ch_mattr; /* edma4, reserved for edma3 */ + __le32 ch_reserved; + struct fsl_edma_hw_tcd tcd; +} __packed; + /* * These are iomem pointers, for both v32 and v64. */ @@ -119,6 +145,18 @@ struct fsl_edma_chan { enum dma_data_direction dma_dir; char chan_name[32]; struct fsl_edma_hw_tcd __iomem *tcd; + u32 real_count; + struct work_struct issue_worker; + struct platform_device *pdev; + struct device *pd_dev; + u32 srcid; + struct clk *clk; + int priority; + int hw_chanid; + int txirq; + bool is_rxchan; + bool is_remote; + bool is_multi_fifo; }; struct fsl_edma_desc { @@ -131,16 +169,27 @@ struct fsl_edma_desc { }; enum edma_version { - v1, /* 32ch, Vybrid, mpc57x, etc */ + v1, /* 32ch, Vybrid, mpc57x, imx7ulp etc */ v2, /* 64ch Coldfire */ + v3, /* imx8qm, imx8qxp, imx93 edma3 */ + v4, /* imx93 edma4 */ }; #define FSL_EDMA_DRV_HAS_DMACLK BIT(0) #define FSL_EDMA_DRV_MUX_SWAP BIT(1) #define FSL_EDMA_DRV_CONFIG32 BIT(2) +#define FSL_EDMA_DRV_HAS_PD BIT(3) +#define FSL_EDMA_DRV_HAS_CHCLK BIT(4) +#define FSL_EDMA_DRV_HAS_CHMUX BIT(5) +/* imx8 QM audio edma remote local swapped */ +#define FSL_EDMA_DRV_QUIRK_SWAPPED BIT(6) +#define FSL_EDMA_DRV_AXI BIT(7) + struct fsl_edma_drvdata { enum edma_version version; u32 dmamuxs; + u32 chreg_off; + u32 chreg_space_sz; u32 flags; int (*setup_irq)(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma); @@ -152,6 +201,7 @@ struct fsl_edma_engine { void __iomem *muxbase[DMAMUX_NR]; struct clk *muxclk[DMAMUX_NR]; struct clk *dmaclk; + struct clk *chclk; struct mutex fsl_edma_mutex; const struct fsl_edma_drvdata *drvdata; u32 n_chans; @@ -159,6 +209,7 @@ struct fsl_edma_engine { int errirq; bool big_endian; struct edma_regs regs; + u64 chan_masked; struct fsl_edma_chan chans[]; }; @@ -172,6 +223,14 @@ struct fsl_edma_engine { edma_writel(chan->edma, (u32 __force)val, &chan->tcd->__name) : \ edma_writew(chan->edma, (u16 __force)val, &chan->tcd->__name)) +#define edma_readl_chreg(chan, __name) \ + edma_readl(chan->edma, \ + (void __iomem *)&(container_of(chan->tcd, struct fsl_edma3_ch_reg, tcd)->__name)) + +#define edma_writel_chreg(chan, val, __name) \ + edma_writel(chan->edma, val, \ + (void __iomem *)&(container_of(chan->tcd, struct fsl_edma3_ch_reg, tcd)->__name)) + /* * R/W functions for big- or little-endian registers: * The eDMA controller's endian is independent of the CPU core's endian. @@ -228,6 +287,16 @@ static inline struct fsl_edma_chan *to_fsl_edma_chan(struct dma_chan *chan) return container_of(chan, struct fsl_edma_chan, vchan.chan); } +static inline int fsl_edma_ver(struct fsl_edma_chan *fsl_chan) +{ + return fsl_chan->edma->drvdata->version; +} + +static inline u32 fsl_edma_drvflags(struct fsl_edma_chan *fsl_chan) +{ + return fsl_chan->edma->drvdata->flags; +} + static inline struct fsl_edma_desc *to_fsl_edma_desc(struct virt_dma_desc *vd) { return container_of(vd, struct fsl_edma_desc, vdesc); diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 8d1d0100f6e6..db50d2fadb0f 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -18,9 +18,15 @@ #include #include #include +#include +#include #include "fsl-edma-common.h" +#define ARGS_RX BIT(0) +#define ARGS_REMOTE BIT(1) +#define ARGS_MULTI_FIFO BIT(2) + static void fsl_edma_synchronize(struct dma_chan *chan) { struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan); @@ -47,6 +53,22 @@ static irqreturn_t fsl_edma_tx_handler(int irq, void *dev_id) return IRQ_HANDLED; } +static irqreturn_t fsl_edma3_tx_handler(int irq, void *dev_id) +{ + struct fsl_edma_chan *fsl_chan = dev_id; + unsigned int intr; + + intr = edma_readl_chreg(fsl_chan, ch_int); + if (!intr) + return IRQ_HANDLED; + + edma_writel_chreg(fsl_chan, 1, ch_int); + + fsl_edma_tx_chan_handler(fsl_chan); + + return IRQ_HANDLED; +} + static irqreturn_t fsl_edma_err_handler(int irq, void *dev_id) { struct fsl_edma_engine *fsl_edma = dev_id; @@ -108,6 +130,52 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec, return NULL; } +static struct dma_chan *fsl_edma3_xlate(struct of_phandle_args *dma_spec, + struct of_dma *ofdma) +{ + struct fsl_edma_engine *fsl_edma = ofdma->of_dma_data; + struct dma_chan *chan, *_chan; + struct fsl_edma_chan *fsl_chan; + int i; + + if (dma_spec->args_count != 3) + return NULL; + + mutex_lock(&fsl_edma->fsl_edma_mutex); + list_for_each_entry_safe(chan, _chan, &fsl_edma->dma_dev.channels, + device_node) { + + if (chan->client_count) + continue; + + fsl_chan = to_fsl_edma_chan(chan); + i = fsl_chan - fsl_edma->chans; + if (fsl_edma->drvdata->dmamuxs == 0 && i == dma_spec->args[0]) { + chan = dma_get_slave_channel(chan); + chan->device->privatecnt++; + fsl_chan->priority = dma_spec->args[1]; + fsl_chan->is_rxchan = dma_spec->args[2] & ARGS_RX; + fsl_chan->is_remote = dma_spec->args[2] & ARGS_REMOTE; + fsl_chan->is_multi_fifo = dma_spec->args[2] & ARGS_MULTI_FIFO; + mutex_unlock(&fsl_edma->fsl_edma_mutex); + return chan; + } else if ((fsl_edma->drvdata->dmamuxs || + (fsl_edma->drvdata->flags & FSL_EDMA_DRV_AXI)) && !fsl_chan->srcid) { + chan = dma_get_slave_channel(chan); + chan->device->privatecnt++; + fsl_chan->priority = dma_spec->args[1]; + fsl_chan->srcid = dma_spec->args[0]; + fsl_chan->is_rxchan = dma_spec->args[2] & ARGS_RX; + fsl_chan->is_remote = dma_spec->args[2] & ARGS_REMOTE; + fsl_chan->is_multi_fifo = dma_spec->args[2] & ARGS_MULTI_FIFO; + mutex_unlock(&fsl_edma->fsl_edma_mutex); + return chan; + } + } + mutex_unlock(&fsl_edma->fsl_edma_mutex); + return NULL; +} + static int fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) { @@ -149,6 +217,37 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma return 0; } +static int fsl_edma3_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) +{ + int ret; + int i; + + for (i = 0; i < fsl_edma->n_chans; i++) { + + struct fsl_edma_chan *fsl_chan = &fsl_edma->chans[i]; + + if (fsl_edma->chan_masked & BIT(i)) + continue; + + /* request channel irq */ + fsl_chan->txirq = platform_get_irq(pdev, i); + if (fsl_chan->txirq < 0) { + dev_err(&pdev->dev, "Can't get chan %d's irq.\n", i); + return -EINVAL; + } + + ret = devm_request_irq(&pdev->dev, fsl_chan->txirq, + fsl_edma3_tx_handler, IRQF_SHARED, + fsl_chan->chan_name, fsl_chan); + if (ret) { + dev_err(&pdev->dev, "Can't register chan%d's IRQ.\n", i); + return -EINVAL; + } + } + + return 0; +} + static int fsl_edma2_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) @@ -203,12 +302,16 @@ static void fsl_disable_clocks(struct fsl_edma_engine *fsl_edma, int nr_clocks) static struct fsl_edma_drvdata vf610_data = { .version = v1, .dmamuxs = DMAMUX_NR, + .chreg_off = EDMA_TCD, + .chreg_space_sz = sizeof(struct fsl_edma_hw_tcd), .setup_irq = fsl_edma_irq_init, }; static struct fsl_edma_drvdata ls1028a_data = { .version = v1, .dmamuxs = DMAMUX_NR, + .chreg_off = EDMA_TCD, + .chreg_space_sz = sizeof(struct fsl_edma_hw_tcd), .flags = FSL_EDMA_DRV_MUX_SWAP, .setup_irq = fsl_edma_irq_init, }; @@ -216,18 +319,100 @@ static struct fsl_edma_drvdata ls1028a_data = { static struct fsl_edma_drvdata imx7ulp_data = { .version = v1, .dmamuxs = 1, + .chreg_off = EDMA_TCD, + .chreg_space_sz = sizeof(struct fsl_edma_hw_tcd), .flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_CONFIG32, .setup_irq = fsl_edma2_irq_init, }; +static struct fsl_edma_drvdata imx8qm_data = { + .version = v3, + .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_PD, + .chreg_space_sz = 0x10000, + .chreg_off = 0x10000, + .setup_irq = fsl_edma3_irq_init, +}; + +static struct fsl_edma_drvdata imx8qm_audio_data = { + .version = v3, + .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_QUIRK_SWAPPED | + FSL_EDMA_DRV_HAS_PD, + .chreg_space_sz = 0x10000, + .chreg_off = 0x10000, + .setup_irq = fsl_edma3_irq_init, +}; + +static struct fsl_edma_drvdata imx93_data3 = { + .version = v3, + .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK, + .chreg_space_sz = 0x10000, + .chreg_off = 0x10000, + .setup_irq = fsl_edma3_irq_init, +}; + +static struct fsl_edma_drvdata imx93_data4 = { + .version = v4, + .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_DMACLK, + .chreg_space_sz = 0x8000, + .chreg_off = 0x10000, + .setup_irq = fsl_edma3_irq_init, +}; + static const struct of_device_id fsl_edma_dt_ids[] = { { .compatible = "fsl,vf610-edma", .data = &vf610_data}, { .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data}, { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data}, + { .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data}, + { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data}, + { .compatible = "fsl,imx93-edma3", .data = &imx93_data3}, + { .compatible = "fsl,imx93-edma4", .data = &imx93_data4}, { /* sentinel */ } }; + MODULE_DEVICE_TABLE(of, fsl_edma_dt_ids); +static int fsl_edma3_attach_pd(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) +{ + struct fsl_edma_chan *fsl_chan; + struct device_link *link; + struct device *pd_chan; + struct device *dev; + int i; + + dev = &pdev->dev; + + for (i = 0; i < fsl_edma->n_chans; i++) { + if (fsl_edma->chan_masked & BIT(i)) + continue; + + fsl_chan = &fsl_edma->chans[i]; + + pd_chan = dev_pm_domain_attach_by_id(dev, i); + if (IS_ERR_OR_NULL(pd_chan)) { + dev_err(dev, "Failed attach pd %d\n", i); + return -EINVAL; + } + + link = device_link_add(dev, pd_chan, DL_FLAG_STATELESS | + DL_FLAG_PM_RUNTIME | + DL_FLAG_RPM_ACTIVE); + if (IS_ERR(link)) { + dev_err(dev, "Failed to add device_link to %d: %ld\n", i, + PTR_ERR(link)); + return -EINVAL; + } + + fsl_chan->pd_dev = pd_chan; + + pm_runtime_use_autosuspend(fsl_chan->pd_dev); + pm_runtime_set_autosuspend_delay(fsl_chan->pd_dev, 200); + pm_runtime_set_active(fsl_chan->pd_dev); + //pm_runtime_put_sync_suspend(fsl_chan->pd_dev); + } + + return 0; +} + static int fsl_edma_probe(struct platform_device *pdev) { const struct of_device_id *of_id = @@ -266,8 +451,10 @@ static int fsl_edma_probe(struct platform_device *pdev) if (IS_ERR(fsl_edma->membase)) return PTR_ERR(fsl_edma->membase); - fsl_edma_setup_regs(fsl_edma); - regs = &fsl_edma->regs; + if (drvdata->version < v3) { + fsl_edma_setup_regs(fsl_edma); + regs = &fsl_edma->regs; + } if (drvdata->flags & FSL_EDMA_DRV_HAS_DMACLK) { fsl_edma->dmaclk = devm_clk_get_enabled(&pdev->dev, "dma"); @@ -277,6 +464,17 @@ static int fsl_edma_probe(struct platform_device *pdev) } } + if (drvdata->flags & FSL_EDMA_DRV_HAS_CHCLK) { + fsl_edma->chclk = devm_clk_get_enabled(&pdev->dev, "mp"); + if (IS_ERR(fsl_edma->chclk)) { + dev_err(&pdev->dev, "Missing MP block clock.\n"); + return PTR_ERR(fsl_edma->chclk); + } + } + + if (of_property_read_u64(np, "fsl,channel-mask", &fsl_edma->chan_masked)) + fsl_edma->chan_masked = 0; + for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) { char clkname[32]; @@ -299,9 +497,18 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_edma->big_endian = of_property_read_bool(np, "big-endian"); + if (drvdata->flags & FSL_EDMA_DRV_HAS_PD) { + ret = fsl_edma3_attach_pd(pdev, fsl_edma); + if (ret) + return ret; + } + INIT_LIST_HEAD(&fsl_edma->dma_dev.channels); for (i = 0; i < fsl_edma->n_chans; i++) { - struct fsl_edma_chan *fsl_chan = &fsl_edma->chans[i]; + fsl_chan = &fsl_edma->chans[i]; + + if (fsl_edma->chan_masked & BIT(i)) + continue; snprintf(fsl_chan->chan_name, sizeof(fsl_chan->chan_name), "%s-CH%02d", dev_name(&pdev->dev), i); @@ -312,12 +519,18 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_chan->idle = true; fsl_chan->dma_dir = DMA_NONE; fsl_chan->vchan.desc_free = fsl_edma_free_desc; - fsl_chan->tcd = fsl_edma->membase + EDMA_TCD - + i * sizeof(struct fsl_edma_hw_tcd); + + len = (fsl_edma_ver(fsl_chan) >= v3) ? offsetof(struct fsl_edma3_ch_reg, tcd) : 0; + fsl_chan->tcd = fsl_edma->membase + + i * drvdata->chreg_space_sz + drvdata->chreg_off + len; + + fsl_chan->pdev = pdev; vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev); edma_write_tcdreg(fsl_chan, 0, csr); - fsl_edma_chan_mux(fsl_chan, 0, false); + + if (drvdata->dmamuxs) + fsl_edma_chan_mux(fsl_chan, 0, false); } ret = fsl_edma->drvdata->setup_irq(pdev, fsl_edma); @@ -347,12 +560,25 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_edma->dma_dev.src_addr_widths = FSL_EDMA_BUSWIDTHS; fsl_edma->dma_dev.dst_addr_widths = FSL_EDMA_BUSWIDTHS; + + if (drvdata->version >= v3) { + fsl_edma->dma_dev.src_addr_widths |= BIT(DMA_SLAVE_BUSWIDTH_8_BYTES); + fsl_edma->dma_dev.dst_addr_widths |= BIT(DMA_SLAVE_BUSWIDTH_8_BYTES); + } + fsl_edma->dma_dev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); + if (drvdata->version >= v3) + fsl_edma->dma_dev.directions |= BIT(DMA_DEV_TO_DEV); + + fsl_edma->dma_dev.copy_align = drvdata->version >= v3 ? + DMAENGINE_ALIGN_64_BYTES : + DMAENGINE_ALIGN_32_BYTES; - fsl_edma->dma_dev.copy_align = DMAENGINE_ALIGN_32_BYTES; /* Per worst case 'nbytes = 1' take CITER as the max_seg_size */ dma_set_max_seg_size(fsl_edma->dma_dev.dev, 0x3fff); + fsl_edma->dma_dev.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT; + platform_set_drvdata(pdev, fsl_edma); ret = dma_async_device_register(&fsl_edma->dma_dev); @@ -362,7 +588,9 @@ static int fsl_edma_probe(struct platform_device *pdev) return ret; } - ret = of_dma_controller_register(np, fsl_edma_xlate, fsl_edma); + ret = of_dma_controller_register(np, + drvdata->version < v3 ? fsl_edma_xlate : fsl_edma3_xlate, + fsl_edma); if (ret) { dev_err(&pdev->dev, "Can't register Freescale eDMA of_dma. (%d)\n", ret); @@ -371,7 +599,8 @@ static int fsl_edma_probe(struct platform_device *pdev) } /* enable round robin arbitration */ - edma_writel(fsl_edma, EDMA_CR_ERGA | EDMA_CR_ERCA, regs->cr); + if (drvdata->version < v3) + edma_writel(fsl_edma, EDMA_CR_ERGA | EDMA_CR_ERCA, regs->cr); return 0; } From patchwork Mon May 29 20:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258937 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8940C7EE23 for ; Mon, 29 May 2023 20:08:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229925AbjE2UIH (ORCPT ); Mon, 29 May 2023 16:08:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbjE2UIB (ORCPT ); Mon, 29 May 2023 16:08:01 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::626]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46D7CE4D; Mon, 29 May 2023 13:07:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CYvi4RmRyv9qyxM51udxVgsIyftrBVHLM9wKJa+WhgtDgMkO2YYp2UzhRtozbamwQcBb6PVKpQlOP3//DsCeepOxdGyEK6zznawlMIZ3P1s8cqWoFStjaKKo0Zp/BX/cBSw828JeFHfoMQP/iMB3eI4wFWSN5sCSQffq3k0odkLfmlUuznMEaQTmt21+zaruBIa8FhSGfX4wiVPyDNaj0W68qKe8PY/QfUBgdpP7laS2u6UJ0IjsYj7362xCscbyCA8Q/2h/Qw+2fygXalJYBIdZlWGujJSmlSN9sIyT1bucfRATIEzevLeeUFewehkaoXPvmYHdmNJmYwbjo/LRUA== 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=dgetTr4ykw1iDiXNNcefnB4/26WvmVRYD6yME8KkHrA=; b=Jzsd/WiYA7K9urAfN1EvUIJ4M8W/Fh/xHST1hrvxygoa+mtwWFdwRbkagsG1oRepGjyMQ5PPj9p9ydKnj9CbgHhhKdYst3czSJKhUfhWBhgztgyIfZcAE9vohQu/1aspmQKI0suVxxZqQfAudzDiNge0Q/J1jpDSnXRk1Ie+kdKhodMk2jXlTY30IhFcoG9btdZScLuvD8oU9jW2fEaIb64oRJQx0pZVrtb1Wr0EVxNkVPq6VTZ3sLq7cc/HGVxV/QQGXuu6RuoJi+lF4NpmV7AczjD5anCx46JVdIkgFIy//9/b/bZYyP9euCBsd/1TAbXbOsOLA0HPsEz03I1j5w== 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=dgetTr4ykw1iDiXNNcefnB4/26WvmVRYD6yME8KkHrA=; b=i7SabrIN7DyS8dBMXUiK2ooGQveiGNkJ0Cay5nCRy5ciba/53AzowOeO1NCxITw+XQT/1empvzcQMBz4xlWNXFrwHGkfMteOgm1KCFWY6zneXs9tCaMNUP//eY/vdoZEQvru0MPHtHZatHOtpFXOCXi4d4HRoMTrEUr4/qaHXpU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:48 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:48 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 12/12] dt-bindings: fsl-dma: fsl-edma: add edma3 compatible string Date: Mon, 29 May 2023 16:04:53 -0400 Message-Id: <20230529200453.1423796-13-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fac67c1-b041-4573-210c-08db6080186d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 882cygeA9s6Tgfyn7XkUVvfotpTcH8BStM6/p05QNbGISGP/614upcrtnmwKeMQHHghezrGl0apEDNy+XkDNzdjnm1/+5QPIFpjqnRFS4fgg9P68FNznBCQsA2hyeAbn2fHFoovT75eQlRAvd0hD4o5/bznjCXjU9FXrxGB14aTWLXCLuaW8xGkHC05vBPlbpD1/VBbduUIV95oDx1u1Ny8ZgN/4gmXWxSqhB46IeR2NkQksxb9HVjEMUPL2maHe9zNs/TxvA6RLVSEYKA3/8CRNDZaBgt3jCjkuMhZqvLB8JRr1Nc7YvWUMfiUhbbHuqKn2DiElxOa/dEA/NHu7wqOnEMwKuk84KmkYxcb5q8nerwivpP872V7xRZh6cezQRe4asoFtaLOqSCxBpiR97lumQibNe1q/e1B7eikEI+uL1lN+3BNBXSC8W+jYzDK44ix45qPDhdKgM3gZ1smOdjBVmoc6S9688NJ6s0d+e2btE4g0LOt/JVWqFzYYgE1gTbnbJIpOM0oMHUMYaYwreG61fQvvpda4AomQRCCYm6CHmP0L6B/RlfyDWR62tmOepSuy22W/xpDZP+i2WNM1wG8rUrVK+/hPz5lVCGn6ZrVdQEwwlApoz39bsusYXNIe X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HBUfip0C/JKmyL7voESzLnFuoAl/gZN7a8pyuEoKPF65NxIN1KGH+qOgBR+fYIf2CrCU+TWVJ3E/+rabmjJX80jbGU6l8OowBxf7AK4D8FDjTKSs2pQgT0p3p7wFInKPPHDNTxFkLOaZPUT93345BscQQWzV8Ob4s5C/AVJmc+a7zQlTTFQT0oQvMMRUVzJjZjnO2Qm38VSPlpFOnWpOAIQMbE0k3KRoCnv2r8oGobINjZ2KWwA5Q+3TG+FADYA3KmgjUfrqINd4BTJeivGR59gSotymEcQBrIINi/6TgDlkCbjB87psOUYz7KBX7iDiCS399mOiW2YHZSwALaUoIHlQWYxt5EdETC+QvnHDgqXmtajkeEHZpwpkeTWcxRLcGKAisAt2cn0FEaND1Fw7Y7thmsvYTPmrHynSYxerRELY01CrXMdvi2LZjn7snpXAYIEVCEk/uSyx0wnod42Q1PR+82AZn/V3RndYmAxbxregmsm1+LOl4Gw3CFi/Rr+8F5ulcEdiIZZp6FN6XFjQV66wwXMbCLT04jT3zbghAWt/+MkYFiUo6t4shzNs+JREomfTqIh/Banj8CH/iG7hmWKD7LHVSRxU0+5e9BjWRuny61j/p1kla2ACLobOq1KPFYZIMwlfICIjGBvsA60BG1dn7Gw1OoAWDZkAPvWi011ru/G8/VC4iGZIrjo3A4SwTqVmu3OCM96nJuJv80RILeiO4vTYjFaf1mns31qazHj06n5wps7jqW5posDaI/3/lk7Andxq/UowYwzGN6qJ1knR0BZT0lNKcwECEmc0UslXDeLnU2KZBU9aZUqpb19KDY6qOnYyoUCEijC9RB3RUvHBSnBt7b4knmoXFU5eir0D5QmRXMpkhuTjOcdG2fDOZj8xqM84YL15DTilvTC+0vML3AWs3Rdh3lsQ9t8xHUf0yGnqqr9XLXye98arVUoh4lvB+k7P6pPPBxvn4IVSr95Xv4ir/2amZ8wLYgU3WilV0h7Njm2fYuBwGOMsBduklMdNxTVm+uGBRhmvsuIBEds4sd4CnC/P2T7pnpxeefsTWsc1arBgBB0thqt8SgMdswDis24LiqCRKZz0gy6c0ZMLRmcYuwFyf3q8Je1MWVQRXX+QCh1v3B0K21QepUYRWRxps1q4U7iA7nuyChkpkqowo41Suj//TP7fpyT9FSCRgZZwmXGL17KB7etlk9GMwK/FExxqr59PhsLh71AMGNl+wL68OBFTuFzVCjzSOv6t4W8/dSvuW5TRm90cfnmRgT09HfejUX+zuxWOGdWx6R87kB0rkx95y4gBCFD/c5xUg3xUSfO5b0+R4sXYNQVbKsXBr6BCnVXo/tCXKbKJJWZn+2ZDXK7DNr40SG9pBxNZbWojk6t6RFMH72Isb2+q4ZBMdNy2yJ/CuNIaUPRSNdDSlzkwcvVbqRueJk9WA8Cx+GluJCM34U+VZecfBEaVyEgMpV3IdOoB2OSTVoFr0RjhPxKmxRdVPri5pcPpLQoPfN8Em9zzRlVa7gcnCTVLETdZK58WZY/GF8VAbijTGQvzfEh5eOJCHnO/UyZiZCFTg2bbOK8xQ0lgDTz27bKJ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fac67c1-b041-4573-210c-08db6080186d X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:48.6682 (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: c/q4SVP2d0ZwpncMtSNX0iHzTvnI4yRhFtlnz+NDPukjnk+dvDZuAAdeXA6bsdsdiDt339XvWVJymduQR1SJ7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Extend Freescale eDMA driver bindings to support eDMA3 IP blocks in i.MX8QM and i.MX8QXP SoCs. In i.MX93, both eDMA3 and eDMA4 are now. Signed-off-by: Frank Li --- .../devicetree/bindings/dma/fsl,edma.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml index 5fd8fc604261..eed12687b0c9 100644 --- a/Documentation/devicetree/bindings/dma/fsl,edma.yaml +++ b/Documentation/devicetree/bindings/dma/fsl,edma.yaml @@ -21,6 +21,10 @@ properties: - enum: - fsl,vf610-edma - fsl,imx7ulp-edma + - fsl,imx8qm-edma + - fsl,imx8qm-adma + - fsl,imx93-edma3 + - fsl,imx93-edma4 - items: - const: fsl,ls1028a-edma - const: fsl,vf610-edma @@ -101,6 +105,22 @@ allOf: reg: maxItems: 2 + - if: + properties: + compatible: + contains: + anyOf: + - const: fsl,imx8qm-edma + - const: fsl,imx8qm-adma + - const: fsl,imx93-edma3 + - const: fsl,imx93-edma4 + then: + properties: + reg: + maxItems: 1 + interrupts: + maxItems: 64 + unevaluatedProperties: false examples: