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

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.

Signed-off-by: bayi cheng <bayi.cheng@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20221114081327.25750-1-bayi.cheng@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c
index d167699a1a96bd7015a278f5345dd8e650e6e8ed..58eca18b28b032c4a1d1c81f3671f3d5b708594e 100644 (file)
--- a/drivers/spi/spi-mtk-nor.c
+++ b/drivers/spi/spi-mtk-nor.c
@@ -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)