@@ -400,6 +400,17 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
uint8_t buf[2] = { 0, 0 };
int block, ret, i = 0;
+ if (!(chip->bbt_options & NAND_BBT_USE_FLASH)) {
+ struct erase_info einfo;
+
+ /* Attempt erase before marking OOB */
+ memset(&einfo, 0, sizeof(einfo));
+ einfo.mtd = mtd;
+ einfo.addr = ofs;
+ einfo.len = 1 << chip->phys_erase_shift;
+ nand_erase_nand(mtd, &einfo, 0);
+ }
+
if (chip->bbt_options & NAND_BBT_SCANLASTPAGE)
ofs += mtd->erasesize - mtd->writesize;
@@ -413,14 +424,6 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
ret = nand_update_bbt(mtd, ofs);
else {
struct mtd_oob_ops ops;
- struct erase_info einfo;
-
- /* Attempt erase before marking OOB */
- memset(&einfo, 0, sizeof(einfo));
- einfo.mtd = mtd;
- einfo.addr = ofs;
- einfo.len = 1 << chip->phys_erase_shift;
- nand_erase_nand(mtd, &einfo, 0);
nand_get_device(chip, mtd, FL_WRITING);
The following commit had an incorrect solution: mtd: nand: erase block before marking bad commit ece080820c9dddf467b6da08a8bfbab66615a03b When trying to erase a block before writing to its OOB marker, we erase after we mark the memory BBT. This causes an error like this: nand_erase_nand: attempt to erase a bad block at page 0x00000000 This patch is a fixup that moves the erase code block to the correct location. Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- drivers/mtd/nand/nand_base.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-)