From patchwork Thu Mar 7 17:32: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: 13586088 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BF295C54798 for ; Thu, 7 Mar 2024 17:33:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=otNKlnY6+VAZCz8LBHDFJob1Y88H3OonLzZh/v1kL4A=; b=XUndMz9cAOHvl2OUEJt88Wlnl9 wgwnaxfZ3bFm3Tix2mnAzyLKoVR+hEhhcX5dRrmwf9DWsSZTfHyOElwTfHJSSrWQKFmfeWlVNeagW 2tVc273feh5Gw+AeTpKoonpgU+j8ElGT1IeHklZGDS28VKbA0v7tcHRyFl8zspetse6F0WGcW8FnF 1EBoPcHe+91L45mEzNDjcCSt4UlNeqFgSo8XOqir7Clu2Ko9LidS+XD2yFLR1bvEXi/gI8OS+1EHW e77xjeQ5ssI0KfaGThYB2B3ukUu/xzAfXuUt0Q1T/bTmhXA+SMlWv4/k67NiXOWArCNYakOo45fwU vtFnE/jQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1riHca-00000005iAP-0oel; Thu, 07 Mar 2024 17:33:32 +0000 Received: from mail-vi1eur05on20600.outbound.protection.outlook.com ([2a01:111:f403:2613::600] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1riHcR-00000005i3P-2wnI for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2024 17:33:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bDQww+5cwlVngMa7ncEMPKPkUTamJ7djFJfbMdmM1BB8SoS45U+Y/jB/ecwk4oEcGTGjmiQ3jATRSIpzfQ5QKxmZCs3I61A8EopzeMNkLmBTtiS7CkejTSbvK/pzqlkPgp5PS9Z3qBkPKLHKPn7Ddb2DBW9O3jxxewUeGEjjLaJL+S1Q16eFiA651GJs+2MR7p5XpJmgxZJSNhmqwR0ErkRlihJ9hlBAHfJc1dIO1dtGui1hzn9UHg5eVM3wOwKgQybnRUThGixkR48D9IzfZKUBcaN7uRRtEeGzx3dEFRtlQhaod71j3pL7W/8ZYcBd/A7JemOE2AybYpItFH/0Zg== 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=HNipCopR1actSPpQ2YFnLhWfTN7OElPPaWSFF7H3oS0=; b=VaFNsVDj1Ckyyg3EuabvIXWCn/GgSbCg4dXUO0h5Ri7FtBXKoekn7di4tDrfRobEMtcTogag4Ed7eXbFVO9UtJ9dtYdqBZDJhf8qz31udnirZ11jWwcg1Q5tGwu0WQkCFmdmKmEJDxBTFX/oe4TN1Jfq7nc35HgDsyTedK2PW/PBFpzE0U27QY+MCrdE+yLMq7nwKnPFf7GIU/dYREMTSlIZLKH1ej5yqRe1z4Uq3L8FOtmxVu/yaMD27//ZyIyqCdmcOVDtBPDrYPygii6qpDFrfywkwvLfK5GXUITOEcJ5R4r3AZlcZQ7edF2OAmBSu6UQIpbUxdSoH0aoZSUxvw== 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=HNipCopR1actSPpQ2YFnLhWfTN7OElPPaWSFF7H3oS0=; b=M98HU1Cd3MFw/cNW+hniD/yU0peWohShr5Otmy2uxAlo0o3U/aUrHsW/eC4CoOyduyXZpivHHlG8/NL9XC1l6bioy9rwZFGL+boApBn7xvu7z0mIMA6G5i727WMroDMB+5Z6iU6gBGYY4rxoQ8xL8ybLkLFdwrfubUhGPhbzaPo= 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 AM8PR04MB7794.eurprd04.prod.outlook.com (2603:10a6:20b:247::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Thu, 7 Mar 2024 17:33:21 +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.7362.024; Thu, 7 Mar 2024 17:33:21 +0000 From: Frank Li Date: Thu, 07 Mar 2024 12:32:43 -0500 Subject: [PATCH v2 3/4] dmaengine: imx-sdma: Add multi fifo for DEV_TO_DEV Message-Id: <20240307-sdma_upstream-v2-3-e97305a43cf5@nxp.com> References: <20240307-sdma_upstream-v2-0-e97305a43cf5@nxp.com> In-Reply-To: <20240307-sdma_upstream-v2-0-e97305a43cf5@nxp.com> To: Vinod Koul , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, Frank Li , Joy Zou , Daniel Baluta X-Mailer: b4 0.13-dev-c87ef X-Developer-Signature: v=1; a=ed25519-sha256; t=1709832785; l=1314; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=lYqK9q+URTn4zwdOYmJPQcGPKoeaMuMJQOuUDFYyhpU=; b=beu0/DrhG9b59bHhv6VSc7520pHz9w/Q5utXqsj5/jxu0ChYUXWIE4PD23Mk9YvLKY5R7h69h hhQDTiGY85EAV9sMMDkFxT1cJJJww5+XIctlamy6U9aiVbb8CXYzXkG X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0065.namprd13.prod.outlook.com (2603:10b6:a03:2c4::10) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AM8PR04MB7794:EE_ X-MS-Office365-Filtering-Correlation-Id: 694209ee-3837-458a-45d7-08dc3eccaf60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5ZeXWdZrGKRrE6JQivpC4d4dDumYKnwmJfcYmrZ8ucQYpSGsscUm5MBqC65iREw8mO4N3w4ndyKTiM4Zt2kcKZxiJ8cL89m/Rkci0gwtcSZ0Sk0UvWk2M5WgC1YyyOmeLH10wKePAlxd/sfOEZU53LHvLUr5rk+G6CL++kmgjLOOoVMyJEYPoDjrcpYYBWY2yjIPgnv3wIOWDdVwrVx1UwMMLjSxpHSO1yxt15jqv3Ey+QpVExAUIc07mnwc/3/V7Rj5b8Wb8+kM9ZfWWHF45hA8/gEVoV7K8Ups4VzX18YoLnf0ZTcu5z3REsK6BAb2vlAgaRQ+hra7MoYk2/sS8sTxRP0vBZGl2HtqY4TJAR0TQwQVMyuM4fPmprTXNOZ/mtgLWnfqjymTtneK4vvM3l/Mc/UJf0kd6Wlv5es9pR4ClqkJJ7llqKe9mX1NhtwzZVz5EX8tT3qtlDpwzNBVkgdhwtqFqSwUZNx6+yLQHAYPvP2e+cj8aRt1fc1NxkCa2SiCKphdPyKuv3VVA4qs7rNsmBcuY6WLu5qLNnNRZZH/Kc8nPz9LnT2wbP/WHpmmDZ8oVeT18rEYAhNZpc2DehlWjSW74kMPh1l2vIQHTZMXlIXTzGNL2zqZMSpa/9MHc8byxmutNgUvsZTOd8pAUXGhphQvcvWUjasItTejSmSNqjBojxpvH9eooLpvc/lkKFAHrow2i9cawI7sfiVJyA== 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)(376005)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dluN4MKanddOgubrYGfxDXtmlXBn?= =?utf-8?q?BxzWF1c1sEk5/QEyodzexR6qH392CtqaeMhnKEOjWlzAV2SkYR83gj+i1Dnp2BBTK?= =?utf-8?q?SWtGeyNiIjPFYp51GLwtUMln/Ux1MJ++6D/adOJaT0az1QXuoGZBltcbl8QXs1e3z?= =?utf-8?q?qddEvkdK6YuXZDlyvBAEQ5TSC5YpWp3TJzcZuclhOuqm1yxgrrb5UbPm75UI1FWu8?= =?utf-8?q?5lDYGctztT4qPlNiwDf7NMGTE1T83muPhGpKbed33mD8OYc0ABIfeJ+WFGM6qPYrI?= =?utf-8?q?bFVzbumAom8yJPU5ebmIszFPluCbOAksW+athwA+0cliZE/GiaV+BR+hqM9iuFeA+?= =?utf-8?q?VPxIgzICrrkpt2vLp4jADqWt3Ebq4lquIAJWodSpRRqTEb5hEh0Hh+6lBZ9jj588j?= =?utf-8?q?EH/3Y41Fu7G0yLjtl/lLpTuyb3Q9dEHo2TzvZzR9IViTrjdBAcgDBgach4uaulb5W?= =?utf-8?q?aiDqWxmuf30mhGXROl5hdxN8Z3pfIE+0ar/A3QlkAtOWI+sIPlyt4CFlqpz/4T9JD?= =?utf-8?q?Ga+CW/f41EPhKk94aalM8LDmyqo9AnL6zxjxrygfYP33U4qjn66DhTdCjuVBC1ZJy?= =?utf-8?q?Gkgw/7pxva0OQSvdof2em3IEbcxk+tAmwKnx8aA29+iXLuVO/mafd4PAt+2Lj9K6L?= =?utf-8?q?fqPegxmhVbldQatbWda61baGzeQLyYNwb19CN/luF+KwRG+maQ6eml11GG5sJSZd1?= =?utf-8?q?y4ulwSPt9MJX3BXeNWnWwvgSYSORtIX7m2I/3mxh2Y3tSQ8FDCJ+s71IwWGvU1AYv?= =?utf-8?q?MGpyCrF15PJMed8W55D2ArZkqUNxLqBvc01sd9K5p132bQn1mAiYDEbWumpkyWkhV?= =?utf-8?q?BKVMAurEMPeg+tNofCNTVwYDn9/G0mxiWueP9mqE4ASqhWV9cgQwIIGCoSRWtpqla?= =?utf-8?q?eDEGS/aCs/n0BCx2Au/VHBYqKUl0tms+TwA7KcWAf1e/VfQzNZ4WH4GtxAronsZL7?= =?utf-8?q?8Ci5BBkvXYxQK/J5feJzuU4k9zASSmrJ42aHJm2e1wr2OGUQPZsO0MP6PswLHAtxq?= =?utf-8?q?t0Ol0ydRQyBwRpOPwykuf/81k8QTgUk0JuyJBxipBkbwBXZC+rMgYiA9se7B+wDaI?= =?utf-8?q?W5+sZlEeIh0exbXRcUlhvMivp4kSR01EjkJcKyhzPEi1AcxcbY80KJIp/g9MI5ALQ?= =?utf-8?q?7uffypYG98s+wT/EqJMuotC/MqZA9Bi3x1IoxvWIB0J0HgjU3BkXMoElmzPLydHkp?= =?utf-8?q?Ej86lndTZGm269FASQSkH0V9oR3E0aYU4tzF6LhI+3P9i9aGe/2zrRAoyRDkVGhSK?= =?utf-8?q?MAAHsWv30rWUn4MnplwAdv212mqDkwbjvvobekHaIfMJvH+dT2kFr81Nv5r93Yr8g?= =?utf-8?q?O9Ir0vt6ySNBwRWwzUTz/6KwN9TGsWDh6QkR4GOBk1zfya4HLkd5KNEdd5q5tbG11?= =?utf-8?q?MuXYrScRdHKaZhD1jSTSIH1FD8aYBmmc1jnryRa1vxWvEyiXNM5CFPYizrqEQV7lR?= =?utf-8?q?Uq+n68yilkQGBBzbJZYjVGj3PsjNKXOuy9O2T0jFZH0jGFlGy6n3gV1QZr7j+YjUS?= =?utf-8?q?GfXLnTn1sM72?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 694209ee-3837-458a-45d7-08dc3eccaf60 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 17:33:21.7215 (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: 4BlNZyZyWxadOsns7+SVbyMtf0uxgRiC6416AtDqqWPLATdLg+ZwfFuaA1U/Y1idOXuzU8KFPijxrYDzcCucJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7794 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240307_093325_952711_5FE4F8B5 X-CRM114-Status: UNSURE ( 9.37 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Joy Zou Support multi fifo for DEV_TO_DEV. Signed-off-by: Joy Zou Reviewed-by: Joy Zou Reviewed-by: Daniel Baluta Signed-off-by: Frank Li --- drivers/dma/imx-sdma.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 6be4c1e441266..35fb69a84a8da 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -169,6 +169,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 +1260,11 @@ 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; + + 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)