Received-SPF: pass (google.com: domain of linux-kernel+bounces-139657-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Joy Zou <joy.zou@nxp.com>
To: frank.li@nxp.com,
	peng.fan@nxp.com,
	vkoul@kernel.org
Cc: imx@lists.linux.dev,
	dmaengine@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v1 1/1] dmaengine: fsl-edma: optimize edma driver for imx8QM
Date: Thu, 11 Apr 2024 10:44:17 +0800
Message-Id: <20240411024417.2170609-2-joy.zou@nxp.com>
In-Reply-To: <20240411024417.2170609-1-joy.zou@nxp.com>
References: <20240411024417.2170609-1-joy.zou@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?JxLyoPtBMhznzirIOW7jLB5CHRORfnLWvaWdPFKSTogavCFTYKsIw29dhM59?=
 =?us-ascii?Q?SJpu/2g8y3uFsnp9OL867XJuxbYVKGtzgziUoUA1G+8XXbc52nkaL2rCGTky?=
 =?us-ascii?Q?RyKvgu7kZ+4E0bwuryV7k0s14Ladf8XVLRVSimy1vdwcMammPfw+G4q+IwbF?=
 =?us-ascii?Q?QHiLR18VgkIX2kCeWusTqy/14PcTAnXJKtUL0lIYwaoiST3R9f1RkDPXxVz6?=
 =?us-ascii?Q?x5i/ZHNGo0BaIjoGSx0jg2xsDcdrzmIlbKJ7qez8B6TRmSpnG4nJ1T5DCoJY?=
 =?us-ascii?Q?yGlysNGSF2W24qq+TKBvhlo6caDFaY532qBPhXoeAz85HJke61EaAAMmGasl?=
 =?us-ascii?Q?ZPl8EyE9REe1jSxhLBenAiRTS6awWQXTTDm9JuXXuYm/vVPsQ1Pbh8InMxch?=
 =?us-ascii?Q?6UYTiJP6dp5ftCAJSy8lnNSLmPTdFGOBL/A3NPZOpzcksGGkiRxROWpBDmbo?=
 =?us-ascii?Q?wzDgsAwDWhUJjwfgDdWa9WZLFagyJWppNeZoeX/ab76oxF8kmSpkhAdPfXrr?=
 =?us-ascii?Q?upeqwkLya66rQKVCF9wjm0mPXQqhrWpGY5J3U9/XZ7yMgu0QGtFFUNZtARuV?=
 =?us-ascii?Q?b1tlmakwGnfFM99AxLHkAI93bVMLWKzfmtYdEBPNvk1a2klPYRjhOzRi6WZ0?=
 =?us-ascii?Q?bit45VBs0YDBkmxFfCHpcLzb0XWdCCjbBX6iloHenigHgvhTiLj9XLzqGz2z?=
 =?us-ascii?Q?MH02h5D3ZhOOI76MJ/MWW5vq9/YXJfUwkH4Njqp0KoW/+ug18sCb00DJdA5U?=
 =?us-ascii?Q?odEvJsZSicOu4u0Eo5MW+v4doswS9plQTiX8SsHe5lGho+sM4Dkr/m9DA2V4?=
 =?us-ascii?Q?VdUW/nv3KZQGeLX7v1652WYVlcK3/8M9NVYju0ob2X92eaMOFtxujA4go2Qy?=
 =?us-ascii?Q?HreVPC+2n1zLzW0ri1x49ET81O8iVhLMbBTJF6ydNmQAoDvDYiIKn01RH8KL?=
 =?us-ascii?Q?EmLUmuiZnSYLP8ari4jJo7u8m2/X+uxJTmW0tItIas9+k+AMs/wBm2oY37E/?=
 =?us-ascii?Q?vNIvoLVDq3FcGxb+BU5K6zPpEstqxI5Sdyoxtc0B8fcDeePTU+oS9cg66ADu?=
 =?us-ascii?Q?98EAsefgwiKeAzr78MW18XgZqrvKZtnHQAEUVr9cW0RI6pFQxf8616CiITcx?=
 =?us-ascii?Q?PDnKCl7KLAVDFsSSiGdWvQTcn5cPVWdsRgKSVAevPM6JfcDrzJQffAHM+a2O?=
 =?us-ascii?Q?NmiHoK4P39n33TgT9146U/GWqLH3ObOHiwGbuc9wnALtKn43hAjgRQzR7HaY?=
 =?us-ascii?Q?P5sl7L6dCIeVqiUMw7w4xrBTobUxZl2okQcrfA9mUZqplH94I7NUcVvI5xuf?=
 =?us-ascii?Q?rzRFOpjVbH0uqnLjmSmaxOcscFcjB9lgiQqepkdrQCJgWKOLTYD/QaOmkAUH?=
 =?us-ascii?Q?xh0jXLspaKhcXqNXkfhYEHOBgo6GlxNvJPZgjzPhkdK2MNf5t/BUMRY3t6iZ?=
 =?us-ascii?Q?TTz65nCJW+jWgY09LduSc+RadUsYpKnB6KIMMj01pX+iiX1RNMpAoZA2DKHZ?=
 =?us-ascii?Q?fGD6eaGqxgmzSL4LomqqecTRCQyYQ8BCr9zyrV1ZjK1VGs8R11l5NBvny4pn?=
 =?us-ascii?Q?K3r/VNbwach1dmFQXmK3H/J0J4swQk7YH//cOYjb?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8e570bf5-3446-4155-168e-08dc59d03877
