From patchwork Tue Feb 27 17:21:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 207339 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2846542dyb; Tue, 27 Feb 2024 09:25:55 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWXWqL21mQXJ1jVG9ooG2HIcPYqZRttbFAaQGnfe3543M7E4FXPlRZ9azub+fFyvMnb/ZcgTO5f3ZhEpDzPCJU1xv4DJA== X-Google-Smtp-Source: AGHT+IHIm3eKevV6jroNjtRrgNRQ3WTCr5hJowWiZJjxa4tEsJHCfncJ0q7Jje3/bhjWmvJr6c5i X-Received: by 2002:a05:6359:4124:b0:17b:b55b:709b with SMTP id kh36-20020a056359412400b0017bb55b709bmr3539008rwc.17.1709054754829; Tue, 27 Feb 2024 09:25:54 -0800 (PST) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id ge7-20020a05621427c700b0068f3602c8b9si7888593qvb.40.2024.02.27.09.25.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 09:25:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-83705-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=hOZ53IHf; arc=fail (signature failed); spf=pass (google.com: domain of linux-kernel+bounces-83705-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-83705-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 81CF21C2343E for ; Tue, 27 Feb 2024 17:25:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4AADC14EFEB; Tue, 27 Feb 2024 17:22:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="hOZ53IHf" Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2070.outbound.protection.outlook.com [40.107.22.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5C874EB23; Tue, 27 Feb 2024 17:22:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709054538; cv=fail; b=QmNfhGKwhepzQ3Xpn9z6yvOa5My9CoqA54EIgUYo9Z7tm+L1ZxpAqb9pfT9QptGxE5a3miWvFvZ0kYWCSuLMIpZwbRS9LuhS8e4qbsT2TfEXZkSYDbWPX/UhTwNeNadMMu/o+6WA2zbjzQqO1yM0y5lwcHroec0uHqeVrSa5PS8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709054538; c=relaxed/simple; bh=r+SX1BIbt/a8XXIeUpEhiy0sFQzztcqic+7HKpVi/bY=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=neJ38x96EBTEpEt9As2V3v7CYP9/tIbeJiX961M8IHdiaqx0tCzzhPzicj0DI6BWe4T9tWw6XM81+F0SUr1MP2mk6NF3XyUk1f0GJMS90K76yTohAT8Gob8Q/WidUkZaQ5Q9+7BWAhxeP9d/7n7+CdTmffGEHL0GQ77mPeq4gFk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=hOZ53IHf; arc=fail smtp.client-ip=40.107.22.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oMm7C/0q/z53RCQF8LxWNpkX53U+23LcPOOIvum5xlIZSDKmmEuP1scYmAYm20hC16+iyXHBYgA0HXugFB4PpEVbso/8z7gwVyr2NT3bYuGVKlXHx/qRCEnnZr4cUxJEe9J9SfuvjS8+i/FaDdFjaKRr/0zfpDqvwkKv7YcjicentKFcD+UTqbQ0dB+bkxx7fXQgFYlYvArqCan+osT269boAmgONMXkwnQUx97Nek/rqQeVfBktVkLVxA6dZM0M/QzSn3l/2H4WoNarC5I9hY+eZ3z2cGLqc47dJOhhmGAUkKWO+iwK/lE4iIjRMr5Dg2LwtBVu/nIXPwTHTno9Nw== 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=77nLzVLA9I6azS70HtRDarrsUyxHIO7L2AnlMIBiP9U=; b=FncyTObRvPgdrCSI6L2rU6EcrtjoIh3Oy3GAeT1/XImUApPx7jctd7+4J0fWhVd5yt2vctnngVgATI2ZcH4DfxK55fb21ERbe5wYwteLPCTxLFExo2DJVdNeSwupp+3hqxZjYTHKVqEgOm2MCTPrqKq7HcupCHG/5I5yApbEj4931QlHA07Z7KH+DdtSphedg/AZMWrXobNQzqrC5Yg+F8RiB79uDLU+MglRfZ2GpFVt97zx2/crR0ue0U1Pu1Z7MMX+vL/J7ExTfJUeke7JR4vVltmlvxtmYJ+/XnT85T84okPHeCF8/zLe348sE/gV/WIbedJEXeZssqai/iB/Aw== 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=77nLzVLA9I6azS70HtRDarrsUyxHIO7L2AnlMIBiP9U=; b=hOZ53IHfEarTtclBOExSaivWb6YlwLCkr5rQjLatU5+MuxOveU9OuYPfApbc2lOBVR8jZL/WY2TQLrqbShaiGqQocLM6PsRMMWbOA6k/dWEPhSX50DS21e929olOpg2w92nuLx9ITDfOI3C10sRzJON4fEE4izdcPBpUpobQ9PM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by AS5PR04MB9754.eurprd04.prod.outlook.com (2603:10a6:20b:654::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.27; Tue, 27 Feb 2024 17:22:15 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Tue, 27 Feb 2024 17:22:15 +0000 From: Frank Li Date: Tue, 27 Feb 2024 12:21:53 -0500 Subject: [PATCH 1/5] dmaengine: fsl-edma: remove 'slave_id' from fsl_edma_chan Message-Id: <20240227-8ulp_edma-v1-1-7fcfe1e265c2@nxp.com> References: <20240227-8ulp_edma-v1-0-7fcfe1e265c2@nxp.com> In-Reply-To: <20240227-8ulp_edma-v1-0-7fcfe1e265c2@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709054529; l=2161; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=r+SX1BIbt/a8XXIeUpEhiy0sFQzztcqic+7HKpVi/bY=; b=cfGe/Z3C5UnFeJImNZ+LXU4oZem9gGgPsVBDA5wtpcW/s/FDzBRM9a1qPbyYHdTnFViuclkiX YamgA3epya5AntarmvHrkIA44CiEvkylBjbz+ghk0tMmNDcWXVpNdPo X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0059.namprd13.prod.outlook.com (2603:10b6:a03:2c2::34) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AS5PR04MB9754:EE_ X-MS-Office365-Filtering-Correlation-Id: 4493227c-4ded-4eeb-569f-08dc37b8a42a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nB5yQdgBObp/kGZlX7IoRk6NszQtfwlJMqFXCjZhhIqy5uHX1JmzPvUX2Z6V3wKQx6BU5K/GurCWk7CI9FlgMKfMKG3NVjXxxPiK8kJuh6EyccbuG9e7tGYRO3qMgG/TtvBsUyLoMtdmdxaVR7zmx9TuXOrAQ08j83LcEOW7njVLmGmmRVMKN7qlkfgXW3B2ERsjySAPyonShcbEZ+OEZu8GmZfu2C7f7S+cHtylj/muEtSZ5M1zsib6EougKuqSFlf0HaOkjqHy+9J+hAeBBS4kZyfwtb1DhJBMAgoIkB5tOcPZqCeYufg8olWKuHOldOrWOuq5+Bax0+F7HkhLiYUxbFJczlp+kKTw6A/UUA2nxBuXpnOt1rKA6psMHbErzd5Qhm1gELQ3+NUpTMWbOKko1vGBgq9dEV9bb12Dov0QI5OoLIw+1+YiYwxUpglMtgXN54WAj+xSPKjOrP9K9NW8yo9s1toV1ihqop82E0QssNG2PpOrIn2lC7/eltapWwGSwQA8gDM5003kpqH7Q1TXAlqvP8q5kNN9Fj2L7VCI4Nrb0CdMLZ6UQCYzweY56UPFHtQwz8QFZ2uvcisU8iDoSlmp8dXt4kVX0SRjXYTS/a7yRbmrlxwzWSp6+eltgp7IJGY9U1OFDjH4GYurKw8eUW51nGisDOTghaKKxr0qZniXyJ1+0WrtNCqHuquZn+z2tMlbNL5rTmLzNGChsm9iwqXS5V2FPI+DgZU3BmU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?wIYMNd4pZaDQkiH9n3wPeSYMmzob?= =?utf-8?q?P/d5CsYffHalnF0KMiZF6MX0Zdz4cdteNiIotOxAOKe6q5mN4MmA8JS4Wf8q93R3G?= =?utf-8?q?zIS8IaH6sdPhUCIAYthJxvF3DQM8wnOD5dkICchcqcRA6pVgnV0w6rlgA7LnFZj3X?= =?utf-8?q?IHITGcSAZTAnXKbQSMj2Mg0Sghirtov5kMfnE8vZHXQTThIJjU/L2EnWyYXctnOoQ?= =?utf-8?q?OGGzq6YeayzPuuS1xjH6wevbDxryBZsbOJ8vEeW/JrXhztiVT8PvHGMDvOXzHMDja?= =?utf-8?q?03d7kISJei13lub7DfeU7RKlzXMjW5J7UkNZxEcty4S4/N2It4Ahe0DOiFxuKUSSC?= =?utf-8?q?sTOm9rN0XsMS3y+1mu92JSmAre7wp2INvWwKFiXi3csDmp238cPb6F/Zr5E297PXr?= =?utf-8?q?cXc2xujpk/wZ2pAuuyV64anppiYuVrwHfkzG2wa7vs4V5znpXbNpDgdOYKzLG0SGk?= =?utf-8?q?98tTdYH50tCP6CXTGobkW+/5ST47Tcuxg0uF6x467x3rGUOHCyi2cQvz1nXldug14?= =?utf-8?q?zajlRZBoF8MTum0zgQvyWN6Lfugy8YTSYbwWC5N8Iy0gMfxJpKqpID3qfkQQrdU7u?= =?utf-8?q?Lx4yWOF/zx6G43+MDGmhpMLIf5Rb2j4hCva0pJW7/OLXv04RLrK/DvP+EZ9R+udux?= =?utf-8?q?bHRHZSgY4cbvHX880RkRTBPQj8HA9/z6q4RNI7jYZwC58PnH6qFex8oCHwjL5S0eC?= =?utf-8?q?JiOnH0xF8ALhK6d4+MbGmrQEDuNfuQkfdkAstlrtkyvUcuPOAfY4K9M7CzUok+lpH?= =?utf-8?q?LcNhiPqpCoFD4rwaj92MLrvLoCtiyxy+trI1HE/aIH9ffBp4l8+XDF5/0zmigwvfV?= =?utf-8?q?r7cFIKZsETTVfWn6t9PjcrO5WrpU9R8Swz2QqylkRHrAdstNTKPrxS8h6yhFvl6R1?= =?utf-8?q?UYJZNou/x1JDoSlkRz81PuQD/Jxsme8KJP9+NOneOEZiXmmSHEPzMLRpKZHOI/rg1?= =?utf-8?q?uRUllZIIhYF5mJpDbNYnBqONezp9reWeH+JNX5azRwr8Ml3jSjqSdEIdTtGCvwN/G?= =?utf-8?q?6obnZzoPl/0QFZIqOXX4WQZSWQp7kcj+CabMaF718/1zZP7mvZaZswcBkzxZI8h3E?= =?utf-8?q?+wx86WG2nEAvWW7BZvbuPrI89m41VF+Z5sQvEWi3E5tq1Omz97K1hUkBWNSBm+HFg?= =?utf-8?q?GANVwzvL5gVZVANwmjj7tePc4B7h0Ha2d8DcrSDEFWBBrvXNASmCIkWxIGWHnpZ5b?= =?utf-8?q?CHsTeKdA2h+9Kv9YkLSw8RzQlcvQHY0s8EdUdh6Cs82dl1a+F89BTjiS1aPcP0V0v?= =?utf-8?q?28Dg4PVOxsOZbM+bRg/LZRDqzkKMfGoiBzC0mhMgqXHNVBwgm9Xkye37aoGVSgmAy?= =?utf-8?q?m6vYp4TUDpwNkpjOgG0apkQ8KQ7Kr1EabavIShyH+MJ3jx4a+t8kDlS7Grvonj7UF?= =?utf-8?q?5l6KsIgF9tSnW9317NNKnh7AgtakVSDlZs8GURflB0nz10X7bQu7hHN6JiSZ7kVr4?= =?utf-8?q?1VOT5xekoJgDujOnAchFukr1EZY3MhLSx+UQju8ADemMe/zM/Iljdn8Q=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4493227c-4ded-4eeb-569f-08dc37b8a42a X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 17:22:14.8440 (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: PdjXTUgGbVcb9qOL8xGCo15KngQV2ZqVIQQbJqqlkQYQB3Lbzg1gbJ8J15539chboxGbz4FBvN/N4sbJlbKcFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9754 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792073798317147154 X-GMAIL-MSGID: 1792073798317147154 The 'slave_id' field is redundant as it duplicates the functionality of 'srcid'. Remove 'slave_id' from fsl_edma_chan to eliminate redundancy. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.h | 1 - drivers/dma/fsl-edma-main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 7bf0aba471a8c..4cf1de9f0e512 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -151,7 +151,6 @@ struct fsl_edma_chan { enum dma_status status; enum fsl_edma_pm_state pm_state; bool idle; - u32 slave_id; struct fsl_edma_engine *edma; struct fsl_edma_desc *edesc; struct dma_slave_config cfg; diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 402f0058a180c..0a6e0c4040274 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -114,8 +114,8 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec, if (chan) { chan->device->privatecnt++; fsl_chan = to_fsl_edma_chan(chan); - fsl_chan->slave_id = dma_spec->args[1]; - fsl_edma_chan_mux(fsl_chan, fsl_chan->slave_id, + fsl_chan->srcid = dma_spec->args[1]; + fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid, true); mutex_unlock(&fsl_edma->fsl_edma_mutex); return chan; @@ -540,7 +540,7 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_chan->edma = fsl_edma; fsl_chan->pm_state = RUNNING; - fsl_chan->slave_id = 0; + fsl_chan->srcid = 0; fsl_chan->idle = true; fsl_chan->dma_dir = DMA_NONE; fsl_chan->vchan.desc_free = fsl_edma_free_desc; @@ -682,8 +682,8 @@ static int fsl_edma_resume_early(struct device *dev) continue; fsl_chan->pm_state = RUNNING; edma_write_tcdreg(fsl_chan, 0, csr); - if (fsl_chan->slave_id != 0) - fsl_edma_chan_mux(fsl_chan, fsl_chan->slave_id, true); + if (fsl_chan->srcid != 0) + fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid, true); } if (!(fsl_edma->drvdata->flags & FSL_EDMA_DRV_SPLIT_REG))