This ports the following barebox commit:
| commit 3b68dbcbfce830bdf91f50943e5ee41463717abf
| Author: Sascha Hauer <s.ha...@pengutronix.de>
| Date: Mon Jul 15 15:28:55 2019 +0200
|
| mtd: peb: Do not mark as bad in mtd_peb_torture()
|
| Both the Kernel and mtd-utils have peb torture functions and both
| do not mark the block as bad automatically. Instead, the caller
| must mark the block as bad when -EIO is returned from the torture
| function. Do the same in barebox. This is necessary as the UBI code
| otherwise may mark a block as bad twice: Once indirectly in
| mtd_peb_torture() and then directly afterwards.
|
| Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de>
---
src/barebox-state/backend_bucket_circular.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/barebox-state/backend_bucket_circular.c
b/src/barebox-state/backend_bucket_circular.c
index b2577bcd5ee3..735510e0d36b 100644
--- a/src/barebox-state/backend_bucket_circular.c
+++ b/src/barebox-state/backend_bucket_circular.c
@@ -95,6 +95,7 @@ static int state_mtd_peb_read(struct
state_backend_storage_bucket_circular *circ
if (ret == -EBADMSG) {
ret = mtd_peb_torture(circ->mtd, circ->eraseblock);
if (ret == -EIO) {
+ mtd_peb_mark_bad(circ->mtd, circ->eraseblock);
dev_err(circ->dev, "Tortured eraseblock failed and is
marked bad now, PEB %u\n",
circ->eraseblock);
return -EIO;
@@ -132,6 +133,7 @@ static int state_mtd_peb_write(struct
state_backend_storage_bucket_circular *cir
if (ret == -EBADMSG) {
ret = mtd_peb_torture(circ->mtd, circ->eraseblock);
if (ret == -EIO) {
+ mtd_peb_mark_bad(circ->mtd, circ->eraseblock);
dev_err(circ->dev, "Tortured eraseblock failed and is
marked bad now, PEB %u\n",
circ->eraseblock);
return -EIO;
--
2.23.0
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
