cmd: mtd: check if a block has to be skipped or erased

As reported by patch [1], the `mtd erase' command should not erase bad
blocks.
To force bad block erasing you have to use the `mtd erase.dontskipbad'
command.

This patch tries to fix the same issue without modifying code taken
from the linux kernel, in order to make further upgrades easier.

[1] https://lore.kernel.org/all/20221006031501.110290-2-mikhail.kshevetskiy@iopsys.eu/
Suggested-by: Michael Trimarchi <michael@amarulasolutions.com>
Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Co-developed-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Tested-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

diff --git a/cmd/mtd.c b/cmd/mtd.c
index ad5cc9827d5540d495dd3dd827c94b33f5f707b0..eb6e2d6892ffd249a00b8588c9ed2a8d065261e0 100644 (file)
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -434,19 +434,31 @@ static int do_mtd_erase(struct cmd_tbl *cmdtp, int flag, int argc,
        erase_op.mtd = mtd;
        erase_op.addr = off;
        erase_op.len = mtd->erasesize;
-       erase_op.scrub = scrub;
 
        while (len) {
-               ret = mtd_erase(mtd, &erase_op);
+               if (!scrub) {
+                       ret = mtd_block_isbad(mtd, erase_op.addr);
+                       if (ret < 0) {
+                               printf("Failed to get bad block at 0x%08llx\n",
+                                      erase_op.addr);
+                               ret = CMD_RET_FAILURE;
+                               goto out_put_mtd;
+                       }
 
-               if (ret) {
-                       /* Abort if its not a bad block error */
-                       if (ret != -EIO)
-                               break;
-                       printf("Skipping bad block at 0x%08llx\n",
-                              erase_op.addr);
+                       if (ret > 0) {
+                               printf("Skipping bad block at 0x%08llx\n",
+                                      erase_op.addr);
+                               ret = 0;
+                               len -= mtd->erasesize;
+                               erase_op.addr += mtd->erasesize;
+                               continue;
+                       }
                }
 
+               ret = mtd_erase(mtd, &erase_op);
+               if (ret && ret != -EIO)
+                       break;
+
                len -= mtd->erasesize;
                erase_op.addr += mtd->erasesize;
        }