Messages in this thread Patch in this message | | | From | Martin Devera <> | Subject | [PATCH] mtd: rawnand: Fix unexpected timeouts in waitrdy | Date | Tue, 10 Dec 2019 16:03:18 +0100 |
| |
The used way to compute jiffies timeout brokes when jiffie difference is 1. Simply add 1 - it has no other side effects. Fixes STM32MP1 FMC2 NAND controller which sometimes failed exactly in this way.
Signed-off-by: Martin Devera <devik@eaxlabs.cz> --- drivers/mtd/nand/raw/nand_base.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index d527e448ce19..beab3a775cc7 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -721,7 +721,11 @@ int nand_soft_waitrdy(struct nand_chip *chip, unsigned long timeout_ms) if (ret) return ret; - timeout_ms = jiffies + msecs_to_jiffies(timeout_ms); + /* +1 below is necessary because if we are now in the last fraction + * of jiffy and msecs_to_jiffies is 1 then we will wait only that + * small jiffy fraction - possibly leading to false timeout + */ + timeout_ms = jiffies + msecs_to_jiffies(timeout_ms) + 1; do { ret = nand_read_data_op(chip, &status, sizeof(status), true); if (ret) -- 2.11.0
| |