Received-SPF: pass (google.com: domain of linux-kernel+bounces-71626-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Frank Li <Frank.Li@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>,
	dmaengine@vger.kernel.org (open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM),
	linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE),
	linux-kernel@vger.kernel.org (open list)
Cc: imx@lists.linux.dev
Subject: [PATCH 1/1] dmaengine: mxs-dma: switch from dma_coherent to dma_pool
Date: Mon, 19 Feb 2024 10:57:27 -0500
Message-Id: <20240219155728.606497-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?SpoVnCW1xe06J2MT48aqJzRj8TCVsG7UV/xTCKJDhZQd6EfXIbaE0vebyx/G?=
 =?us-ascii?Q?wrOt1YboyjYQ66eUh6yJcjJrE/i9T83n/TzFAfrtcwZA19D0EbczNwbfh7nE?=
 =?us-ascii?Q?arF/yxcXSkd1EFV70eU2PmQY58tTEI9pGf/k8GFRVsMjWTLkBAmG+ADvSIth?=
 =?us-ascii?Q?3jmKRo0TGrFI2AniVgReAjqC+7W7KdFhBrh7b1urFF/lztpyH0FVjm16mSdJ?=
 =?us-ascii?Q?igxjKf9h0tl8Kcbkiv5elRojMzXNROIjnOqEd0e6obOIxyOZ2XPzedFpDUlj?=
 =?us-ascii?Q?662/prt1TrVCDzyah87uST926QCwH2r8zQ6ceoPwBSGVl0lC/QQHepEZyfPm?=
 =?us-ascii?Q?wnpHrG2VqYu9tJJUoMmZB9LrnnSEPhc/5ZaA8gvnPe4h3LH+6cMnIR7ctrK0?=
 =?us-ascii?Q?lkyC1594XneZfZ6EL2tbBW27Bhlq9ZmGuUoyDzDU+9yAkpgt2SgTUJh7EqtP?=
 =?us-ascii?Q?Mfgq9Ha00LfA/RnOenxt+DFHzlsQNQfG9aMfZu6hf0N9/YAvNoacTmQEfMBn?=
 =?us-ascii?Q?US9q3kqL0iW0mb/53euYCqHi52+glg/VJMIx1n3fNiwqKbK7SaKySfbkqFnV?=
 =?us-ascii?Q?diXYEP8UTGHEMASzQsa7S0DN2lGEcegcXpp+tNSPCla1hAPeCBGQjRcbYs8i?=
 =?us-ascii?Q?pr7LE0jYHn5rExwEUUyLxCvF4uFa0ULfPmwCBWHJOzrvXGQQjZHwHck8YOGB?=
 =?us-ascii?Q?cnbavGACSSfVQRLwRs7fkffdIF7iJ9fVpf+rTQd1EVCC5Rrgh6jegC9Jxpjj?=
 =?us-ascii?Q?iHwtMuEAHXGZhB3e+L0N6uxfGd0l2NZB9f2Vt+e7eHINn+782DcFPZplwKIH?=
 =?us-ascii?Q?RRlTIkoR4Npg+omVm7SGysoCkT0gTeNFsQHfE7sV1wtgQ2cKIYN+E8TgUhzb?=
 =?us-ascii?Q?ZKoNTIyogwysVKy7Dm44tvtXW3UwJ/OmpXfRL18yvdbKeFNVunIAYL7FMecG?=
 =?us-ascii?Q?r7kai2H3k70redTjGsL+Ke4VxhEjqaDXktZ/OUy+Z5RH/GXHjbLpmPVQgfr5?=
 =?us-ascii?Q?DOQzl5JWPZVL45lspw/gD3qe5/ElPGu6cSyfV1KfywrppaUI6lW5nKEZ9Mlc?=
 =?us-ascii?Q?PqpBkAZOu34V7sKvK5UryYYOnZ30gOXxSLzDxkjILIk4ASfYKDptheveTKnv?=
 =?us-ascii?Q?YB25aN6RfgBW4zfacsvos7QQEPeqEZOh0EV12nOqwbmWBJnEh5qn2ZeAul+d?=
 =?us-ascii?Q?K1KI9kC8HnzU+zACMk8JCdGay/BThsItOi+ezuOVEI3Q1reIqjyohfN/suXr?=
 =?us-ascii?Q?yowB/oNOGcFdZ0hCQuOIwOasYqQyUV99gpugFlMOKRne9zufKcGQcJVqsXGD?=
 =?us-ascii?Q?9ObI9xGvTo4vy469913DdU5kFP5RrisAysrQ2bYDCMb/CdvML0AXuKw3/eau?=
 =?us-ascii?Q?Mk2/wWiTEGMRUydEyQp3PwvAL5dipXQMRWwDlCNX0iGd3Q63YySYH2aswrh5?=
 =?us-ascii?Q?phAccJ7sJpguzcKIgBtfeIXLMHdc9rCdwI8cz+wWcKlU7t3U3pqRkzuW98Uj?=
 =?us-ascii?Q?ePnL1klGBbO40isZMLCEzoNW9fYrrmk7VV0EsCGNad6a8JvaGxNXhL5gGn3G?=
 =?us-ascii?Q?uEs3XCkuKpL/iRxj/zOu1zsi1m3KEHCOPKXjdzqC?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 73c2a603-728f-4160-675f-08dc3163813c
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2024 15:57:42.0299
 (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: E8NpVxe/+TiUjGR6Xt+LW6x8frIdrVN6l8c0ntuq/CtSsqNBfzmzHjBIN8ediIrvLsxz3k+bxZEpcEEQZ1X8xA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7369

From: Han Xu <han.xu@nxp.com>

Using dma_pool to manage dma descriptor memory.

Signed-off-by: Han Xu <han.xu@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/dma/mxs-dma.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index cfb9962417ef6..a60bf7a22492d 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -24,6 +24,7 @@
 #include <linux/of_dma.h>
 #include <linux/list.h>
 #include <linux/dma/mxs-dma.h>
+#include <linux/dmapool.h>
 
 #include <asm/irq.h>
 
@@ -104,6 +105,7 @@ struct mxs_dma_ccw {
 
 #define CCW_BLOCK_SIZE	(4 * PAGE_SIZE)
 #define NUM_CCW	(int)(CCW_BLOCK_SIZE / sizeof(struct mxs_dma_ccw))
+#define CCW_BLOCK_ALGIN	32
 
 struct mxs_dma_chan {
 	struct mxs_dma_engine		*mxs_dma;
@@ -117,6 +119,7 @@ struct mxs_dma_chan {
 	enum dma_status			status;
 	unsigned int			flags;
 	bool				reset;
+	struct dma_pool			*ccw_pool;
 #define MXS_DMA_SG_LOOP			(1 << 0)
 #define MXS_DMA_USE_SEMAPHORE		(1 << 1)
 };
@@ -398,9 +401,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
 	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
 	int ret;
 
-	mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev,
-					   CCW_BLOCK_SIZE,
-					   &mxs_chan->ccw_phys, GFP_KERNEL);
+	mxs_chan->ccw = dma_pool_zalloc(mxs_chan->ccw_pool, GFP_ATOMIC, &mxs_chan->ccw_phys);
+
 	if (!mxs_chan->ccw) {
 		ret = -ENOMEM;
 		goto err_alloc;
@@ -428,8 +430,7 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
 err_clk:
 	free_irq(mxs_chan->chan_irq, mxs_dma);
 err_irq:
-	dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE,
-			mxs_chan->ccw, mxs_chan->ccw_phys);
+	dma_pool_free(mxs_chan->ccw_pool, mxs_chan->ccw, mxs_chan->ccw_phys);
 err_alloc:
 	return ret;
 }
@@ -443,8 +444,7 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan)
 
 	free_irq(mxs_chan->chan_irq, mxs_dma);
 
