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

Commit 30fe8115 authored by Brian Norris's avatar Brian Norris Committed by David Woodhouse
Browse files

mtd: nand: edit macro flag for BBT scan of last page in block 



NAND_BB_LAST_PAGE used to be in nand.h, but it pertained to bad block
management and so belongs next to NAND_BBT_SCAN2NDPAGE in bbm.h. Also,
its previous flag value (0x00000400) conflicted with NAND_BBT_SCANALLPAGES
so I changed its value to 0x00008000. All uses of the name were modified to
provide consistency with other "NAND_BBT_*" flags.

Signed-off-by: default avatarBrian Norris <norris@broadcom.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent e1d0fe3c

drivers/mtd/nand/nand_base.c

+3 −3
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip) 
	struct nand_chip *chip = mtd->priv;

	u16 bad;



	if (chip->options & NAND_BB_LAST_PAGE)

	if (chip->options & NAND_BBT_SCANLASTPAGE)

		ofs += mtd->erasesize - mtd->writesize;



	page = (int)(ofs >> chip->page_shift) & chip->pagemask;
@@ -399,7 +399,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs) 
	uint8_t buf[2] = { 0, 0 };

	int block, ret;



	if (chip->options & NAND_BB_LAST_PAGE)

	if (chip->options & NAND_BBT_SCANLASTPAGE)

		ofs += mtd->erasesize - mtd->writesize;



	/* Get block number */
@@ -2946,7 +2946,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
	if ((chip->cellinfo & NAND_CI_CELLTYPE_MSK) &&

			(*maf_id == NAND_MFR_SAMSUNG ||

			 *maf_id == NAND_MFR_HYNIX))

		chip->options |= NAND_BB_LAST_PAGE;

		chip->options |= NAND_BBT_SCANLASTPAGE;



	/* Check for AND chips with 4 page planes */

	if (chip->options & NAND_4PAGE_ARRAY)

drivers/mtd/nand/nand_bbt.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, 
		from = (loff_t)startblock << (this->bbt_erase_shift - 1);

	}



	if (this->options & NAND_BB_LAST_PAGE)

	if (this->options & NAND_BBT_SCANLASTPAGE)

		from += mtd->erasesize - (mtd->writesize * len);



	for (i = startblock; i < numblocks;) {

include/linux/mtd/bbm.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ struct nand_bbt_descr { 
#define NAND_BBT_SAVECONTENT	0x00002000

/* Search good / bad pattern on the first and the second page */

#define NAND_BBT_SCAN2NDPAGE	0x00004000

/* Search good / bad pattern on the last page of the eraseblock */

#define NAND_BBT_SCANLASTPAGE	0x00008000



/* The maximum number of blocks to scan for a bbt */

#define NAND_BBT_SCAN_MAXBLOCKS	4

include/linux/mtd/nand.h

+0 −2
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ typedef enum { 
#define NAND_NO_READRDY		0x00000100

/* Chip does not allow subpage writes */

#define NAND_NO_SUBPAGE_WRITE	0x00000200

/* Chip stores bad block marker on the last page of the eraseblock */

#define NAND_BB_LAST_PAGE	0x00000400



/* Device is one of 'new' xD cards that expose fake nand command set */

#define NAND_BROKEN_XD		0x00000400