blob: 020e584ba8829c29de536d7c393bdb145c7764f9 [file] [log] [blame]
From e6079208494ce7a02d5d8a3a3c708b44ed0f7629 Mon Sep 17 00:00:00 2001
From: Frieder Schrempf <>
Date: Tue, 18 Feb 2020 10:05:35 +0000
Subject: [PATCH] mtd: spinand: Do not erase the block before writing a bad
block marker
commit b645ad39d56846618704e463b24bb994c9585c7f upstream.
Currently when marking a block, we use spinand_erase_op() to erase
the block before writing the marker to the OOB area. Doing so without
waiting for the operation to finish can lead to the marking failing
silently and no bad block marker being written to the flash.
In fact we don't need to do an erase at all before writing the BBM.
The ECC is disabled for raw accesses to the OOB data and we don't
need to work around any issues with chips reporting ECC errors as it
is known to be the case for raw NAND.
Fixes: 7529df465248 ("mtd: nand: Add core infrastructure to support SPI NANDs")
Signed-off-by: Frieder Schrempf <>
Reviewed-by: Boris Brezillon <>
Signed-off-by: Miquel Raynal <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 0c88cc49b8c1..5a9d5d423dd8 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -612,7 +612,6 @@ static int spinand_markbad(struct nand_device *nand, const struct nand_pos *pos)
int ret;
- /* Erase block before marking it bad. */
ret = spinand_select_target(spinand, pos->target);
if (ret)
return ret;
@@ -621,8 +620,6 @@ static int spinand_markbad(struct nand_device *nand, const struct nand_pos *pos)
if (ret)
return ret;
- spinand_erase_op(spinand, pos);
return spinand_write_page(spinand, &req);