lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtd: nand: fix SCAN2NDPAGE check for BBM

Browse Source 
nand_block_bad() doesn't check the correct pages when
NAND_BBT_SCAN2NDPAGE is enabled. It should scan both the OOB region of
both the 1st and 2nd page of each block.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Brian Norris
2012-01-13 18:11:48 -08:00
committed by David Woodhouse
parent 009184296d
commit cdbec05086
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/mtd/nand/nand_base.c
View File

@@ -338,7 +338,7 @@ static int nand_verify_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
*/ */
static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip) static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
{ {
int page, chipnr, res = 0; int page, chipnr, res = 0, i = 0;
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
u16 bad; u16 bad;
@@ -356,23 +356,29 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
chip->select_chip(mtd, chipnr); chip->select_chip(mtd, chipnr);
} }
if (chip->options & NAND_BUSWIDTH_16) { do {
chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos & 0xFE, if (chip->options & NAND_BUSWIDTH_16) {
page); chip->cmdfunc(mtd, NAND_CMD_READOOB,
bad = cpu_to_le16(chip->read_word(mtd)); chip->badblockpos & 0xFE, page);
if (chip->badblockpos & 0x1) bad = cpu_to_le16(chip->read_word(mtd));
bad >>= 8; if (chip->badblockpos & 0x1)
else bad >>= 8;
bad &= 0xFF; else
} else { bad &= 0xFF;
chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos, page); } else {
bad = chip->read_byte(mtd); chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos,
} page);
bad = chip->read_byte(mtd);
}
if (likely(chip->badblockbits == 8)) if (likely(chip->badblockbits == 8))
res = bad != 0xFF; res = bad != 0xFF;
else else
res = hweight8(bad) < chip->badblockbits; res = hweight8(bad) < chip->badblockbits;
ofs += mtd->writesize;
page = (int)(ofs >> chip->page_shift) & chip->pagemask;
i++;
} while (!res && i < 2 && (chip->bbt_options & NAND_BBT_SCAN2NDPAGE));
if (getchip) if (getchip)
nand_release_device(mtd); nand_release_device(mtd);