Received-SPF: pass (google.com: domain of linux-kernel+bounces-56987-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Frank Li <Frank.Li@nxp.com>
To: Vinod Koul <vkoul@kernel.org>,
	Joy Zou <joy.zou@nxp.com>,
	imx@lists.linux.dev (open list:FREESCALE eDMA DRIVER),
	dmaengine@vger.kernel.org (open list:FREESCALE eDMA DRIVER),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/1] dmaengine: fsl-edma: correct max_segment_size setting
Date: Wed,  7 Feb 2024 14:47:32 -0500
Message-Id: <20240207194733.2112870-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?twp9i22IYco2cyawE294GQWzRHFQ8jbHMsAl6TT2eO1NETYFXwo1EaoHGZpj?=
 =?us-ascii?Q?8ZP2NNHrEhwoW2ESz8lgCg/LQPEMaIuzfGtnRQqfFM2Z4joItAy82WtY0B7w?=
 =?us-ascii?Q?QvNht/etjQG37LtoxYxVau3Vkl2bepxKAkMdA+hlAZpooARcHYxghmUGQDuE?=
 =?us-ascii?Q?OzTmLm3aJt8k3ZROo6JVO5p0k38ZSwZ0zy4mlKK6+VXN8Y8Ey0XFUAeizSz1?=
 =?us-ascii?Q?1lr9rCgfJ9NO5T7S8sDoX5RAATiARJOM9Qrtn+HWbEa96jc6ls5sRTATIWFp?=
 =?us-ascii?Q?ZqAHZt/76X/bGMszatj7DUjE7KY2Ssalsf6SX/jx7zosbKusjoAmIpdflH7x?=
 =?us-ascii?Q?5iwFAowiLcsZ9dior71ObPUO13hKXBPiyIIMKThc/SZU2vjuWM/owiVOYiOJ?=
 =?us-ascii?Q?LOWdi+0+7fcFEB6JH1lYj9Fh76dRX9sDlJaj3WMrcOU+NziRwtDL0ejUxwz9?=
 =?us-ascii?Q?k8HjZMxM7R2mTFEzzl4uv3o/Nlti+/8rzyMhkpP5ikHIpC+XpblzM9pX3sGK?=
 =?us-ascii?Q?17/09ARvvSWnvx8AkndxS+WkOQ+nODcjwK7BT/NQ7UoXD8thvUXH9a4QCRSH?=
 =?us-ascii?Q?LrOTkyBkam7i4nd1LMAULlWe1ZpunovBB2yLBOaLmonM2J7yLZPeLHTYtY/F?=
 =?us-ascii?Q?SijcjT081HuTueh0a3TrUREX1YBNMZSWzBxCLsTOuGE7W+aUX7aL/gsufRjm?=
 =?us-ascii?Q?/7b4cLhwTLgRIC6Z9c8Lmtt42T5xKXLD/L4KXoiusq6S7bMZoWFfAZKfF93t?=
 =?us-ascii?Q?4oCsJe2Cjnu9mjfhuPKjPYD1CAXutGDittDSGalZv6BfgqjlQKUoK8ZbzcTg?=
 =?us-ascii?Q?n0PHXDZb+YQjKz5WFtbvaSG1iYfad7S9EUtT6BhF+dbuz+ZZ7osA2a5nUY0F?=
 =?us-ascii?Q?67xgpjOzbXfKTpVdlKIgMIy6I9PpbWcbTsPNlgSlwAO9UspDRXmnjaOcroIq?=
 =?us-ascii?Q?mSv4+Fn4xNgPEls46EkVCUx4BMcXoWIY5qfJwCe5dDWCBOcJbQo9t31JlMTy?=
 =?us-ascii?Q?gJtn9it4h7/pKVo9KccmwdBgYS5Qk7kO3Cw+RTfQdUFnRx+zw1+1FIc5Ion1?=
 =?us-ascii?Q?eRxmreVpue4CahReFgbt89k956LVlWr4gBwBXthkDQOKGtplOwbrkR071iVi?=
 =?us-ascii?Q?ymXJxJOtL2Ohpg0i7pSV+2P5aQzfygiKQkU7CD/Hyk9Rsa2MtfhiGDNY0Ex1?=
 =?us-ascii?Q?rbSkrwPZbBDWI2Hg6GogZnAbJP/eATWZy2GvNrroLKrKvSGCey7jPQBjDWwq?=
 =?us-ascii?Q?BspbdXqp2eEZFjUUYjbUgM03IuMLfinalQK2Oy/XjhVpPUzD+zCS4rcq/5Si?=
 =?us-ascii?Q?L6KVCpGEa2zXvKqa2MhT88J8CD2A26Mv1/xM4uTVGEQpbKO82pq3RRWNTHim?=
 =?us-ascii?Q?TqXL2Zlz5A/frSWDoezMTFzzhKcc7Oeb8RDMcfOUIiM1exDycgxfmzihrRBH?=
 =?us-ascii?Q?BvfMMN2txvvMcUYmi05SKNT3PX++mUOlsDRyDbh7Vks3QbgRjq7EkTDJTvIx?=
 =?us-ascii?Q?7+8c91NvfepotUabzxfhW5BMl7Ia3em/wlWpht65o0aUHjk/uPOUwW4k94kT?=
 =?us-ascii?Q?/33mIongmBj02XK+oprrJ2Yol+LQ9IWhN+W3wzC1?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bc373c2d-77fe-42ce-aa7a-08dc2815a88c
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 19:47:46.8265
 (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: dZzmWqUVnrF3DDzXeT9E4Hp3ll7iyQb7OuinDASHOv3eO8xxFCUxA/RhzEvmNCOCKe1KSKPeLeB6y+p/rKxdhg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9769

Correcting the previous setting of 0x3fff to the actual value of 0x7fff.

Introduced new macro 'EDMA_TCD_ITER_MASK' for improved code clarity and
utilization of FIELD_GET to obtain the accurate maximum value.

Cc: stable@vger.kernel.org
Fixes: e06748539432 ("dmaengine: fsl-edma: support edma memcpy")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/dma/fsl-edma-common.h | 5 +++--
 drivers/dma/fsl-edma-main.c   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index a05a1f283ece2..7bf0aba471a8c 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -30,8 +30,9 @@
 #define EDMA_TCD_ATTR_SSIZE(x)		(((x) & GENMASK(2, 0)) << 8)
 #define EDMA_TCD_ATTR_SMOD(x)		(((x) & GENMASK(4, 0)) << 11)
 
-#define EDMA_TCD_CITER_CITER(x)		((x) & GENMASK(14, 0))
-#define EDMA_TCD_BITER_BITER(x)		((x) & GENMASK(14, 0))
+#define EDMA_TCD_ITER_MASK		GENMASK(14, 0)
+#define EDMA_TCD_CITER_CITER(x)		((x) & EDMA_TCD_ITER_MASK)
+#define EDMA_TCD_BITER_BITER(x)		((x) & EDMA_TCD_ITER_MASK)
 
 #define EDMA_TCD_CSR_START		BIT(0)
 #define EDMA_TCD_CSR_INT_MAJOR		BIT(1)
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index c2c0c3effc8cb..fa8b1e6f57859 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -10,6 +10,7 @@
  */
 
 #include <dt-bindings/dma/fsl-edma.h>
+#include <linux/bitfield.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
@@ -600,7 +601,8 @@ static int fsl_edma_probe(struct platform_device *pdev)
 					DMAENGINE_ALIGN_32_BYTES;
 
 	/* Per worst case 'nbytes = 1' take CITER as the max_seg_size */
-	dma_set_max_seg_size(fsl_edma->dma_dev.dev, 0x3fff);
+	dma_set_max_seg_size(fsl_edma->dma_dev.dev,
+			     FIELD_GET(EDMA_TCD_ITER_MASK, EDMA_TCD_ITER_MASK));
 
 	fsl_edma->dma_dev.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;
 
-- 
2.34.1