mtd: rawnand: stm32_fmc2: use FMC2_TIMEOUT_MS for timeouts

This patch removes the constant FMC2_TIMEOUT_US.
FMC2_TIMEOUT_MS will be used each time that we need to wait (except
when the timeout value is set by the framework).

It was seen, during stress tests with the sequencer in an overloaded
system, that we could be close to 1 second, even if we never met this
value. To be safe, FMC2_TIMEOUT_MS is set to 5 seconds.

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/1588756279-17289-4-git-send-email-christophe.kerello@st.com

diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index edbf8526d89c5a1ed3d4153f6775c5a6558e2641..30083e52b2fc3d8cb74cfb70e2ab951aa870d570 100644 (file)
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -37,8 +37,7 @@
 /* Max ECC buffer length */
 #define FMC2_MAX_ECC_BUF_LEN           (FMC2_BCHDSRS_LEN * FMC2_MAX_SG)
 
-#define FMC2_TIMEOUT_US                        1000
-#define FMC2_TIMEOUT_MS                        1000
+#define FMC2_TIMEOUT_MS                        5000
 
 /* Timings */
 #define FMC2_THIZ                      1
@@ -526,8 +525,8 @@ static int stm32_fmc2_ham_calculate(struct nand_chip *chip, const u8 *data,
        int ret;
 
        ret = readl_relaxed_poll_timeout(fmc2->io_base + FMC2_SR,
-                                        sr, sr & FMC2_SR_NWRF, 10,
-                                        FMC2_TIMEOUT_MS);
+                                        sr, sr & FMC2_SR_NWRF, 1,
+                                        1000 * FMC2_TIMEOUT_MS);
        if (ret) {
                dev_err(fmc2->dev, "ham timeout\n");
                return ret;
@@ -1315,7 +1314,7 @@ static int stm32_fmc2_waitrdy(struct nand_chip *chip, unsigned long timeout_ms)
        /* Check if there is no pending requests to the NAND flash */
        if (readl_relaxed_poll_timeout_atomic(fmc2->io_base + FMC2_SR, sr,
                                              sr & FMC2_SR_NWRF, 1,
-                                             FMC2_TIMEOUT_US))
+                                             1000 * FMC2_TIMEOUT_MS))
                dev_warn(fmc2->dev, "Waitrdy timeout\n");
 
        /* Wait tWB before R/B# signal is low */