From patchwork Thu Feb 29 20:58:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 208521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp682928dyb; Thu, 29 Feb 2024 13:10:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUL1TyXrg75dhfhydYHYV7k5xlBVj2f0hVQxAxH5kONtSmUi2xjHEKVcOnhNwJyBhcl0dDVboFYykyIORD4UnuE668kvA== X-Google-Smtp-Source: AGHT+IF9eKNxNerj6IhH1ki6iLNx80NriVOg5arhronruHrabF5b5xUdgFY0XcPBJYGr8PkTr3Md X-Received: by 2002:a05:6a20:43a2:b0:1a0:e5af:b240 with SMTP id i34-20020a056a2043a200b001a0e5afb240mr4312603pzl.45.1709241012166; Thu, 29 Feb 2024 13:10:12 -0800 (PST) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id sd16-20020a17090b515000b00299d1159bfesi2213591pjb.185.2024.02.29.13.10.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 13:10:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-87547-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=isj1jj4t; arc=fail (signature failed); spf=pass (google.com: domain of linux-kernel+bounces-87547-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-87547-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id EC97328E951 for ; Thu, 29 Feb 2024 21:10:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DBC74156D2E; Thu, 29 Feb 2024 20:59:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="isj1jj4t" Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2040.outbound.protection.outlook.com [40.107.7.40]) (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 93B2F1552ED; Thu, 29 Feb 2024 20:59:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240343; cv=fail; b=Vx0iNOIaEPY+mqMOWtpV9cgewcupSZC50Fpxh/X9EApfakqJ9LpjqCqTHQ2Quv1OvlpLXzGXm83r9xVZfuseFcw2duf2P0IdlrkVhalLUXlFXiqoY0s0oqXATLbXQAroP6TuJM+R9IFYow2Ot1qfVmo/HRQkr0uEHGJigKejHE8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240343; c=relaxed/simple; bh=YZqvNpVwks9iUdy1m5WD7RpsLTnC33dYL8qYlc2nwns=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=dU843g3uy2A3FS5Qginrgk5nbBkGsk9ELYs3SDwp9XS4L/5KN46xVc8XToIfdzUGdC7rbSw7fRrjOisSaJvqbm+TiYdkT97iJsr97P1C0vT0UZgHmRbd2a3c1FmAz1MmT9IJXOWguVIo0TOT7Q2e9sAv77SC4vsDKQH1CTKK4Rw= 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=isj1jj4t; arc=fail smtp.client-ip=40.107.7.40 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=LtUVHjbvTf3CYb7oHyc1Sq0RjwuGNSCTwXlKCqYjYfZL2T/srYD1KdUGWURDynl5pXSGVypOEn0rH1Ix0x2HLHpnCiaISj9GB9gBHTj0DuBNwPbEryfPLgk5nankG5wz3u13pd22f32rl0RpMryTubf75Yqz+0IwTaXNCqxMX7zaGjzcOV8VxHdx3dr9rl6fHBnZLSklDiKlMulHWQnzIwDxbnK+dfNXaN3Tr+uxss0TZnL8VwjMGoPClSEk/RJ3W54So5Q151j/LcJ1co3NUR2sFIyTbEdXX36JDpQX90WhwHqj7b3UfaflZ//d+Cf/xasY9a8xjnG6HbqLOkyrqA== 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=g9vB4OwEoRdCLUY1BP0w7hccRMhYCWqyz+SfWM5vr7Q=; b=Fkl9DLdSUj2Sh9KICzpsi6lcuPRpNk+aNANgmo40jv+Ob5UUrDqXnrXKbA4XwWNe2thHBR/H0Bmre2YPdm6rN8oGIHa5Ug+WwzxUR+nWBRNd3Q787TWzgLSYWez+zy8FxIPhZUnomcXG5Mp4dYW6ZNZS2C4X//Hrjx5kwGG/X48zBf9DLiIFHePKraLT19Jej14kGnGYO0ud/ivw32OyHX8qLdv+Brs67emo7AYlICpp611roFTgtEiaFEvjHBz9wJ5aycv2XPd03uQRU2yg8iH/Sc6g6K9ZvwhtH68jK11YW4yhHIyAGPxS9SvrKaqe58U88bMYOcNHfeujinOfvg== 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=g9vB4OwEoRdCLUY1BP0w7hccRMhYCWqyz+SfWM5vr7Q=; b=isj1jj4t6SWyUbPmoRtUYE6P9FQFdTq8RYShQlhmWRWyqKIcTMACnARBlvjKXRlIOooENjfuT3b/s9pTkezB15EUvutrTZUtHhr/YTows2ZauIiviVghIHAv9AxSCfJKaiWr0vpFtQubILA9zMP9tQ8q/H/6GXy789N2a3aoerg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by PAXPR04MB8750.eurprd04.prod.outlook.com (2603:10a6:102:20c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.40; Thu, 29 Feb 2024 20:58:59 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Thu, 29 Feb 2024 20:58:59 +0000 From: Frank Li Date: Thu, 29 Feb 2024 15:58:07 -0500 Subject: [PATCH v2 1/5] dmaengine: fsl-edma: remove 'slave_id' from fsl_edma_chan Message-Id: <20240229-8ulp_edma-v2-1-9d12f883c8f7@nxp.com> References: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> In-Reply-To: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709240333; l=3059; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=YZqvNpVwks9iUdy1m5WD7RpsLTnC33dYL8qYlc2nwns=; b=Zz+9dzeyam/Le+5FYweAqg5eDM7wQ0jl+Firgi8RgQh8caF3O8vZkDYDqxFwzRLsZjEWgZ1cz 6nSUFX7TlK9CYf+giBu+4ryqLiYejDlrV7J0VtGXAyV149q+pUAvsFB X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0060.namprd13.prod.outlook.com (2603:10b6:a03:2c2::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PAXPR04MB8750:EE_ X-MS-Office365-Filtering-Correlation-Id: bc2fd6c9-de8e-453a-0832-08dc39694015 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6W7IwT3hQ99FdkTUFVEooMkzq4waSL5C3rpomDzgRyE5Qxmoo300pqVS4tOnniA1tX80mTBGVyL2ZDcJIx1J2bq5kUigRiqXzyPgolBhK5rWBggg2phK/1O9RmclH7GrjyVkH4N/PweGjWsdgXri55aOZ1bg2u2I4HLyDnwjvlRV7XST6cNUthJJ0XLL2zZSqrfJSa92QDTSByIQO8IoDGkDQrmgmugiKjh1yEZ5fgzbzPjDt5vsZVxGMZTRwZ6gUQ3KPLDxT1VJprfKJYKeLGj9VIOt1PZznd84bou32AhsAWAGErzem0YQS/uK8hCPlCMi5peyYyuVgctaE0219iG8ESKOeU3aCQrSKnvT5GAQq6Ck56SLRrMrJZLi5rn/qAJYxD2BFotxlYADx77387DFBZdWy4AiJG6jis9n6p6GEvDzQHK9V/i4eHblr/slWz95HF8iwUnGCCSWrELld3jSnZJIwPdSavogQm7/xthhy0UjzH/1NEbbJlkDDihokE/VnHWK0T6+2VOzkPnnEnyenh8kdun3WTU44F8kB0gzCsJ3KhBl4ICT6AeLn4GbQbez3nENvxNP2K+OHZHFwxy2JAtQy1q5CKvVrYCxRH73M3MpgbGYfwI909rpqNVYtyXo6Z1ATTTCueqICVlInmYw7gQhekg2bhK74b1B9qyfb+ao61qtBXEaeR1W0PmH8e2csHUEzmef0zGJek4gMJyjmw3tRxYN0IOR9RqXzow= 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?kwZ1t9bx/Z+mFOnFGKxhOSOZaFk5?= =?utf-8?q?Fz5oMutIfG7MKcB89CujbHStFpxDG2gKW0O0nhTyLKcxwx9BYcZHHb9ZNM0T/Sdin?= =?utf-8?q?7LBC5q7Bu84MA0ILA+NEcD9ISBtghxhMjNbQGc5HLYRflBZRdUKQ2SRSVjm+DMkXm?= =?utf-8?q?QQCTNoQTLxw/4jFqT2DGXaZFDqeYKrIDszECi6jCraAfQzaY75QTbkreWsig5dDZM?= =?utf-8?q?Y8H95fkHcqxoSoKgRHiIgLTFb1ytofGmlXgB1b8zWT43OG/ySYCZuHxbhf1k+UYx7?= =?utf-8?q?TCwdfUkXa58pA0tpVCtDIUywkiMsVqF2D3OrwPm1DjoWOq4zJSHIBIBWhBHcixVJP?= =?utf-8?q?q61RjDVye0/Ihg3/30UbfpB2Ckmn/KYb/YPhYI01Zx0U8yHYOeGK3/6iJfFqppIqm?= =?utf-8?q?tFaKWLREX5FrKKfuQ7Wtqsrk/5uC97kA1FlKU2TrHc2hmsoBAQKzflU0WJvIXHY5k?= =?utf-8?q?9QJO2PL/6ZIcZLUbrYtiQ3AcXrNIt6lYHhx6Mly2GDLFdHQDQBjVVUTjTNr6cSGFP?= =?utf-8?q?XLJYMQdEURBeFA0idDk4e5KI9jHfwyXb1kQpn7tDVGmA1IqF/9urHhVHmbrPM9tyz?= =?utf-8?q?uGppoC37BQ//EdGcC3UHAa1xn9ZvbJ3wLN86qVmSoI78mm3YMiI9F0Sua98AH4RQ9?= =?utf-8?q?o5tAkIGJEyQAhlpD9umdrZtVoEG+gUe2vHI6DOZRzQH5a94VWYRDme8Pixi26KM/Q?= =?utf-8?q?6xjwuF56vnKHEjUe94jMKlKFvZjxP6mzTezBC8iftH7u+JqcBRqdWtKnmmSzbOXm+?= =?utf-8?q?vCMaUHkKShuHLr7WokC9/ZpOMuUwZbg43nEE9tc23+8SE1GqYOexBWFWTKch1ksip?= =?utf-8?q?FXzvvBhTLXH6LwzFACvs0u2HVZfdmtzcPjIp1esQnpUiilTUZXnHGukOONwdfuvDo?= =?utf-8?q?XFYiEasOQossPm1ukO37cS6YLXE+NQvGWo+nhLf4+2IThXpj3eeYz93MS3IVKRcOX?= =?utf-8?q?I0S92xwL4rt3F1hM6McqoCiHxVKOPg9Oo0TcN3p/ycpjXiJH+lHEWcTJwla0FtJJS?= =?utf-8?q?44vbnUTxc6ngDmkjKsbvwXVEGQIGMiOrqTcWH7l3V7LBJqNjYsFxbb2FqJBTd8f+F?= =?utf-8?q?JRRlBGCZsPm+zh93MFdnzDsfhz66WXl/eOeXII98miCFV4aOo3vjZYma0D6ltdHny?= =?utf-8?q?XZT+fPJCAS+M/5rMiZGIVkACArWFhlquu5l850JFBGnnGlpCe9eXkG2V6S7TFeM0m?= =?utf-8?q?P63JgFQmqfP5/qeRB3QmA3elWGP5ZaBn/oRL+nT9fu4DeFazKWpelzWVnSeAnFsxf?= =?utf-8?q?YBO8S+ZPpfaD1yhn0eB625Zw4P5lZpX5OnxKkSEf5Ol2GNcjgZE8rSb0ITgjiOqyL?= =?utf-8?q?LrQq1W6pdJIaxi3SDsbJNdurMST5HYnowWv8cQDD0E4J0MmeqCt9LuPv3Gad6NHhe?= =?utf-8?q?n0xT1VZuKEj+84mjVLoAghiCmlm4+On0wZuZXEf53825oJZ7ZsfuWkALnAMDPNjZ6?= =?utf-8?q?Uw1aW240+a2HgTFmtUuLOApEtzd9bm83QSkjGlSVpowIqjzV/y7WbA6Hfqweug19m?= =?utf-8?q?sDlicuzCcI9W?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc2fd6c9-de8e-453a-0832-08dc39694015 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 20:58:59.0162 (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: Z+9UkAFMgeNaP8cJWKi5N6BhnQ3/arMGCQZFXFrXMsPLM1CR5Yvk1ksLM7IrLpvMwJi0c54+LHnpdOyENmY/4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8750 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792269103269283015 X-GMAIL-MSGID: 1792269103269283015 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 +++++----- drivers/dma/mcf-edma-main.c | 4 ++-- 3 files changed, 7 insertions(+), 8 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)) diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c index dba6317838767..78c606f6d0026 100644 --- a/drivers/dma/mcf-edma-main.c +++ b/drivers/dma/mcf-edma-main.c @@ -195,7 +195,7 @@ static int mcf_edma_probe(struct platform_device *pdev) struct fsl_edma_chan *mcf_chan = &mcf_edma->chans[i]; mcf_chan->edma = mcf_edma; - mcf_chan->slave_id = i; + mcf_chan->srcid = i; mcf_chan->idle = true; mcf_chan->dma_dir = DMA_NONE; mcf_chan->vchan.desc_free = fsl_edma_free_desc; @@ -277,7 +277,7 @@ bool mcf_edma_filter_fn(struct dma_chan *chan, void *param) if (chan->device->dev->driver == &mcf_edma_driver.driver) { struct fsl_edma_chan *mcf_chan = to_fsl_edma_chan(chan); - return (mcf_chan->slave_id == (uintptr_t)param); + return (mcf_chan->srcid == (uintptr_t)param); } return false; From patchwork Thu Feb 29 20:58:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 208522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp683016dyb; Thu, 29 Feb 2024 13:10:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU3Obj46S0mVHwWqnyM8ela5Xf7BHMglt555qmVJ9j98KjB7B3gjTX5EIDOW+al7+hfpYTLH299h3umS7DN80TQKc1Kcg== X-Google-Smtp-Source: AGHT+IFm7kcJGHmYe9f3qKf7otcjpRCBWKyQVHGGZyrpAL36eO/zZONdouAJT4ccAFbM+9Q0OJ+z X-Received: by 2002:a17:903:4c1:b0:1db:729a:e2a0 with SMTP id jm1-20020a17090304c100b001db729ae2a0mr3134218plb.47.1709241023838; Thu, 29 Feb 2024 13:10:23 -0800 (PST) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id sd16-20020a17090b515000b00299d1159bfesi2213591pjb.185.2024.02.29.13.10.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 13:10:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-87548-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=Ne4H88wq; arc=fail (signature failed); spf=pass (google.com: domain of linux-kernel+bounces-87548-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-87548-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 949C828E9BC for ; Thu, 29 Feb 2024 21:10:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 79509157ACD; Thu, 29 Feb 2024 20:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Ne4H88wq" Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2040.outbound.protection.outlook.com [40.107.7.40]) (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 D81FF156961; Thu, 29 Feb 2024 20:59:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240345; cv=fail; b=h+4ouaGnafWFdQVFKFswxatOpwMKlpR7lqj7hrw1g146UhRuxN3opJKcQMiyrFeOFamjQjWgXJZXPNKah8peEXlpNH87VEnRnwcCWyhea/3EkYiGTrCJd+Lhs6F26ab5/OVG4dvU6xsbA5kM1KSF94i24qOqvV3mvH7fMn9Mvwg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240345; c=relaxed/simple; bh=Cba1I8lPfT7XGGJBLhHLImkgVygTholVVk8WsvGvZuQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=kUapWTDxxaYjomNzGdi5oCYSkVQHNE1VyXidEA/rs5Xcqz0g5sG8CgYUQWBK1oNW65Pebu+9zG1A1LlknFxj/w5Ma+Au+W1dMgZz2pYClRWTV/e24fvRDFOzpeoXzH6KmPkWWAKTgFgHB46DpQL+b+hkc7luLmq3CT/2CEiXu58= 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=Ne4H88wq; arc=fail smtp.client-ip=40.107.7.40 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=JNt5GWHW6EkvonoxRSeAa7uQwlE226Cow3djnuL8tzqCNdohj2kVT05vTAAIkL6xNq+Yb8h5358pCiNp+wBLDyv2EqXniVp3iEMIBPoJv6+WnIAuLEaJEdSuUPg7qylEB2+rFQuVCALxk0C72YAdcV6nvMvug9DAFXH9BjCU7yHGwfRDPGUn82X40nSlxSTWmzk5qzbcYFhbXj9AVCtwp3tlmuTzQ/kGQ2dBnD0Bkej5t5SlFWQfFKPyCMIJtcdqKaatvt9VqjJR/vkpJJJgIthFMGIXFqIXqXvuX4JwZJQIvxz+Ysl0NuMu1uJNPP5s5hv3/EDcMK3vpLLPyoIFAw== 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=OLs/58IIUeveyfmtV9PhDz6tUG0OWzPy+/o3nZ1cyIY=; b=UBFb2nG92MjHAO1PDhy25voNbUWnO6xhtnYn/xXJ7tnaComSK+vyqj4/hvtTruepvhM4XTeaKylt7r55Eq5Rto65nCVpcuqB0BnF5nmbVyiHyZWQdxMRw7oXWtmked1+ZN6vd7Khxib7DSqIz0gueFpAYwbBpU8mh75X6lRMSHM8I5oT4hNEcUdCMozbYKyPI3iXbpXvGD4cw3rS/N/WfqhKRXDNhvqHU7u3Rn9WNXMdy/1fYtujzQNQEA070MsNKkLj31z7D02E4237kpznU6pcDDOvlW8KbPO2G3shTMgRTYt2AnuEsBIT+nK3zqfVsoPF8sVd/uYuGhadKW3/wg== 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=OLs/58IIUeveyfmtV9PhDz6tUG0OWzPy+/o3nZ1cyIY=; b=Ne4H88wq+HHzAaLsUgMy4hPY12leRmrxVoR/EtPkFlVD1EbmbL1+XrNMgLQupkB/eEit9QZy/GmpK+Kac43vVAjnhRWoL+TUVPgcUJnXtf9bxymf4+LgmmHaK/gzeDj4Y93PTNU/sLlNfottIeywCkuhcMiFWaiBh6MixHWKOtU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by PAXPR04MB8750.eurprd04.prod.outlook.com (2603:10a6:102:20c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.40; Thu, 29 Feb 2024 20:59:01 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Thu, 29 Feb 2024 20:59:01 +0000 From: Frank Li Date: Thu, 29 Feb 2024 15:58:08 -0500 Subject: [PATCH v2 2/5] dmaengine: fsl-edma: add safety check for 'srcid' Message-Id: <20240229-8ulp_edma-v2-2-9d12f883c8f7@nxp.com> References: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> In-Reply-To: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709240333; l=901; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=Cba1I8lPfT7XGGJBLhHLImkgVygTholVVk8WsvGvZuQ=; b=eaadin1fbdghmp6xGn/H3m1Pugw5hEkckIlpOSy42uL+blK41aoNXo+cWWtmHWxtxeeVdCNrY P9wDkD0PQNnAJZnQW7NCsmOskSg68yEPwBJkvTJT8EDCiMY+Aa5Fi22 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0060.namprd13.prod.outlook.com (2603:10b6:a03:2c2::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PAXPR04MB8750:EE_ X-MS-Office365-Filtering-Correlation-Id: 4df85db8-1c80-4b96-b826-08dc396941ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 82KbRJX19YCs/sQ2tgOTy1b8mIiGLlHxCsctJ0VBKuxAuSVB167twS5l+fffPavd/SSchbb5wooLfvevnxpyp4RSyPDnjnHyj59/KKL1g8chXD256WDwsIJaMX5G5pLNJFpLQds2EMaUcLB8sRJDDipfEfIi7F1YC77WzC24FSokZziMD+76Wo4tcMNYlr7QcjCXDfM7pV6sMFXsXhX7tY16uX7Gn4asDfOXtJWr17r06MoN5qZXb3qBLLf6jhCF1mdzIsAG0JBY7gpop6mO6WZ0X8QID+8Dr2n5dwGUBHwpW5w71qF0JN5NB5TOYuBroTfq+feTqrzVBz+UR0+E4bLwtFoynP0IW6gesUcuwt7MpK3XLPwp2ryfle+vM1u2XznYJp2uYuyXsOzrNKxf4i7W3J4kjRYBSu+RCt1Q5o8z2+wa1dFHrXGIGpCToPS4IB06sJsKVuUST3WWKfK6WLP52ggX+RspDuILgkDIjZ/TLw26VmlaHELuxPvZeAiTppi2ZINi36dXugbW+17+dLtByYcfT/0sCZDTCq9Q9IRyjgD2CkegrTvTKuB5rktr/YkWE0vDG5qbW9fFfQnyhGMs+dhr82lP2dX2psHIvapvb2Fp6Kfj0OVMOX8mnLEGDZYpKA7KGOSFXLMNUW9Uo9K2AkOCUyXeLobPJA/Hn0ZCYvTrdcmLHS2yrSHfETsLYCtkXY9//NQ6illH1atoyP6uThRcOWVoumLOxXTHxd4= 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?jOkvYHk42z2ZGIbBwxK20FftOFFl?= =?utf-8?q?5b/BEgfODIoEnyK3oauto5zRH2fFk6tFXLCmP59WaOp6E0lPDSt1i9IwMomcXK/op?= =?utf-8?q?y9tRJ6joDkhbybfbu6HKvHKQYqfSRsLmquShg+oIdm3+tBpbOHNfq7WlBO3Wm9lUT?= =?utf-8?q?OwzTSfwjfo5F3pDKE7FYeHgqutw51ottGcWq6Ua76aLwjVuMjUSFbNDAK+fjnTjwn?= =?utf-8?q?arhkVp9WySrReRMLbMAtckvECAh5Y5jWTBLWQjqreUTEg1wRoo3Cq98Fa3ytmXnNW?= =?utf-8?q?4mSMGVodD/0FPBzD2exZHezYPx+FsU2JYxOtrgG0bGyUQr2FxGITGkoM5NsC6FkIJ?= =?utf-8?q?YIcHmyAPU8EZ+5lq3x4xzEHaQBnTfc4YF6F/D4ROb9PBQq7NV9ZjqHWRIJXEUR3Ho?= =?utf-8?q?fnGXVBUns+U3MbZQEvj3zCyul/Womh0UZO4Ydj2pzo77SNpfes8WgNIRs9e2IydXA?= =?utf-8?q?nRuXzvhVtoEX6hW8sDv2Ib81EK4mUdkVuHzgKDpmbaNvTwIvUImm0gDSixy0NnJaM?= =?utf-8?q?oEXz43wj6twdLUM/A5TIOLhqHGsVk8lBj5ebjwHnL4HQprpFYdtSz3TEPADFujyeD?= =?utf-8?q?mUdKD4Lwe8yRqyxONJEUHi4ngnnCH5ue39+Mxsltvhne14plLFLzkESzD4s7z9/A6?= =?utf-8?q?5Y93Hd0qbl6snuTjCBplquO4wzFtMdkzqM55W4o1evsToajVjTPGPz0cTccRrAJrT?= =?utf-8?q?dGdk8K2U2oXovAxDdwsJG0MfrrNkEp04dhfb+0Gt4vopeVMHE33c0phbAayYAL+4/?= =?utf-8?q?whmUbeXhrirZ5S+K8PHU/rNS0Lxje2WjHe+OpTchVi8oB0BDoG+sTOD6i075I6NME?= =?utf-8?q?bIsn9KTWzlVzCofg6xxOJsoIiDHegNeY5KkxFV8qFceMMSf3HMTyC9QnxZYgka0Ot?= =?utf-8?q?jIWBDVtuHDEFlUYK0mgit+02Bojo1DkfWxJYTXvz8BoOtFuORFpzkrJ2OTJiC2WCs?= =?utf-8?q?DtBWhee2ZQkpmmMZg8uHYRTUyrhKKMkuzWT0wmOg7W1iZo1uvDG0b7hA1JCPT83rp?= =?utf-8?q?auPfIoLndJARGDQwBaOXvnl11LQ5oGvzPXvkP1LraJ02PVoTzgIhURFXmeLj/rYTn?= =?utf-8?q?yn0//iHSnNbP2mRzC+YUcBQKJrzO6nNQIN46RCZBe41InIVBkbEalB/nPOu1BIYcr?= =?utf-8?q?6nLNO+mGytQDLr69IpDyM6t3yUjAs6XEeN7PGuIu8JGeewU4LVuToz9F7ZmwQZYMs?= =?utf-8?q?OVTXkF7UHGCcsy1YtUnEfeCbvKwVA6jNqq7a+6cu0CJtIQBtR6OfeidY+g4nK65PE?= =?utf-8?q?GzDblfsdwxASjEk6pGA/N9r/wSkUubN2P0xxEYh8psNFa7MrtP66Zspsfo0MM/d6z?= =?utf-8?q?LUTZecfh5U4w2UxRYytDHWmi9Xpa82JSWsGsSeSlzyrTxhxYeG7/fvC0gcwM3YPiu?= =?utf-8?q?Yf22bCgGbfvV7+c4zEkpyVKIyPuDLOJ9PDjfrm6y0tDQSydikloT3BFo0Sxtr40Fl?= =?utf-8?q?OSPs63DzQ9ifgxjUD0PMbfv+Qr17ndjnFOPA7LXiou9pcOnYozqf9IAdIsuV+3lAW?= =?utf-8?q?wAnhOEY4bNxU?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4df85db8-1c80-4b96-b826-08dc396941ae X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 20:59:01.6821 (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: MyxlTfKv5aOYjwi7nPdb7T8cHq6mK1AJbbYr1nRnEl7uBAJUNz7pJnXY2sGgpVFkA+FUGEqevRJlqAaq+HpNuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8750 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792269115458811915 X-GMAIL-MSGID: 1792269115458811915 Ensure that 'srcid' is a non-zero value to avoid dtb passing invalid 'srcid' to the driver. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 0a6e0c4040274..2148a7f1ae843 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -115,6 +115,13 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec, chan->device->privatecnt++; fsl_chan = to_fsl_edma_chan(chan); fsl_chan->srcid = dma_spec->args[1]; + + if (!fsl_chan->srcid) { + dev_err(&fsl_chan->pdev->dev, "Invalidate srcid %d\n", + fsl_chan->srcid); + return NULL; + } + fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid, true); mutex_unlock(&fsl_edma->fsl_edma_mutex); From patchwork Thu Feb 29 20:58:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 208524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp683257dyb; Thu, 29 Feb 2024 13:10:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUYaTwhxQ6UVh/lM6v4d2M/rfMkZXWS36MeynAsi49NksLWje43o4oVC9Ket5D7JqhqvVzUuq1M/NkIU9bR1i4GXD4qMA== X-Google-Smtp-Source: AGHT+IEvt76rNAEDUx6Q6mEnq0dp59LJGLmnE3ut6+Cg5NHhRkHkjLoGeFmfxiOfZH/HHPtBtSLq X-Received: by 2002:a1f:c942:0:b0:4cb:2662:3651 with SMTP id z63-20020a1fc942000000b004cb26623651mr3311381vkf.6.1709241054477; Thu, 29 Feb 2024 13:10:54 -0800 (PST) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id f11-20020ac85d0b000000b0042ebbd43f9csi2016351qtx.58.2024.02.29.13.10.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 13:10:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-87549-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=WLBFUyPO; arc=fail (signature failed); spf=pass (google.com: domain of linux-kernel+bounces-87549-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-87549-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 6A06E1C22D8A for ; Thu, 29 Feb 2024 21:10:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D9DF3157AF0; Thu, 29 Feb 2024 20:59:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="WLBFUyPO" Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2040.outbound.protection.outlook.com [40.107.7.40]) (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 0CBF9156D1C; Thu, 29 Feb 2024 20:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240347; cv=fail; b=LGuUqqPKZgdQtGR7mjtd3lmgftIvUaH+nrkC3HdVLqh7K1YvfOiAMVcpzXBYps3UFFHdfohqRmLiVML/HJQtu0AFmlf6pzYF7AWRv/dxrgmhKinrtXsbktyNoo1dJF/R3WI/vjSWb79KM3LdAKVqtjOXpIfiolKvMtJL+GTlhlc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240347; c=relaxed/simple; bh=1SY1nKChJ4s31bmrpysVWazodvllDv9ahLCc/bCrYcQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=qeqBG5ip7D/b7l0oK5DOlQZOK9bGxwp87pMOC7a27rH/EcZtMwvcNO3KR9CrGFto5vmhCdHfvYJkAu555cE0kE7/Bdgw/7DdNtD7rAxolN21i4MObeeEBIO6k5BcA+L/ErMpxpSQcb3vVl6izLpuAX8TmoYek7/9A6XYLwZ3dTA= 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=WLBFUyPO; arc=fail smtp.client-ip=40.107.7.40 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=Yw+5d2DGWakKLDdQqZz4cCdkbyA7fFSewSpKln1DCLpVe84zE0QyaegMctdNCyUeVEH2oBkTLxqcg01Ao+gzx5tXVpRN40sfv8lTNdOgilrLS16SUwDt0G1S158K4m0fT9xmqqB+nHB4aNKPfil+9CEVQRM5RU0kl7CD+pdHA1CiKboe1og0Ee1cRTCkR9b402bTSRusgWziXySrKkvFVzZBRi4q3ePR7Cv/wn2JxLxqAxtPVDd+scnOrP7mY2rHY2f/xXd3ocsE+zz8Ou+mfVwd6KKiDgprh5fHN3puX3J6orlyvFvqgYMLmc1j5Tn5a4tk8h7nMTL8JxgE/75pww== 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=O3UHH8qhH5HTx8E0tLZorZnJnKCrjOdx/qvKkcds5Vg=; b=dhaOSeEEmkl54ymXL0vRj8X6bz1y2TJYHPLcMyWRBNaZYgRxAxQwIG88OaXuclqsI1LMxARggrjZuPnSJUcyxwETAATvNVZ+VXmno873WPltMBaxTcqaVr6BcyO4S2gjUI4rJ+mxfvOmzSQheBcIO2T+sRA1StWX4YM7WCuOCFtJuf4vXIyz6/DNiclaXvoFkidxvPvDJslTq5OPuiq5J9nDSVOyODGjPzpI2chNxjnjz5Ec7Pdci3CvGKxSztmJtp4wxx7yDcNqZSqScpYZJWMZOwHOfRutQRphTvDtOthZKD2F7vfkwSYUofnh6f33FL55zh7DqNbGee49v82gdw== 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=O3UHH8qhH5HTx8E0tLZorZnJnKCrjOdx/qvKkcds5Vg=; b=WLBFUyPOHz4cbwEHHepUNJPeTCgAUuOrV6J4qV1ciN/Am5WhOAyQ8IptqIanuqG9IEMfCyHC9LWsx2vVg+be6lCujN7WdJGQV0+O+eXytL0c8OVQ6/2ytXqTQJQ+iFx1QyU8/4IBjpCuLHPx2VsttrdT0Isgxwccl6zGrXubJ3c= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by PAXPR04MB8750.eurprd04.prod.outlook.com (2603:10a6:102:20c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.40; Thu, 29 Feb 2024 20:59:04 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Thu, 29 Feb 2024 20:59:04 +0000 From: Frank Li Date: Thu, 29 Feb 2024 15:58:09 -0500 Subject: [PATCH v2 3/5] dmaengine: fsl-edma: clean up chclk and FSL_EDMA_DRV_HAS_CHCLK Message-Id: <20240229-8ulp_edma-v2-3-9d12f883c8f7@nxp.com> References: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> In-Reply-To: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709240333; l=1717; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=1SY1nKChJ4s31bmrpysVWazodvllDv9ahLCc/bCrYcQ=; b=alYNgGTGK0QB6E6MYKU4CfuD0IqzfjPRVuoklU6NM1a74ucEKKpaFIM06+fJFHh15aeqwBSEF 2wquYUqdIrmClEWom6pALzs6gXGaOStpyKNXYO88KfejXlcT+010CI2 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0060.namprd13.prod.outlook.com (2603:10b6:a03:2c2::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PAXPR04MB8750:EE_ X-MS-Office365-Filtering-Correlation-Id: a7ceb5bf-5970-4a37-02e1-08dc39694341 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DByijwzShQjc+TEt+3FU5Ha5IpmTMAAmJ86rsNBvHpXmSXS+HDCSFQwvTr6BS1XsRNc/kk+z/JIGXKKT+Hy9j3Nb9/k8OyBSzg9sAf38X8vxr9aqlQ3GCxEig/hOgRBURKYo4mcPVv/n3fhd4ZxTJ3SPew4GSlXbnyZT6l0IT5HviV5ORPwLQQtV+KdgrGZeyeU7dE1EmhgpyCsvj6ARAlOhODea7wCka8wDvnulS8BA85RBM0WozABgViIYWCiR+z/lsIfHL3QUiTc40aRR0em8NCXIW/lXbKqSnZKVSF4jmSZER36vdQjHfv6Tj2GBXm6Gobxgb32hlchhdr8h++fI3cjvN0Prq511uqxmjxLPOaskys8dBfqWAdh9PDgcHy0mfVL7D8jO8vx7lRE5vOgASKGPoUJu6vI6mTLK4CGj4Y+UKO3I/iOVNbGS8lrTxsIu8sN8FzAgsINJE5eeyuy0hxKhYGwDcjYb1icBC9jC108frg/XmBTSo8gU5h+3zMvSlYHRU5Ka/1GOjRdubgJFumV/KjD+VbQ6yU4omMRJOdMHr82sW/mRMqHP1kOHnOFvO+IQnFOMeUg7d/kP+byY66PcWtTeHudvzOl6SIXIBECSfaSDIqjWa0/6OxY2XC6Ct1Ch7Po54XRX06hpR1uzKRbCRn0mICacpyjUoahQxSypuQK0BZkuzexTr9Jd6aUaBVwOOa8FgX86dEO+0WE9Vz+sJAGTjhyXt37dF7Q= 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?WaBLtUWB8WPHRE3er8YJTgjU9Kro?= =?utf-8?q?mOsD4yLLzwWCGWLNB1P5mOZ+pLLm9B2tX6GlbIaSHfHsszLRjknpQtYsSulawilkq?= =?utf-8?q?RrrqqPcDdRooO3uKtRkf2ERxcAEL7qMMVYE3jgLSZy29j2OVgCzUV+8bobV9PLnir?= =?utf-8?q?4Yuo0ItZxys/QdVfFq/51y6v6hbYAzclUz+JmdLfTEf8wz7nQx9+iGDJI2619K2hH?= =?utf-8?q?Sb0N7Zw+stqQYyNmST8yCuprERIj1E7rfuaVnOO3VMBfMUegFJb4wgWqcJ0FepSkZ?= =?utf-8?q?G0A6Ci+dx9Td/uxx+IUpbCS1rXFlBrzUk/w/gcmyjidBW265WobCnyaLPbCI1otF8?= =?utf-8?q?jeyZq4bf0oYJPmBc0xjWc9hIDk/iTH9UfN64QjLLEbTsOIs/BMRzOcVr2bSrsQTy+?= =?utf-8?q?9i7D6Lf3OZTmG2yuWBJ0W0TN32W6PLhsCXGpdkD8utG5sEKQ+u3Wy39hBVZ5pe1pA?= =?utf-8?q?tRMB/jpR0i1QHAh4xeGmhV+CgPQBxXRv7EQSQ8CrMXO6MDaBFlFsGpVozCHDBQGtc?= =?utf-8?q?/zmz2V9UxZ7lSXdAKElV7fOMzNaU2+ZClH0xpBnUJZ6YfYd8RHdDZ+8bttavZi2iE?= =?utf-8?q?ex7a/jasPPPHbyyAriYBZfTQAwUx0i0R0xicegKc2SatC8vxwCl/Sha6RUpo19IX6?= =?utf-8?q?RgSAEfnvRdQ+/iCq5t1ZGNOutbGyZGOuB8oZYx+5/Us9HFXx0IhtwG1X9v+zSgjpf?= =?utf-8?q?2RLIB48YUuyBtkzIiB6T9BYtCht2CdSIN9Yuz7ZHobxszpcCUJurV0HCHnrndp+U+?= =?utf-8?q?u58ZA3li1ErQNON65QqgKLCjxfT5RrJBaoXzmP306sLEkp28ZFeSWAYQnTmcavxTx?= =?utf-8?q?OISFJQJXvPte6PM6HyngBdyZQ02vK5TQk2/LYqUDEEi4me3bWteMLdb5hY265E4i7?= =?utf-8?q?pZbkfEME5/Sm0GMTptiglmly4545gZSkFrUv4syaqbv16XckvVOlavBiPJPC0AmhS?= =?utf-8?q?C5JVBY0lMng+xvUvRd8sI1VoXkryR6/Q1PCM7fjIJO0yIOB5B0cZ5IRhcwt+sXRKG?= =?utf-8?q?72oOgqstP46Nwq+fqX5VK+F7koTJa88lFPpPAaZV8CK+0ElvoSeGGJhOp7Q2EpMFl?= =?utf-8?q?a4x0WSTmPPTx7YD0l63JaWW/Qdjm9nub3APeC+Mv94Sp/TBi8EOX7rCkRS/Mcd0TG?= =?utf-8?q?xoZSII6ctwoeozEiSaXpNM3wiso7axdZBZhceZ/WCurZKZp5T0iyvs5W4U2QYqefm?= =?utf-8?q?b4esDo30KaoBVX+AOzpdyEetfTXLqiI13inPWuVIveOLfkND9uXByULRuAOQ3kaFZ?= =?utf-8?q?YwgKT3Yz3+dvvMmZJlXaOi0tSY2j5PAL0yprI6uiP5udf4trJWK5sXeoahHeMK9Z6?= =?utf-8?q?3TEJapsGP3UZ8v0B+EhVvDn2ZgPkmkPKv8Qdr0WqqlE4D58uk6zc9Tw/Ay9HSnZvT?= =?utf-8?q?VOw2kba2eakDKiBjpsE16pAk4dtzkmaAaIpuJzxcyELse0WHmtUMAUUuKYvuCjpQn?= =?utf-8?q?RLHTV0PZAUGcCni4yS+pzzImqBrWyO+h/IuMqyOWPEFfkM0lxzxwjSTwQL+UtOryf?= =?utf-8?q?EBnIhV9g023T?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7ceb5bf-5970-4a37-02e1-08dc39694341 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 20:59:04.3326 (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: nSDfeAtsxJ+ACHGl124nfZVPMV/Vglg2ybEA+S+BOJ0skGxCgrBK5bid/YHRULjLnSNB4Bn5HLt0CITSkCHz5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8750 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792269148100295082 X-GMAIL-MSGID: 1792269148100295082 No device currently utilizes chclk and FSL_EDMA_DRV_HAS_CHCLK features. Removes these unused features. Signed-off-by: Frank Li --- drivers/dma/fsl-edma-common.h | 2 -- drivers/dma/fsl-edma-main.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 4cf1de9f0e512..532f647e540e7 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -192,7 +192,6 @@ struct fsl_edma_desc { #define FSL_EDMA_DRV_WRAP_IO BIT(3) #define FSL_EDMA_DRV_EDMA64 BIT(4) #define FSL_EDMA_DRV_HAS_PD BIT(5) -#define FSL_EDMA_DRV_HAS_CHCLK BIT(6) #define FSL_EDMA_DRV_HAS_CHMUX BIT(7) /* imx8 QM audio edma remote local swapped */ #define FSL_EDMA_DRV_QUIRK_SWAPPED BIT(8) @@ -237,7 +236,6 @@ 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; diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 2148a7f1ae843..41c71c360ff1f 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -483,14 +483,6 @@ 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); - } - } - ret = of_property_read_variable_u32_array(np, "dma-channel-mask", chan_mask, 1, 2); if (ret > 0) { From patchwork Thu Feb 29 20:58:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 208523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp683183dyb; Thu, 29 Feb 2024 13:10:46 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU98QyrptCXaqxNAic9SUqbHrYHDsFO1LYs17TqXPV9rMdVPJdZ51cb5/dZqndQKjO1bUX8sXpy+afuiZC8BM1V4nenNg== X-Google-Smtp-Source: AGHT+IG9M01UTHnsQWWzpWJuummUUtXbCd4XWUR/KbGv5VAOEmc33qtq7PwsYcN8ki5Gwb0YHe54 X-Received: by 2002:a05:6402:6c7:b0:565:6911:a82b with SMTP id n7-20020a05640206c700b005656911a82bmr55883edy.40.1709241046718; Thu, 29 Feb 2024 13:10:46 -0800 (PST) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id f13-20020a056402068d00b005657effd8fbsi831776edy.174.2024.02.29.13.10.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 13:10:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-87550-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=Tv5e32nb; arc=fail (signature failed); spf=pass (google.com: domain of linux-kernel+bounces-87550-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-87550-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 2E5BE1F25A6F for ; Thu, 29 Feb 2024 21:10:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2A0E3157E65; Thu, 29 Feb 2024 20:59:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Tv5e32nb" Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2040.outbound.protection.outlook.com [40.107.7.40]) (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 3E4A6156D39; Thu, 29 Feb 2024 20:59:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240350; cv=fail; b=q/SwXXPtF0sMtfSbPKn5AImKjbGtj810NGArF/Ln/+aLOj/IGVe5JvoIiarXzPG3Lm5OT79helM2MZsGNVpSUaQ9YxsRX9DFjjcpSAlO2OAY/WcFn5bo0YMaru9tn4WPqYW+Q6kCn3684LYiNvgBzAtT4Izl1E1LXjYoPcJvusk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240350; c=relaxed/simple; bh=umk7tiQl3nFvqCLcx+eoIhCPoTuTuXM5stO3RDtH2kI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=K3VupOB0TvukovGVdPUy2ChyuE0Nugl+0ZiimmLX7tBqXMuVs+MjjK9MC2HSXBYcDlzS8Uq2xnk62Q6ZxmT+0c4B6DJS9+a5nf79jgYwboFi1MmaohTXwjlIgfn7uylnLJrhZ3jWttwdNXBFNMEES/EKQVN/u1K+4VS03eRv70o= 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=Tv5e32nb; arc=fail smtp.client-ip=40.107.7.40 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=g4ku0rE388/mlOfYzEnlOA10054geGmsFq1V8syvdT+KphTgTuCP6Gx+JcCTC+oOBFl7fpNYWX4/wOBS4kpUSiQUUbjac3ytHQcL6V0fIpDgbfAvCNtyX7qzlBedPjmJUXG9ORyRveInM8xKG58uiKPWdDrvyoRNV0EokmR3GpYb+8mz6kewWC1w0WWZjnWp+AVB2Yy+l9AOLCnnTeQmkC2IaXWF5SMtQ7ynn3GjfWqBUObnboa8ZE5bjANFf6qbcCsdKn4rhgZPFFVioj7Mre5j08LEZGsdL7QOjKe68oaXfius5u8Z6EZ1O1MF7pyex1hJkWWobkIfEf+Ab8qzpg== 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=Fkn+KGYliN63GmoL24vAX7pv+43UCQRk1NQj84R0U8g=; b=Ur9sk08EekBUljDSImrMcmEQl0kCNtKGx1rva5kBPqTclIV05TY8AQJS44UBe5UH7389Z9/XIUpz5+CN7+h+uyTjjSlc65WziQY4Z+eI47rLtjXY4jeo1KBSFQuQTvxXYna7L22roqM541EIfdnjyX8qjG0fumqu9GRp4VcuXhE0wLNcTXbLtbVr45eq2gVIUIkOO7CaQsHZ1234gRW2Ln9Ci67WZ0zQ1P866RVoEOGMh0L9cFyDXUoYkBezNEQXEnXCciA2BTuxwoIrRjesKQMT48zqOFKen0jEzxOOXFIQj7wgzaoJ/mfpGh9m0IknZJM9GHiFjAlqukBcJTG9/Q== 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=Fkn+KGYliN63GmoL24vAX7pv+43UCQRk1NQj84R0U8g=; b=Tv5e32nb7j25Hwhh2AhY4XefIU1HJ5JWSTQtgoNISfsV0nJ6I1s/06wslAvoLu7jf8HcCAkHrQ2zR/xYxfqUvwErF11+0fbl5tFndQBe6oZlyT6wjJYvIFTV/87Pe7KXAtbrKpjrDhOlugHk5i9mTflc6f40ResFxG3MhqWlk+s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by PAXPR04MB8750.eurprd04.prod.outlook.com (2603:10a6:102:20c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.40; Thu, 29 Feb 2024 20:59:07 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Thu, 29 Feb 2024 20:59:07 +0000 From: Frank Li Date: Thu, 29 Feb 2024 15:58:10 -0500 Subject: [PATCH v2 4/5] dt-bindings: dma: fsl-edma: add fsl,imx8ulp-edma compatible string Message-Id: <20240229-8ulp_edma-v2-4-9d12f883c8f7@nxp.com> References: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> In-Reply-To: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li , Joy Zou X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709240333; l=2253; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=69rs8YqYZCymIbs+K13VMFKLlvI1eiJnh+HrTKSOoFc=; b=xX8N0++pYL1AEHJXDs2/OPlAg9/V9HhdlB4GUXLEtluiFLtWTSz6mGjpBTvwzJp9u/UrfFt3j WYbxfwISmPGAvbGKX3g4OGlJm2u/H3YujwGsNRdT04vdfu8pPiNGKBx X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0060.namprd13.prod.outlook.com (2603:10b6:a03:2c2::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PAXPR04MB8750:EE_ X-MS-Office365-Filtering-Correlation-Id: 0cf0b413-f8e8-468b-9ee7-08dc396944f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jd4YuZRMp0P+0PZTR1xb0nauU+/u7aqMSNnM0/9rex9dfYCpkHpttQbgob8FxHt6Kkhe47+FGyxxdYd5zmpVTvyTa5x+rBEhJV+AwmzSaHbONabt3znzXc7Ku/CJ3ZbxPIeng1NGDH6pFB5f+tOPiyd0koGnXxGNEHaqLW3x9ZtD456UN4dMexcLxupYKMIfGvQjcx2TNn5WfdYPax90riI7ha6REnTjLOEk6reuzb947bRBUdeMPMHrWo6l9TZodr+bhtsAdiC4xHDRnWqi5z5cAiPXUPIejQMibyv1JL1f4VJTiugrHu8hGXooOHsh4l23xdlZ1rOwa7g2KWLyaBBZltFXuWTb8qai9rYQwL6fYY7m5lZ++Yj78uwCCxzBFwTNxakm3yXHikdjVfI1QN3yhd35T/MR4AvbWFmPCVLfMKCZnfy1mHIslXvsMJY7UE4bzrk9C2wGiUcQeb75D2wL5ZQ07HyYqu1NCyWt0AdbPrQ+51tiPONRUFyRrjw5M9tVqi4d5RlLPZ4VlpGifykkkh9jpDcfhvOg0+3vbSLUWP9xFmiDCnKaDpLYIkaxhnswn7dFT4sXgJWz/H9KEYCGBfLp/yHF07cuSM6rsLUXZwghjy5gsu9gDj6JFTBbvCg0AFnpZz+EqxdzMK1l6F9YEfTCl0SLwXM/YOEshK/VJhgdrOOy3PfYfJkDE5sADNaB0It+3dHEPsC9qNdMcGOkV9hkoiUZjBS5+Iv6yTk= 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?eJudv6kOqS1N1t9+k5yrpEC2zSzQ?= =?utf-8?q?38j3cA7/v8yulKB1o4/7PGJ9bhH7i7ZXxpMprSmDRvIA+QgQu11o/FDvMIDxIOf6z?= =?utf-8?q?So5jCnkrr5oAbiYdGq4j1JNyjU6pP92RwWS/v1ZHNsCN8sU6+ztoTcTR/I9HR7KrF?= =?utf-8?q?OyEGS8RVMpOjBjQswsQL4C7M7aY7ZbfkJbDYnQ3szamit2dBFMmQM8m4lpWVWYjFd?= =?utf-8?q?yl3tSB6YNej+2b0UB5fjvPM1P0il6gnI2qkD2oksnQiMGUpGDY4t7aOG9IwfN2DWC?= =?utf-8?q?O6w7afEt/44sYpjbTMfdIbt97R9d3wM8nLdDLECCs0sPerLDR1E02U+RO3kiprWFa?= =?utf-8?q?QtbpOf3k2nAyWd2McpKTEnQwbPLM4z1FCVmCl2jEaVWFey0Vh/1MT87/gPQtH1578?= =?utf-8?q?FT8m2hs8q6UJrKoMVJI7HvIXNR4YiYtnh5jPr8wZM7Vt1H1mBrSuFpX3jNePTBB/6?= =?utf-8?q?qegNsVDk2SWp9GbpqvlXKpm+2DvCeqfkYiEyAVkdFevUvbD9wteIutLivQ7TFHNf5?= =?utf-8?q?NHHVYMlyWTFbA/05Hz1iM4qE6X+0T37818vk3u7Pqz1nrLW5g3c2+bQaGTnsPB0VE?= =?utf-8?q?fufrF8ATvqwwhfpkBnPM8cCpo9SyhBkntJcVaPC/4sg4bUALCos1jhsqPqb9jKEuK?= =?utf-8?q?X7lBZ77UINvYQVzXYvVZGpJ+JUI33bZPDOLbDmwRAaWoiyNCNOD+2UJzjzVr00mbg?= =?utf-8?q?XFFUDccLhkZ8N8XnoQNJtxrID5ELOTGGSv5ESlaqhfL8I9bmc40ZBhii8kBcPIbYH?= =?utf-8?q?WhpnYdIZVEbrNyjbEBvvKxttHfhK1ipBIbeMfi/OOvmkQFZJc1blcIzlhfQ0vI9LA?= =?utf-8?q?zzR96z2a4oQKR/E2CfUKu3DAJfr6szQyw9sw8ucCybzXzP2oKEbIKI6O1Xl/gZCTw?= =?utf-8?q?ktYb2L3EELASv1PFJ0awgw5BMKdrn6lbR9CpZE7iZlPfMNi8gzmXolTNr+IcAJFbV?= =?utf-8?q?uclDEVwFFOEyfJNnzM3DWKpfUKTNlR5auhHthkabcErQmcaT0ob/rKTMf8sL9UM0z?= =?utf-8?q?g8cp5WTotlX+Lt7OD/wbiuOhfSEBJsHOmlDBExy3xfBXP8ov+7xjU/KLacvIMR6aK?= =?utf-8?q?6Em2sZISZZT4ltk5ZO0yUMkE5lRS9e85Zc0PKytqSZlIqYbHSwWJ0NM8QD6va5NPp?= =?utf-8?q?M3ZjmKXO8f2vvfL7BxBq5cFqh7B1rc7YEjEm+JeDmEU7rk775BTeq6ZSb15s684SN?= =?utf-8?q?X9ezPvV0LPSJjZE8UEDogI69OUVqH+3rQIlZ6cguynOI1uMSLveN2RlQ/TO15LuYZ?= =?utf-8?q?sG4koMTUuhK091BB7snXkcy2N7rCODnjbsP4PGEIRPvXF5PQIuFGvz+qBJVAvDc6T?= =?utf-8?q?O3+rRwV4RFKIYZKRE7IirlgGImqVN7YyJgfKcOjcLPEUo9bEbzi1Ci9zeN+06clhG?= =?utf-8?q?ONwJ2i6NTn4sSaT5uS04QzQqvz+EgTHRodEpQ20rfjZtRSgoR+oW2XXuqWqLxe2hA?= =?utf-8?q?JeDZdWi20VaQn05G9x95QtBHobO7qEM/mfWnuqE3sEQzU+c4JGUiF4qrP0b5INjNS?= =?utf-8?q?7y8t3xawK1qr?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cf0b413-f8e8-468b-9ee7-08dc396944f4 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 20:59:07.1838 (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: Phse07WjNjdaFCr0vXtvFV4jwr5zoM/vpMFpWbIJk/2XpeL2gssn3xyFPVOU01ao5hLO8Iw/22lGeKVt/rR3CA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8750 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792269139791548460 X-GMAIL-MSGID: 1792269139791548460 From: Joy Zou Introduce the compatible string 'fsl,imx8ulp-edma' to enable support for the i.MX8ULP's eDMA, alongside adjusting the clock numbering. The i.MX8ULP eDMA architecture features one clock for each DMA channel and an additional clock for the core controller. Given a maximum of 32 DMA channels, the maximum clock number consequently increases to 33. Signed-off-by: Joy Zou Signed-off-by: Frank Li --- .../devicetree/bindings/dma/fsl,edma.yaml | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml index aa51d278cb67b..55cce79c759f8 100644 --- a/Documentation/devicetree/bindings/dma/fsl,edma.yaml +++ b/Documentation/devicetree/bindings/dma/fsl,edma.yaml @@ -23,6 +23,7 @@ properties: - fsl,imx7ulp-edma - fsl,imx8qm-adma - fsl,imx8qm-edma + - fsl,imx8ulp-edma - fsl,imx93-edma3 - fsl,imx93-edma4 - fsl,imx95-edma5 @@ -53,11 +54,11 @@ properties: clocks: minItems: 1 - maxItems: 2 + maxItems: 33 clock-names: minItems: 1 - maxItems: 2 + maxItems: 33 big-endian: description: | @@ -108,6 +109,7 @@ allOf: properties: clocks: minItems: 2 + maxItems: 2 clock-names: items: - const: dmamux0 @@ -136,6 +138,7 @@ allOf: properties: clock: minItems: 2 + maxItems: 2 clock-names: items: - const: dma @@ -151,6 +154,25 @@ allOf: dma-channels: const: 32 + - if: + properties: + compatible: + contains: + const: fsl,imx8ulp-edma + then: + properties: + clock: + maxItems: 33 + clock-names: + items: + - const: dma + - pattern: "^CH[0-31]-clk$" + interrupt-names: false + interrupts: + maxItems: 32 + "#dma-cells": + const: 3 + unevaluatedProperties: false examples: From patchwork Thu Feb 29 20:58:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 208525 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp683406dyb; Thu, 29 Feb 2024 13:11:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW1lksZUh67PGCWiBx2nL+iQUBrr6HjCCRAzY9skEFustREVRiQhAtgOVgWHDpKEC9E4mv/Xz7RHY4a+l4Wht1d1K8G3w== X-Google-Smtp-Source: AGHT+IGhmqlA2UCLHXJXhAFiASuGxQ5a0foDEXwVbBXAIU6KLTgm6oIVfLf48KLfi2iG2TG/P53Q X-Received: by 2002:a05:6214:80c:b0:68f:d6a9:7065 with SMTP id df12-20020a056214080c00b0068fd6a97065mr3377161qvb.44.1709241069418; Thu, 29 Feb 2024 13:11:09 -0800 (PST) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id d5-20020a05621421c500b0068ff70e5f59si1656953qvh.285.2024.02.29.13.11.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 13:11:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-87551-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=dJcqudQl; arc=fail (signature failed); spf=pass (google.com: domain of linux-kernel+bounces-87551-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-87551-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 A7C8C1C219AD for ; Thu, 29 Feb 2024 21:10:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 257DB1586F5; Thu, 29 Feb 2024 20:59:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="dJcqudQl" Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2041.outbound.protection.outlook.com [40.107.7.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 981E7157AF9; Thu, 29 Feb 2024 20:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240354; cv=fail; b=UxA70I3GoItLY6YLAB3wmYqUZAGPdvUjwlEHQnufwj4RMBtCjUuZxg3LcJJtwmeKr61O7xRps6Mv4tMxcCL0/twF5jtuEhU8HhuhT0P4sCAvLBjUMsjjBsTW+tqFs6NnTIuR0ZFyKZ8I7NBk1rQb6K5/aFnB+2fS8IJVVf93OcY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709240354; c=relaxed/simple; bh=sVHqn6H+sRc+UeESOOt1xPOX/umNA7g2fhLtywnubOI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=jRBqIojmSwc5q/YkINXcwAulLyN4+vyNHxo1ifvcZ4Yy/J905F4TRPDIupOn2jsTK8I87F607Q7DUvWDS2NM6e73rVCNPijLuL05TMj+dhx0yGekTnx5b1s5f+l243bsmLuYen7wVdiQhaKI2DI0WMUdTs+yvAsNgghSSbxLV4k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=dJcqudQl; arc=fail smtp.client-ip=40.107.7.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oi1hMRVHilYOpAdzMdQR9FFgpWlsyAwk2nEIbONbHljgoGv0SrwqNhAVEa1hEUmMVA/Gup0rlXujrdYSmRJbGl7N2kImDrJ+7VrywL4kGUi78dMfSG6B+CCiQU/EAYob6PPgkc8xHhMS336oyXMVvFuann4Epg079FBwlxuadRCWzTTTS8yB4aPC5F+jap65PGKEbvLtVB3sglPfTRqAJgMOMONQgiSbV16GdM60I/6Bmmd2h6HBysB5F/kpicU8+0axM5iaIHNfWDCQQC51gIRkXdfgXkiotE8636sxec0NBFezgq8LdOV8gAsmUbxYDXQIYc5OoS5hRKbfADVK/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Xiz0Rtwc5CT1HzkoGwV9jE8Y6y1f6whfBWTv6CN9GT8=; b=ES8k9CNqAuhJnVcvdzREm0O0CmaDWDvcmKjuhrkjlts+8PeOugQ5N62y/vR4vZMo8EvTZv0hbFS7hphsxIQKDc/WT/9/1a/1ce90EH7mD2xtfJob0lGZiW4DeK8O/lycLPMfd9Sh1l03I8XsXGzwzeVVWYVCZCiyJvikI0wxtp3xWTU/4fYIRmm+is5VLgzAtoi9o4brYE8nBGMEFJ/mOGoFiZcx7y7dZuGV6lf/Y2gD4FgTdtArlfMwM9T0L8x9YkuF3QlEkUbIcMyPMrwShRWxRD1d/46ohd22KUIT6gA3EBE7lroD8z1HkjaAXKb43y/0ovsjdBOLbjLbn+JgBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Xiz0Rtwc5CT1HzkoGwV9jE8Y6y1f6whfBWTv6CN9GT8=; b=dJcqudQlFE9atGwUgP6veGL1pcc7pWxmA6/9PyzvaNWlFkUkjwK0wG08rfVfwA5ddolG5BHy8jjUWCSshdIR7YzY0ux7kbsoDAeYM1O8xe+xtfd8dUZ1XIWmrm30+0rChgJHzfBTSkKCwxR7A1e6qszAi/tVqswaLuh9qJtWcEY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by PAXPR04MB8750.eurprd04.prod.outlook.com (2603:10a6:102:20c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.40; Thu, 29 Feb 2024 20:59:10 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9af4:87e:d74:94aa%7]) with mapi id 15.20.7316.035; Thu, 29 Feb 2024 20:59:10 +0000 From: Frank Li Date: Thu, 29 Feb 2024 15:58:11 -0500 Subject: [PATCH v2 5/5] dmaengine: fsl-edma: add i.MX8ULP edma support Message-Id: <20240229-8ulp_edma-v2-5-9d12f883c8f7@nxp.com> References: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> In-Reply-To: <20240229-8ulp_edma-v2-0-9d12f883c8f7@nxp.com> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peng Fan Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li , Joy Zou X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709240333; l=4648; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=mZwQhUw7aTNjqUrbP8MTrIFtWNHaiIzM6PH4ott4At8=; b=GocKVEUJOnuGokK3N8i0kHvko6GHWHDEfwLd/IkuE/c5DDU7vAHmopefrPkEWsqTDAa6Kj4ks Jgt2+eytIPgDlWmkBrOTYdGqr/9EEC0V2Hjf7tn5Cpq6kctrBEL17fs X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0060.namprd13.prod.outlook.com (2603:10b6:a03:2c2::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PAXPR04MB8750:EE_ X-MS-Office365-Filtering-Correlation-Id: c52d7cae-6465-49c7-30b3-08dc396946a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8qnqoIVdpHhocoDwRmV12iORlukSF3ARoMPT6qsYlY4dd19+xRylShHhC7gaseFSWGs7vUUe0IvpFRvx+qrT6+USBld3+2yy09wSN0eed2UuqYmaqoEiPOVCnyvX329qOCykcZ8n5XEui2Q/PnF8VLxZxDjyVT73gN9S2n3km6Wmr5SjWc503BAO23qFXXdrOumjOgLWePj9aJHJkPU4xUE0K8vpC+wC2NJDtbRua7UhfV1weQTBfoGFDjEVpaW46RK1B9kzL8iNTE9zbRchBO+G2rtbmljbMGvFFMmgcsJEKB9/bN9JE+Gjw4vHwv1Lclt1G8VWsPVSsKXDeiAjmJ8dlrdJ+U6y0BaPSrwOp5keclzUemZFYXJGeYowv/jUxrWEn6bZbrGl4QDM/lSgYJAySCFy037g/ogrAqB802yBT5YoaEbn6nkqaa6qSpZpdVP66lPj60SsEd34MeEmVQ4k8aWc0Bm1kQD+NNPcEV+qc2Z42+mtW5iI0HmAVaqftU8R6z9YqXAPcqZE0X8gLFr6elfnC/4UpfcAg1haZ4Yczb9jRAsEduh38GrMS5Fo+oOxvMCPRwzD9/gp7NURjDGn4yhOTEWAMEprreNQsWRn5LFRfA1i/2z6mpOijjMIlQgfOvaTUlXyl8/8vM0ldWcMsJNLBdt/iagDbym+HvdgKX0lbbPuoKBg2M2mJZsPqRQ9YKYUk5wfkPBDi1D6BXLRytPZcsaYE+Pt264e/cc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/esJpUDMJTTL7h/BM1gwO11I+MK6?= =?utf-8?q?iuWqbJmqYOPrJWn5tIG599TGQDGWQaL19gl/Hwe4xWD198uek5SFnJtnrYvDuA4t9?= =?utf-8?q?3fxMLDkXmOY1/T8kaXujWFi0exbrqci4NirtRh0gdwt0XtuFgNyI4sPn3vCGmsUot?= =?utf-8?q?rIMAp7DCG/9ovNQB41C6oHoV9rxhm197VizhXJ8VvPhN6xDN9mpf2zwsvFBNRJXa/?= =?utf-8?q?zpBGE5xCx/ENmzNj3ksCP3iORlX/B5ntmrurymXbarLCFFN3H6NyYCHYgIbSDEiPk?= =?utf-8?q?seHH/fZykw1Oh7kbzN6rZWptrJNp7p+jp2Wks4KmM9btcDEa3SXQNTxf+8TCmElCo?= =?utf-8?q?k0h9yrsf4dJH898QNhFKy5d743EAG290z8LPPIt621rhSKehfuWER34EkI8gFLIVv?= =?utf-8?q?MvElFFUUeJI2kc2CQzlONDO4KuB5pl6SFjKUicN8SwvLiN9+tskuJ7QcrhMEpBX5l?= =?utf-8?q?zGJtA2/UbzsEv1JlB/sBEq+0j4uLDvpkCH3Rt5m7UoE6JLOc+IKEWYH6PBofufLox?= =?utf-8?q?LVbLUSPAMn8u/xw+BMZvfIfQaEouqtJoS6OccA37SeD0mR9cOtfKvpukjMr1o+xuI?= =?utf-8?q?oY7CtjpES5pR1CKS0kqd/Eirt4HIHpc7EIMLkR9r6AyL6nP7vUb/YBnmk2cvUJoaU?= =?utf-8?q?kV1ZNVI8xxqGw4O+QDJTkyHQ96hEtZfnRCrsvC54RcsMDGo6UmeR/2tytuAbQx4rB?= =?utf-8?q?l0p6N5IccKCA99bBGqNRFhy1uh7xEzDlVw/YDRCXQvGdIgss6Nb4O+of18wShZPnv?= =?utf-8?q?HTYx+goubvU+6FCKxg+YM1saW1a1HL55rdhQhzyoz2pCYti7FyLCAVG4mtfTivk2e?= =?utf-8?q?K2NIWdzSBnGQFr5kRnrTnDiagKdGSicxPJWcm99xF3I3wulrcxDMnZx2HvAuE8RFR?= =?utf-8?q?y+95Bd1deRHdXQz3d4cW5pNiEDedV4S4+swJDbI7c19nHYvwVEyBETr5R5U8/t1KX?= =?utf-8?q?zck65qqmNxQw2wYP7SEbUhcZg5mB5Lb4IhvoJ1q13PklZdoNEFNADkIZgjxSSTOIB?= =?utf-8?q?FKfql2eAqguIGBGVPuhKi5vRNCSXCVP8BU1U3706bAQ4hsLrbFWns3UWC9Zkj73Vq?= =?utf-8?q?IGcTnoFyWt8y1MRmF3zK6eBFKzH4BCHWa0tnUMhBqzZKZAMKjs/EpPDcDG2MxJUs1?= =?utf-8?q?QbvPAfgN2nVw7+ljyrWpWRJSQURnM3hY+BQQgVSyk5fd9rrU8wKl0laaUw6Agvvm4?= =?utf-8?q?kXCjXj9Rh1R/ZEnlsw/DPo8/DDe70M0IzvEs/8VDN+KKzveAlWwrCdDW44wEAfVWV?= =?utf-8?q?yyrHyet3vif4K8reN7Lp0XMFMMtv/i3milnbt4nJ1zN/P9JS4ve/LzvZTnWTF3wZl?= =?utf-8?q?8Ow5peXgeTTlghVCVsVXTA3e+auYH/WPtg3wf7fQz7YYcDk2KJBjAFbxzDFj6SbtI?= =?utf-8?q?EUrz7CDBmir2xrGsdq9Msza0F/FZ36T0tksN9nW+DRZ+8dtZmSchRAQSa7fohk/Xa?= =?utf-8?q?RIIwK0AYooSYSYZtPAM8oxjYff6o29wGGuE92R848TVk1+5Q2cG5JrGSqzmjoGGiY?= =?utf-8?q?Y00Fv5i+oEol?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c52d7cae-6465-49c7-30b3-08dc396946a9 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 20:59:10.0754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nAzqPHeLTZZI4GUC29fOOFxNBRhoEnGcV+N4Iww2+QXwgvWC036NPTzufQJ3bWSE7+n8CKSKVmNZ8dV8MnOPZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8750 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792269163663819093 X-GMAIL-MSGID: 1792269163663819093 From: Joy Zou Add support for the i.MX8ULP platform to the eDMA driver. Introduce the use of the correct FSL_EDMA_DRV_HAS_CHCLK flag to handle per-channel clock configurations. Signed-off-by: Joy Zou Reviewed-by: Frank Li --- drivers/dma/fsl-edma-common.c | 6 ++++++ drivers/dma/fsl-edma-common.h | 1 + drivers/dma/fsl-edma-main.c | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index b18faa7cfedb9..f9144b0154396 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -3,6 +3,7 @@ // Copyright (c) 2013-2014 Freescale Semiconductor, Inc // Copyright (c) 2017 Sysam, Angelo Dureghello +#include #include #include #include @@ -810,6 +811,9 @@ int fsl_edma_alloc_chan_resources(struct dma_chan *chan) { struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan); + if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK) + clk_prepare_enable(fsl_chan->clk); + fsl_chan->tcd_pool = dma_pool_create("tcd_pool", chan->device->dev, fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_TCD64 ? sizeof(struct fsl_edma_hw_tcd64) : sizeof(struct fsl_edma_hw_tcd), @@ -838,6 +842,8 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan) fsl_chan->tcd_pool = NULL; fsl_chan->is_sw = false; fsl_chan->srcid = 0; + if (fsl_edma_drvflags(fsl_chan) & FSL_EDMA_DRV_HAS_CHCLK) + clk_disable_unprepare(fsl_chan->clk); } void fsl_edma_cleanup_vchan(struct dma_device *dmadev) diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 532f647e540e7..01157912bfd5f 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -192,6 +192,7 @@ struct fsl_edma_desc { #define FSL_EDMA_DRV_WRAP_IO BIT(3) #define FSL_EDMA_DRV_EDMA64 BIT(4) #define FSL_EDMA_DRV_HAS_PD BIT(5) +#define FSL_EDMA_DRV_HAS_CHCLK BIT(6) #define FSL_EDMA_DRV_HAS_CHMUX BIT(7) /* imx8 QM audio edma remote local swapped */ #define FSL_EDMA_DRV_QUIRK_SWAPPED BIT(8) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 41c71c360ff1f..0837535aa7548 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -356,6 +356,16 @@ static struct fsl_edma_drvdata imx8qm_audio_data = { .setup_irq = fsl_edma3_irq_init, }; +static struct fsl_edma_drvdata imx8ulp_data = { + .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK | + FSL_EDMA_DRV_EDMA3, + .chreg_space_sz = 0x10000, + .chreg_off = 0x10000, + .mux_off = 0x10000 + offsetof(struct fsl_edma3_ch_reg, ch_mux), + .mux_skip = 0x10000, + .setup_irq = fsl_edma3_irq_init, +}; + static struct fsl_edma_drvdata imx93_data3 = { .flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA3, .chreg_space_sz = 0x10000, @@ -388,6 +398,7 @@ static const struct of_device_id fsl_edma_dt_ids[] = { { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data}, { .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data}, { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data}, + { .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data}, { .compatible = "fsl,imx93-edma3", .data = &imx93_data3}, { .compatible = "fsl,imx93-edma4", .data = &imx93_data4}, { .compatible = "fsl,imx95-edma5", .data = &imx95_data5}, @@ -441,6 +452,7 @@ static int fsl_edma_probe(struct platform_device *pdev) struct fsl_edma_engine *fsl_edma; const struct fsl_edma_drvdata *drvdata = NULL; u32 chan_mask[2] = {0, 0}; + char clk_name[36]; struct edma_regs *regs; int chans; int ret, i; @@ -550,11 +562,21 @@ static int fsl_edma_probe(struct platform_device *pdev) + i * drvdata->chreg_space_sz + drvdata->chreg_off + len; fsl_chan->mux_addr = fsl_edma->membase + drvdata->mux_off + i * drvdata->mux_skip; + if (drvdata->flags & FSL_EDMA_DRV_HAS_CHCLK) { + snprintf(clk_name, sizeof(clk_name), "CH%02d-clk", i); + fsl_chan->clk = devm_clk_get_enabled(&pdev->dev, + (const char *)clk_name); + + if (IS_ERR(fsl_chan->clk)) + return PTR_ERR(fsl_chan->clk); + } fsl_chan->pdev = pdev; vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev); edma_write_tcdreg(fsl_chan, cpu_to_le32(0), csr); fsl_edma_chan_mux(fsl_chan, 0, false); + if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_HAS_CHCLK) + clk_disable_unprepare(fsl_chan->clk); } ret = fsl_edma->drvdata->setup_irq(pdev, fsl_edma);