Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 065a1ed8 authored by Brian Norris's avatar Brian Norris Committed by David Woodhouse
Browse files

mtd: nand: Fix regression in BBM detection 



Commit c7b28e25 ("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: default avatarBrian Norris <norris@broadcom.com>
Tested-by: default avatarMichael Guntsche <mike@it-loops.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 93b352fc

drivers/mtd/nand/nand_base.c

+3 −7
Original line number Diff line number Diff line
@@ -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;