mtd: nand: Fix regression in BBM detection

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=065a1ed8de85583888b3d4f22c64b534a1fbdaaa
Commit:     065a1ed8de85583888b3d4f22c64b534a1fbdaaa
Parent:     93b352fce679945845664b56b0c3afbd655a7a12
Author:     Brian Norris <norris at broadcom.com>
AuthorDate: Wed Aug 18 11:25:04 2010 -0700
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Thu Aug 19 15:02:19 2010 +0100

    mtd: nand: Fix regression in BBM detection
    
    Commit c7b28e25cb9beb943aead770ff14551b55fa8c79 ("mtd: nand: refactor BB
    marker detection") caused a regression in detection of factory-set bad
    block markers, especially for certain small-page NAND. This fix removes
    some unneeded constraints on using NAND_SMALL_BADBLOCK_POS, making the
    detection code more correct.
    
    This regression can be seen, for example, in Hynix HY27US081G1M and
    similar.
    
    Signed-off-by: Brian Norris <norris at broadcom.com>
    Tested-by: Michael Guntsche <mike at it-loops.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/nand_base.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index a3c7473..a22ed7b 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2934,14 +2934,10 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
 		chip->chip_shift = ffs((unsigned)(chip->chipsize >> 32)) + 32 - 1;
 
 	/* Set the bad block position */
-	if (!(busw & NAND_BUSWIDTH_16) && (*maf_id == NAND_MFR_STMICRO ||
-				(*maf_id == NAND_MFR_SAMSUNG &&
-				 mtd->writesize == 512) ||
-				*maf_id == NAND_MFR_AMD))
-		chip->badblockpos = NAND_SMALL_BADBLOCK_POS;
-	else
+	if (mtd->writesize > 512 || (busw & NAND_BUSWIDTH_16))
 		chip->badblockpos = NAND_LARGE_BADBLOCK_POS;
-
+	else
+		chip->badblockpos = NAND_SMALL_BADBLOCK_POS;
 
 	/* Get chip options, preserve non chip based options */
 	chip->options &= ~NAND_CHIPOPTIONS_MSK;