mtd: nand: ignore ECC errors for simple BBM scans

Now that nand_do_readoob() may return -EUCLEAN or -EBADMSG on ECC errors,
we need to handle the return value specially in some cases.

When scanning for simple bad block markers, reacting to an ECC error is
not very useful, as we assume that the relevant markers are still
non-0xFF for true bad blocks.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>

diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index f30807c3a48da564893f218516aad8abbf06f07e..a4fcbf1cbc765d7339e1458a6f00c38a877fccfd 100644 (file)
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -312,14 +312,20 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs,
                        ops.oobbuf = buf + len;
                        ops.datbuf = buf;
                        ops.len = len;
-                       return mtd->read_oob(mtd, offs, &ops);
+                       res = mtd->read_oob(mtd, offs, &ops);
+
+                       /* Ignore ECC errors when checking for BBM */
+                       if (res != -EUCLEAN && res != -EBADMSG)
+                               return res;
+                       return 0;
                } else {
                        ops.oobbuf = buf + mtd->writesize;
                        ops.datbuf = buf;
                        ops.len = mtd->writesize;
                        res = mtd->read_oob(mtd, offs, &ops);
 
-                       if (res)
+                       /* Ignore ECC errors when checking for BBM */
+                       if (res && res != -EUCLEAN && res != -EBADMSG)
                                return res;
                }
 
@@ -435,7 +441,8 @@ static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd,
                 * byte reads for 16 bit buswidth.
                 */
                ret = mtd->read_oob(mtd, offs, &ops);
-               if (ret)
+               /* Ignore ECC errors when checking for BBM */
+               if (ret && ret != -EUCLEAN && ret != -EBADMSG)
                        return ret;
 
                if (check_short_pattern(buf, bd))