Skip to contentSkip to conversation

spi: spi-mtk-nor: Optimize timeout for dma read

PATCH In review Bayi Cheng 3 participants 3 messages Nov 14, 2022 – Nov 15, 2022

Subsystems (2)
lore
Share & tools
lore

Bayi Cheng

author
#0 lore raw

PATCH v2 1/1 spi: spi-mtk-nor: Optimize timeout for dma read

From: bayi cheng <[email protected]>

The timeout value of the current dma read is unreasonable. For example, If the spi flash clock is 26Mhz, It will takes about 1.3ms to read a 4KB data in spi mode. But the actual measurement exceeds 50s when a dma read timeout is encountered.

In order to be more accurately, It is necessary to use usecs_to_jiffies, After modification, the measured timeout value is about 130ms.

---
Change in v2:
-Change the type of "timeout" from ulong to u32. -Replace max_t with max.
-Replace msecs_to_jiffies with usecs_to_jiffies.
---

---
 drivers/spi/spi-mtk-nor.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/spi/spi-mtk-nor.c +4 -3
index d167699a1a96..58eca18b28b0 100644
@@ -354,7 +354,7 @@ static int mtk_nor_dma_exec(struct mtk_nor *sp, u32 from, unsigned int length,
 			    dma_addr_t dma_addr)
 {
 	int ret = 0;
-	ulong delay;
+	u32 delay, timeout;
 	u32 reg;
 
 	writel(from, sp->base + MTK_NOR_REG_DMA_FADR);
@@ -376,15 +376,16 @@ static int mtk_nor_dma_exec(struct mtk_nor *sp, u32 from, unsigned int length,
 	mtk_nor_rmw(sp, MTK_NOR_REG_DMA_CTL, MTK_NOR_DMA_START, 0);
 
 	delay = CLK_TO_US(sp, (length + 5) * BITS_PER_BYTE);
+	timeout = (delay + 1) * 100;
 
 	if (sp->has_irq) {
 		if (!wait_for_completion_timeout(&sp->op_done,
-						 (delay + 1) * 100))
+		    usecs_to_jiffies(max(timeout, 10000U))))
 			ret = -ETIMEDOUT;
 	} else {
 		ret = readl_poll_timeout(sp->base + MTK_NOR_REG_DMA_CTL, reg,
 					 !(reg & MTK_NOR_DMA_START), delay / 3,
-					 (delay + 1) * 100);
+					 timeout);
 	}
 
 	if (ret < 0)
Signature · 1 line
2.25.1
maintainer Reviewed-by on v2 1/1
#1 lore raw

Il 14/11/22 09:13, Bayi Cheng ha scritto:

Quoted 11 lines

From: bayi cheng <[email protected]>

The timeout value of the current dma read is unreasonable. For example, If the spi flash clock is 26Mhz, It will takes about 1.3ms to read a 4KB data in spi mode. But the actual measurement exceeds 50s when a dma read timeout is encountered.

In order to be more accurately, It is necessary to use usecs_to_jiffies, After modification, the measured timeout value is about 130ms.

maintainer
#2 lore raw
In reply to Bayi Cheng
Quoted 8 lines · Bayi Cheng

From: bayi cheng <[email protected]>

The timeout value of the current dma read is unreasonable. For example, If the spi flash clock is 26Mhz, It will takes about 1.3ms to read a 4KB data in spi mode. But the actual measurement exceeds 50s when a dma read timeout is encountered.

[...]

Applied to

broonie/spi.git for-next

Thanks!

[1/1] spi: spi-mtk-nor: Optimize timeout for dma read

      commit: d52a826b40604387d3e24b54e12e404867902fbb

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark