nand: reinstate lazy bad block scanning
authorScott Wood <scottwood@freescale.com>
Mon, 20 Feb 2012 20:50:39 +0000 (14:50 -0600)
committerScott Wood <scottwood@freescale.com>
Tue, 28 Feb 2012 20:03:39 +0000 (14:03 -0600)
commit 2a8e0fc8b3dc31a3c571e439fbf04b882c8986be ("nand: Merge changes
from Linux nand driver") accidentally reverted commit
13f0fd94e3cae6f8a0d9fba5d367e311edc8ebde ("NAND: Scan bad blocks
lazily.").

Reinstate the change, as amended by commit
ff49ea8977b56916edd5b1766d9939010e30b181 ("NAND: Mark the BBT as scanned
prior to calling scan_bbt.").

Signed-off-by: Scott Wood <scottwood@freescale.com>
drivers/mtd/nand/nand_base.c
include/linux/mtd/nand.h

index 8ab83036f5922605ae4ef8d1f0da14bb9dbb12c8..44f7b914578d1effda938c808d8696417a6812dc 100644 (file)
@@ -479,6 +479,11 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
 {
        struct nand_chip *chip = mtd->priv;
 
+       if (!(chip->options & NAND_BBT_SCANNED)) {
+               chip->options |= NAND_BBT_SCANNED;
+               chip->scan_bbt(mtd);
+       }
+
        if (!chip->bbt)
                return chip->block_bad(mtd, ofs, getchip);
 
@@ -3166,10 +3171,9 @@ int nand_scan_tail(struct mtd_info *mtd)
 
        /* Check, if we should skip the bad block table scan */
        if (chip->options & NAND_SKIP_BBTSCAN)
-               return 0;
+               chip->options |= NAND_BBT_SCANNED;
 
-       /* Build bad block table */
-       return chip->scan_bbt(mtd);
+       return 0;
 }
 
 /**
index 99668d552e22ac37e8af6c124ec2bfe25fdd6e25..da6fa184c3397d4dce226525e30f06f501da2f29 100644 (file)
@@ -232,6 +232,8 @@ typedef enum {
 #define NAND_CREATE_EMPTY_BBT          0x01000000
 
 /* Options set by nand scan */
+/* bbt has already been read */
+#define NAND_BBT_SCANNED       0x40000000
 /* Nand scan has allocated controller struct */
 #define NAND_CONTROLLER_ALLOC  0x80000000