diff options
| author | Scott Wood <scottwood@freescale.com> | 2012-02-20 14:50:39 -0600 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2012-02-28 14:03:39 -0600 |
| commit | fb49454b1b6c7c6e238ac3c0b1e302e73eb1a1ea (patch) | |
| tree | fde867a8c5653f4b61b6b8d30dae717ea028f9fd | |
| parent | 1f7b1743d389fec616e9021012a03847f490cd18 (diff) | |
| download | u-boot-midas-fb49454b1b6c7c6e238ac3c0b1e302e73eb1a1ea.tar.gz u-boot-midas-fb49454b1b6c7c6e238ac3c0b1e302e73eb1a1ea.tar.bz2 u-boot-midas-fb49454b1b6c7c6e238ac3c0b1e302e73eb1a1ea.zip | |
nand: reinstate lazy bad block scanning
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>
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 10 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 8ab83036f5..44f7b91457 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -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; } /** diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 99668d552e..da6fa184c3 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -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 |