-	dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE,
-			mxs_chan->ccw, mxs_chan->ccw_phys);
+	dma_pool_free(mxs_chan->ccw_pool, mxs_chan->ccw, mxs_chan->ccw_phys);
 
 	clk_disable_unprepare(mxs_dma->clk);
 }
@@ -745,6 +745,7 @@ static int mxs_dma_probe(struct platform_device *pdev)
 	struct device_node *np = pdev->dev.of_node;
 	const struct mxs_dma_type *dma_type;
 	struct mxs_dma_engine *mxs_dma;
+	struct dma_pool *ccw_pool;
 	int ret, i;
 
 	mxs_dma = devm_kzalloc(&pdev->dev, sizeof(*mxs_dma), GFP_KERNEL);
@@ -797,6 +798,15 @@ static int mxs_dma_probe(struct platform_device *pdev)
 	mxs_dma->pdev = pdev;
 	mxs_dma->dma_device.dev = &pdev->dev;
 
+	ccw_pool = dma_pool_create("ccw_pool", mxs_dma->dma_device.dev, CCW_BLOCK_SIZE,
+				   CCW_BLOCK_ALGIN, 0);
+
+	for (i = 0; i < MXS_DMA_CHANNELS; i++) {
+		struct mxs_dma_chan *mxs_chan = &mxs_dma->mxs_chans[i];
+
+		mxs_chan->ccw_pool = ccw_pool;
+	}
+
 	/* mxs_dma gets 65535 bytes maximum sg size */
 	dma_set_max_seg_size(mxs_dma->dma_device.dev, MAX_XFER_BYTES);
 
-- 
2.34.1