mtd: nand: mtk-ecc: stop on ECC idle timeouts

mtk_ecc_wait_idle() logs when the encoder or decoder does not become
idle, but returns void. Callers can therefore configure a non-idle ECC
engine or read parity bytes after an unconfirmed encoder idle state.

Return the idle poll result and propagate it from the enable and encode
paths that require the engine to be idle before continuing.

Fixes: 1d6b1e464950 ("mtd: mediatek: driver for MTK Smart Device")
Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/ecc-mtk.c b/drivers/mtd/nand/ecc-mtk.c
index 39be2e3e4ee485768ae05f6f1d47ff3d25d810d7..66f0985ef7cdb6c82ccc2de138f12b26ab474f26 100644 (file)
--- a/drivers/mtd/nand/ecc-mtk.c
+++ b/drivers/mtd/nand/ecc-mtk.c
@@ -123,8 +123,8 @@ static int mt7622_ecc_regs[] = {
        [ECC_DECIRQ_STA] =      0x144,
 };
 
-static inline void mtk_ecc_wait_idle(struct mtk_ecc *ecc,
-                                    enum mtk_ecc_operation op)
+static inline int mtk_ecc_wait_idle(struct mtk_ecc *ecc,
+                                   enum mtk_ecc_operation op)
 {
        struct device *dev = ecc->dev;
        u32 val;
@@ -136,6 +136,8 @@ static inline void mtk_ecc_wait_idle(struct mtk_ecc *ecc,
        if (ret)
                dev_warn(dev, "%s NOT idle\n",
                         op == ECC_ENCODE ? "encoder" : "decoder");
+
+       return ret;
 }
 
 static irqreturn_t mtk_ecc_irq(int irq, void *id)
@@ -318,7 +320,11 @@ int mtk_ecc_enable(struct mtk_ecc *ecc, struct mtk_ecc_config *config)
                return ret;
        }
 
-       mtk_ecc_wait_idle(ecc, op);
+       ret = mtk_ecc_wait_idle(ecc, op);
+       if (ret) {
+               mutex_unlock(&ecc->lock);
+               return ret;
+       }
 
        ret = mtk_ecc_config(ecc, config);
        if (ret) {
@@ -418,7 +424,9 @@ int mtk_ecc_encode(struct mtk_ecc *ecc, struct mtk_ecc_config *config,
        if (ret)
                goto timeout;
 
-       mtk_ecc_wait_idle(ecc, ECC_ENCODE);
+       ret = mtk_ecc_wait_idle(ecc, ECC_ENCODE);
+       if (ret)
+               goto timeout;
 
        /* Program ECC bytes to OOB: per sector oob = FDM + ECC + SPARE */
        len = (config->strength * ecc->caps->parity_bits + 7) >> 3;