From patchwork Fri Mar 29 14:34:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13610664 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2139.outbound.protection.outlook.com [40.107.15.139]) (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 9120013BAD4; Fri, 29 Mar 2024 14:35:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.15.139 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711722927; cv=fail; b=k9//CLCHPMETYl2Qzpj98hskaUmTUOQxaCUcaBVGtb4KrtYazV9F+HvGxP2XSg1ZQn7pYoZD7Zv1oDOtlrEbZBpnThuv6b/Ia833pczTxEB+jXJ+ApyUYxAYvuralWf+PgzEAwUABrhApfvBs6ZXPfXmUvt1vWVFz5h6++VySzM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711722927; c=relaxed/simple; bh=WDtLyRQI+V5vTiC7LmgN0/WTeCcbXau+vPvX1ltm1Eg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=bFYPo8UJVDSWTzD67q3y0mCYBrj+gyy3RIPbpJrvQrZ1V21KUkhBf12YRZ6yV1vSLHMPX5PUHI42WEk5h3vdAKSLDn4YV82ElU8oLO3/tSZS4M6c0130qLa/p3bIwKf017Qy4yHDDNyKK4ybv6pUGYJQzvMmH/bo0g3hUW+ZzF0= 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=K1pOOc0p; arc=fail smtp.client-ip=40.107.15.139 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="K1pOOc0p" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QAcr3kMxi8KcMQ8yh3Hc0EDmj+wqlvqrPhyQtI95T7tX407+ip2yc9ukTfSYNb4Oi8i2y2n+3QXkqYCP9HnHbiIBx5GOIvyeypcyLFGRU6sWSgtNqYMQ54BtnohMJBKBSoOK9LSoq+ehvJt60AVmfdHaXpRAPLURvtkTQ8S25i7uBim/3cqUqF4jGwcMwV/J2qXaw/JYbG6oB+poUs7o6ESfXiNzj6fEj2VDUPdPMexM92/41ZQdE2v+L074u1/oqBgkjy5jOTO5suVlChrL4BmKd/YT9mYkWST4CJrxLZZx95pZrrtrpaZsia8PLQTtD3xUMo3Popju9/1Bjn2o0Q== 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=6smyow8kf6oBw5BBoj7lAbZzkwWsN9AQy5l1oH7+KpI=; b=i7poIuEuz3mRnucU18GQmkoMvWoslmu2TUNq0oaYB7pNrldG593S+z+seDN50lN6VyM1wA7RGv/9KJovZzua78YdSKkDzup1bJR3DP5cQVQRY7NfFPmg6uxqV6JGQpwCVVFle8xkkA9Qq0pGJD5E1E1RgJhUMBfCY8U1friVqsbvRpZtL/9A6Wj8NpdmfWfC7KxyvClZPQPz3Gsim53tXdMnIYTJbaF7UxSGT42GPKHyFykr47gsjDium/CAFqsacPm6l9+PKbuxMLPuiKb6y6Vfm27ruwu2u7Tbmut7ZE42PaehRLEUEOFJolwEC9A9BgrHoi9PYeQx6b8HErkvGQ== 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=6smyow8kf6oBw5BBoj7lAbZzkwWsN9AQy5l1oH7+KpI=; b=K1pOOc0p0OiRfE5vzu4cK+7AfjiMOAUMF7tvEl757Y8r0jt5kPD8xZuF4jANlAnZIcliemRizczdGDrjQ5ZQCgSYPsZimo9wJRpM2tW8bDB/3CvK2oz4xLjYnHRbrg/AQEwdt4Ed8m1lnZ9tSeAHiGtlkQBOTBMpy0ymRAipja4= Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by AM0PR04MB6897.eurprd04.prod.outlook.com (2603:10a6:208:184::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Fri, 29 Mar 2024 14:35:23 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::3168:91:27c6:edf6]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::3168:91:27c6:edf6%3]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 14:35:23 +0000 From: Frank Li Date: Fri, 29 Mar 2024 10:34:43 -0400 Subject: [PATCH v4 3/5] dmaengine: imx-sdma: support dual fifo for DEV_TO_DEV Message-Id: <20240329-sdma_upstream-v4-3-daeb3067dea7@nxp.com> References: <20240329-sdma_upstream-v4-0-daeb3067dea7@nxp.com> In-Reply-To: <20240329-sdma_upstream-v4-0-daeb3067dea7@nxp.com> To: Vinod Koul , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joy Zou Cc: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, Frank Li , Shengjiu Wang , Iuliana Prodan X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1711722904; l=2211; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=f/3k48+9FaySkCBcvGuMB4syTNvpqPDE/E6mQZq2QGQ=; b=UJ+qrh8+F4HLdPlVyBD/nfhfBula+Xu8HW7enHougqJY0Q3530GMrKdkcu5kBu0U3chz9uJQS p7fGcjoiGzjA8EwVIbtgZVUgUPK0f/l6QeShJ1/EhUwCNVJThrTJJHj X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0153.namprd13.prod.outlook.com (2603:10b6:a03:2c7::8) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AM0PR04MB6897:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dFi84h7XCbk7kt774IXUOufVUoWNpyrpmP8hPWHFvJPiKjkNGx8QYgRuSI1jQCxk8EoKYe4+crMXObmxVzK4GwkiBq5BUqj4bKNSE3ptj2NBq/c6BlI+jLnYgzcTkpFCySwdnwLj4p6uvXpx2jarqzYAxSD9E8rL9gLNhHeCMXm0DNGtx03IAvmeqOIa1xxWh0dSIKRtXZuSiEsUvHVbO9T6zOlqcXUG+u554Y+3WC7yB8vpK0FbiCq1iB3nXCYG++Cd/qR33kjBlkr9Jo+HLmdTtNtiulxd+2gg98xQEzlhW/IHqOmnpr8sTEhqD9gG+mupFiSc/TtdXNwzm5eiL4AZkkIfqQ4SzW78xlqnFYWy+Z4imDh4tclDysOXyOYTE+AOblkcgMne8MlbS0Vl7XVC/vXi4jIAltmhE1z2jjDcX4rR01FYYmvaQF7XWVhbsk8QOrpsIC+dSRRUrQ5ggPV74cO+k3ULfQ6A0JPaxgZkEJm93IzOqum3zINkJgI3D8r5iPLQATAj/OVyTeJovNC+9151reBf86ybMuT58v1EKCsma8iCfkdweKS5z85Je2bxYdVUuSAfyT8BsyslWZTrYqqpBcrz4EWNYba96777btDifR4zbsLSBdgsO23dVQM1De/tbe1RKuTnoPLFNZudItE2EqwQmrC/suRyT9WDlaGyNWfzZCEIFiRiTcMiyIL6uh8FMtTrKWdon/Uk3iaROoy3pIaMe6jCFQJl+sE= 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)(1800799015)(366007)(7416005)(52116005)(376005)(38350700005)(921011);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?eKqYJlGoxjOhyWZKtFlV6FrR9SS+?= =?utf-8?q?vMUt4xBlbshbDdhQ3laesQnBPPPRecaLPhLpOV3pWo9/4lC+VsXgUx4i1uWwON4Ab?= =?utf-8?q?uhMIteHHii2p33wZnP90Vmi18DrVBR3gPWis2j3Wc+oUr+pE5mf+y+8CGzMO69WVG?= =?utf-8?q?Iyy4++OrOc8QSB2XnlNBxn9WFrujjLDfb+yNdHhMojveKZbJ7UBkUbbfm8LT9g/KE?= =?utf-8?q?91ckBbmhggG43iU5cP89hX0tG7u2QWy40U+JIud8mUF6fPi5WG5QxT+v6XBjfoABK?= =?utf-8?q?Bu/gzJ7QFVwG34qaLMD64f4GCnTmNbGaaSIF7pG1SDTxL+gOcUBmOcco33r+WAUh7?= =?utf-8?q?d6c6fLq8guR8AOwaOQFu+8P2pEet609fpTdxkgQbAQDOqz6KUrzHwUOQLmY92KHM/?= =?utf-8?q?ZfJ98031Y+Ga4prYbHbcLvTOlZsLKiFMrbYSwnZUyzZX/bOqJmtvtnYUXM3sX9J6c?= =?utf-8?q?/bkHX/dBE9w0CHogiYFh7ApaKsMNV6Or9icuI3WdQaUhpjLBpai866MXN2cSV8mac?= =?utf-8?q?JLFR+/Z1lEuWV36E8na4mk+FlTbfvnkJZ4Hy/YMvpg/ft/6DPht7xsxJcPnEvxOlV?= =?utf-8?q?qd08B2WCbvn5l5JA6e/7+oo2ANFUZGYQRm+bcuKXutjWkquaIYpHHe+fOMLChgIX8?= =?utf-8?q?wtm9hzCq/ltQCxhlD4BpWIB4FVN0yw3w/1AJU6GzgNOIYq+Nfu5WOggUc5N/iXcOV?= =?utf-8?q?FpYa1A1MHzC8liKAuip28B8GS7E725SdFoALZI29v/mcvF0u5mk6yheGCsDD7FeiQ?= =?utf-8?q?emq7fAqhFb7jIR+O3hT00VC9UQyaFllZoks8eGy+02VUuR/kZr5+/eDCi83MEjC9D?= =?utf-8?q?2uP+moBcYM8PnORjSgcqyXO312wuU0g+zZs+fLt+q1pvkHaKxA+93GjbJ3i5yN4y/?= =?utf-8?q?bZjoRnPYvbA9AVE7OMfJj1oiGJd3JPU+MOz1UuX79XEfvy0sT+kAmmKT4e2nZwpKu?= =?utf-8?q?a77in2HVR3SrPGVDsy1YwAyvuD58HzChVXf2iwgAEtoE8pQR+JtafoR+yyUhiNN49?= =?utf-8?q?jPngGFewJxnmkFgOmcitpUYU08Pw2U1OzDL/ZpTzLwhJ5Pc+Q8MQXgq9gNaQiGmxC?= =?utf-8?q?nF3wci/Dsfa3soQiFiNmhoL6pJ0GO+e6sgUcePNjemS3gyFsQCldF2QYOkgWThNs4?= =?utf-8?q?s3K/8V6hVILjcQZBTx6BkzErX+sEELcKn4dlxFwcmyUJ52LxiSDe6FWTuCWAQO7h4?= =?utf-8?q?ww5/QtTEpUiqgJEdBZTeHTe8JJXUPwED0jVtdYkc/iVybPbTjpNWHt12B/rbYxp97?= =?utf-8?q?HVTQbDZcXL7x/OPWOYeRWiRZFV43zAe8TRvfsICvnGNogzGPG+olvmjkbUpaHGv37?= =?utf-8?q?TmWxbW0GnJHSmnjDQGUB3DjeVERWPGIhDG/qQVrP8nz7ZSZ0LyiUOAqIc6D++iIq/?= =?utf-8?q?szgszIFV1ApHgXKyknBhl981cASDc9w5C5EEmD7mIXLEXGTR6lAxz9VghWUT9iQBq?= =?utf-8?q?lN0hRJeT6UJ/5esSP5m7qoePx0Q2tr1Uwtqj/tD/+ZMg5QHUd4+YrX3oMmZhtydOm?= =?utf-8?q?GP4DbzR96RT0?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93270e98-d73e-4195-d698-08dc4ffd7788 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 14:35:23.1367 (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: /7P/5v9n1NA/aedrJM3ZR8661xxSgjzUB3uQliy8GrIHXMeDuFWHBm4YGH3PImhrjRA3r1LTS8xTVuAfzo0MYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6897 From: Shengjiu Wang SSI and SPDIF are dual fifo interface, when support ASRC P2P with SSI and SPDIF, the src fifo or dst fifo number can be two. The p2p watermark level bit 13 and 14 are designed for these use case. This patch is to complete this function in driver. Signed-off-by: Shengjiu Wang Signed-off-by: Joy Zou Acked-by: Iuliana Prodan Signed-off-by: Frank Li --- drivers/dma/imx-sdma.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 6be4c1e441266..f68ab34a3c880 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -138,7 +138,11 @@ * 0: Source on AIPS * 12 Destination Bit(DP) 1: Destination on SPBA * 0: Destination on AIPS - * 13-15 --------- MUST BE 0 + * 13 Source FIFO 1: Source is dual FIFO + * 0: Source is single FIFO + * 14 Destination FIFO 1: Destination is dual FIFO + * 0: Destination is single FIFO + * 15 --------- MUST BE 0 * 16-23 Higher WML HWML * 24-27 N Total number of samples after * which Pad adding/Swallowing @@ -169,6 +173,8 @@ #define SDMA_WATERMARK_LEVEL_SPDIF BIT(10) #define SDMA_WATERMARK_LEVEL_SP BIT(11) #define SDMA_WATERMARK_LEVEL_DP BIT(12) +#define SDMA_WATERMARK_LEVEL_SD BIT(13) +#define SDMA_WATERMARK_LEVEL_DD BIT(14) #define SDMA_WATERMARK_LEVEL_HWML (0xFF << 16) #define SDMA_WATERMARK_LEVEL_LWE BIT(28) #define SDMA_WATERMARK_LEVEL_HWE BIT(29) @@ -1258,6 +1264,16 @@ static void sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac) sdmac->watermark_level |= SDMA_WATERMARK_LEVEL_DP; sdmac->watermark_level |= SDMA_WATERMARK_LEVEL_CONT; + + /* + * Limitation: The p2p script support dual fifos in maximum, + * So when fifo number is larger than 1, force enable dual + * fifos. + */ + if (sdmac->n_fifos_src > 1) + sdmac->watermark_level |= SDMA_WATERMARK_LEVEL_SD; + if (sdmac->n_fifos_dst > 1) + sdmac->watermark_level |= SDMA_WATERMARK_LEVEL_DD; } static void sdma_set_watermarklevel_for_sais(struct sdma_channel *sdmac)