Received-SPF: pass (google.com: domain of linux-kernel+bounces-125090-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Fri, 29 Mar 2024 10:34:43 -0400
Subject: [PATCH v4 3/5] dmaengine: imx-sdma: support dual fifo for
 DEV_TO_DEV
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
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 <vkoul@kernel.org>, Shawn Guo <shawnguo@kernel.org>, 
 Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, 
 Rob Herring <robh@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Joy Zou <joy.zou@nxp.com>
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 <Frank.Li@nxp.com>, 
 Shengjiu Wang <shengjiu.wang@nxp.com>, 
 Iuliana Prodan <iuliana.prodan@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?ZUtxWUpsR294ak9oeVdaS3RGbFY2RnJSOVNTK3ZNVXQ0eEJsYnNoYkRkaFEz?=
 =?utf-8?B?bGFlc1FuQlBQUFJlY2FMUGhMcE9WM3BXbzkvNGxDK1ZzWGdVeDRpMXVXd09O?=
 =?utf-8?B?NEFidWhNSXRlSEhpaTJwMzN3Wm5QOTBWbWkxOERyVkJSM2dQV2lzMmozV2Mr?=
 =?utf-8?B?b1VyK3BFNW1mK3krOENHek1PNjlXVkdJeXk0KytPck9jOFFTQjJYbmxOQnhu?=
 =?utf-8?B?OVdGcnVqakxEZmIreU5kSGhNb2p2ZUtaYko3VUJrVWJiZm04TFQ5Zy9LRTkx?=
 =?utf-8?B?Y2tCYm1oZ2dHNDNpVTVjUDg5aFgwdEc3dTJRV3k0MFUrSkl1ZDhtVUY2ZlBp?=
 =?utf-8?B?NVdHNVF4VCt2NlhCamZvQUJLQnUvZ3pKN1FGVndHMzRxYUxNRDY0ZjRHQ25U?=
 =?utf-8?B?bU5iR2FhU0lGN3BHMVNEVHhMK2dPY1VCbU9jY28zM3IrV0FVaDdkNmM2Zkxx?=
 =?utf-8?B?OGd1UjhBT3dhT1FGdSs4UDJwRWV0NjA5ZnBUZHhrZ1FiQVFET3F6NktVcnpI?=
 =?utf-8?B?d1VPUUxtWTkyS0hNL1pmSjk4MDMxWStHYTRwclliSGJjTHZUT2xac0xLaUZN?=
 =?utf-8?B?cmJZU3duWlV5elpYL2JPcUptdHZ0bllVWE0zc1g5SjZjL2JrSFgvZEJFOXcw?=
 =?utf-8?B?Q0hvZ2lZRmg3QXBhS3NNTlY2T3I5aWN1STNXZFFhVWhwakxCcGFpODY2TVhO?=
 =?utf-8?B?MmNTVjhtYWNKTEZSKy9aMWxFdVdWMzZFOG5hNG1rK0ZsVGJmdm5rSlo0SHkv?=
 =?utf-8?B?WU12cGcvZnQvNkRQaHQ3eHN4SmNQbkV2eE9sVnFkMDhCMldDYnZuNWw1SkE2?=
 =?utf-8?B?ZS83K29vMkFORlVaR1lRUm0rYmN1S1h1dGpXa3F1YUlZcEhIZStmT01MQ2hn?=
 =?utf-8?B?SVg4d3RtOWh6Q3EvbHRRQ3hobEQ0QnBXSUI0RlZOMHl3M3cvMUFKVTZHemdO?=
 =?utf-8?B?T0lZcStOZnU1V09nZ1VjNU4vaVhjT1ZGcFlhMUExTUh6QzhsaUtBdWlwMjhC?=
 =?utf-8?B?OEdTN0U3MjVTZEZvQUxaSTI5di9tY3ZGMHU1bWs2eWhlR0NzREQ3RmVpUWVt?=
 =?utf-8?B?cTdmQXFoRmI3aklSK08zaFQwMFZDOVVReWFGbGxab2tzOGVHeSswMlZVdVIv?=
 =?utf-8?B?a1pyNSsvZURDaTgzTUVqQzlEMnVQK21vQmNZTThQbk9SalNnY3F5WE8zMTJ3?=
 =?utf-8?B?dVUwZyt6WnMrZkx0K3ExcHZrSGFLeEErOTNHamJKM2k1eU40eS9iWmpvUm5Q?=
 =?utf-8?B?WXZiQTlBVkU3T01mSmoxb2lHSmQzSlBVK01PejFVdVg3OVhFZnZ5MHNUK2tB?=
 =?utf-8?B?bW1LVDRlMm5ad3BLdWE3N2luMkhWUjNTclBHVkRzeTFZd0F5dnVENThIekNo?=
 =?utf-8?B?VlhmMml3Z0FFdG9FOHBRUitKdGFmb1IreXlVaGlOTjQ5alBuZ0dGZXdKeG5t?=
 =?utf-8?B?a0ZnT21jaXRwVVlVMDhQdzJVMU96REwvWnBUekx3aEo1UGMrUThNUVhncTln?=
 =?utf-8?B?TmFRaUdteENuRjN3Y2kvRHNmYTNzb1FpRmlObWhvTDZwSjBHTytlNnNnVWNl?=
 =?utf-8?B?UE5qZW1TM2d5RnNRQ2xkRjJRWU9rZ1dUaE5zNHMzSy84VjZoVklMamNRWkJU?=
 =?utf-8?B?eDZCa3pFclgrc0VFTGNLbjRkbHhGd2NteVVKNTJMeGlTRGU2RldUdUNXQVFP?=
 =?utf-8?B?N2g0d3c1L1F0VEVwVWlxZ0pFZEJaVGVIVGU4SkpYVVB3RUQwalZ0ZFlrYy9p?=
 =?utf-8?B?VnliUGJUanBOV0h0MTJCL3JiWXhwOTdIVlRRYkRaY1hMN3gvT1BXT1llUldp?=
 =?utf-8?B?UlpGVjQzekFlOFRSdmZzSUN2bkdOb2d6R1BHK29sdm1qa2JVcGFIR3YzN1Rt?=
 =?utf-8?B?V3hiVzBHbkpIU21uakRRR1VCM0RqZVZFUldQR0loREcvcVFWclA4bno3WlNa?=
 =?utf-8?B?MEx5aVVPQXFJYzZEKytpSXEvc3pnc3pJRlYxQXBIZ1hLeWtuQmhsOTgxY0FT?=
 =?utf-8?B?RGM5dzVDNUVFbUQ3bUlYTEVYR1RSNmxBeHo5VmdoV1VUOWlRQnFsTjBoUkpl?=
 =?utf-8?B?VDZVSi81ZXNTUDVtN3FvZVB4MFEydHIxVXd0cWovdEQvK1pNZzVRSFVkNCtZ?=
 =?utf-8?Q?rX3oMmZhtydOmGP4DbzR96RT0?=
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 <shengjiu.wang@nxp.com>

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 <shengjiu.wang@nxp.com>
Signed-off-by: Joy Zou <joy.zou@nxp.com>
Acked-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 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)

-- 
2.34.1