X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9386.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2024 02:36:41.6798
 (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: zPm7ihz9iPhGhDPvbmbJCGckPFVPcNJSRCGbR8f3TELgQhn/JyHDdV4+90q6N6ST
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8599

The eDMA hardware issue only exist imx8QM A0. A0 never mass production.
So remove the workaround safely.

Signed-off-by: Joy Zou <joy.zou@nxp.com>
---
 drivers/dma/fsl-edma-common.c | 16 ++++------------
 drivers/dma/fsl-edma-main.c   |  8 --------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index f9144b015439..ed93e01282d5 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -75,18 +75,10 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan)
 
 	flags = fsl_edma_drvflags(fsl_chan);
 	val = edma_readl_chreg(fsl_chan, ch_sbr);
-	/* Remote/local swapped wrongly on iMX8 QM Audio edma */
-	if (flags & FSL_EDMA_DRV_QUIRK_SWAPPED) {
-		if (!fsl_chan->is_rxchan)
-			val |= EDMA_V3_CH_SBR_RD;
-		else
-			val |= EDMA_V3_CH_SBR_WR;
-	} else {
-		if (fsl_chan->is_rxchan)
-			val |= EDMA_V3_CH_SBR_RD;
-		else
-			val |= EDMA_V3_CH_SBR_WR;
-	}
+	if (fsl_chan->is_rxchan)
+		val |= EDMA_V3_CH_SBR_RD;
+	else
+		val |= EDMA_V3_CH_SBR_WR;
 
 	if (fsl_chan->is_remote)
 		val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR);
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 755a3dc3b0a7..b06fa147d6ba 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -349,13 +349,6 @@ static struct fsl_edma_drvdata imx8qm_data = {
 	.setup_irq = fsl_edma3_irq_init,
 };
 
-static struct fsl_edma_drvdata imx8qm_audio_data = {
-	.flags = FSL_EDMA_DRV_QUIRK_SWAPPED | FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3,
-	.chreg_space_sz = 0x10000,
-	.chreg_off = 0x10000,
-	.setup_irq = fsl_edma3_irq_init,
-};
-
 static struct fsl_edma_drvdata imx8ulp_data = {
 	.flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK |
 		 FSL_EDMA_DRV_EDMA3,
@@ -397,7 +390,6 @@ static const struct of_device_id fsl_edma_dt_ids[] = {
 	{ .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data},
 	{ .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data},
 	{ .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data},
-	{ .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data},
 	{ .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data},
 	{ .compatible = "fsl,imx93-edma3", .data = &imx93_data3},
 	{ .compatible = "fsl,imx93-edma4", .data = &imx93_data4},
-- 
2.37.1