Skip to contentSkip to conversation

nand: reinstate lazy bad block scanning

PATCH New Scott Wood 2 participants 2 messages Feb 20, 2012 – Feb 21, 2012

Subsystems (2)
Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/mtd/nand/nand_base.c |   10 +++++++---
 include/linux/mtd/nand.h     |    2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/mtd/nand/nand_base.c +7 -3
index 8ab8303..44f7b91 100644
@@ -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;
 }
 
 /**
include/linux/mtd/nand.h +2 -0
index 99668d5..da6fa18 100644
@@ -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
Signature · 1 line
1.7.7.rc3.4.g8d714
#1 lore raw

PATCH 1/1 nand: reinstate lazy bad block scanning

Hello Scott,

Quoted 9 lines · Scott Wood

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.").

Quoted 5 lines
Signed-off-by Scott Wood <[email protected]>
---
 drivers/mtd/nand/nand_base.c |   10 +++++++---
 include/linux/mtd/nand.h     |    2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

Thanks!

Tested on the enbw_cmc board.

Acked-by Heiko Schocher <[email protected]>
Tested-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany