Skip to contentSkip to conversation

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

PATCH Superseded Dario Binacchi 2 participants 3 messages Oct 21, 2022 – Oct 24, 2022

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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/[email protected]/

---

 cmd/mtd.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)
cmd/mtd.c +20 -8
index ad5cc9827d55..3330a428c018 100644
@@ -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)
+			break;
+
 		len -= mtd->erasesize;
 		erase_op.addr += mtd->erasesize;
 	}
Signature · 1 line
2.32.0
#1 lore raw
Quoted 57 lines · Dario Binacchi

[External email]

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://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fall%2F20221006031501.110290-2-mikhail.kshevetskiy%40iopsys.eu%2F&amp;data=05%7C01%7Cmikhail.kshevetskiy%40iopsys.eu%7C914960325cd74fb7338208dab37913e4%7C7ff78d652de440f586750569e5c7a65d%7C0%7C0%7C638019629853388501%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=6WBTjvbfll%2Boiz5B8q0o%2Bec0bWKCBf5RimWU1hZe61E%3D&amp;reserved=0

---

  cmd/mtd.c | 28 ++++++++++++++++++++--------
  1 file changed, 20 insertions(+), 8 deletions(-)
cmd/mtd.c +12 -8
index ad5cc9827d55..3330a428c018 100644
@@ -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;

cmd/mtd.c static int do_mtd_erase(struct cmd_tbl *cmdtp, int flag, int argc, · line 461

Quoted 10 lines
cmd/mtd.c +8 -0
+                               len -= mtd->erasesize;
+                               erase_op.addr += mtd->erasesize;
+                               continue;
+                       }
                 }
 
+               ret = mtd_erase(mtd, &erase_op);
+               if (ret)
+                       break;
+

You should check for bad block here, otherwise  bad block not marked in BBT will terminate erasing with CMD_RET_SUCCESS result.

Quoted 6 lines
cmd/mtd.c +0 -1
                 len -= mtd->erasesize;
                 erase_op.addr += mtd->erasesize;
         }
--

2.32.0

#2 lore raw
In reply to Dario Binacchi
Quoted 73 lines · Dario Binacchi

[External email]

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://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fall%2F20221006031501.110290-2-mikhail.kshevetskiy%40iopsys.eu%2F&amp;data=05%7C01%7Cmikhail.kshevetskiy%40iopsys.eu%7C914960325cd74fb7338208dab37913e4%7C7ff78d652de440f586750569e5c7a65d%7C0%7C0%7C638019629853388501%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=6WBTjvbfll%2Boiz5B8q0o%2Bec0bWKCBf5RimWU1hZe61E%3D&amp;reserved=0

---

 cmd/mtd.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)
cmd/mtd.c +20 -9
index ad5cc9827d55..3330a428c018 100644
@@ -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)
+                       break;
+
                len -= mtd->erasesize;
                erase_op.addr += mtd->erasesize;
        }
--

2.32.0