mtd: nand: Make flags for bad block marker position more granular

To be able to check and set bad block markers in the first and
second page of a block independently of each other, we create
separate flags for both cases.

Previously NAND_BBM_SECONDPAGE meant, that both, the first and the
second page were used. With this patch NAND_BBM_FIRSTPAGE stands for
using the first page and NAND_BBM_SECONDPAGE for using the second
page.

This patch is only for preparation of subsequent changes and does
not implement the logic to actually handle both flags separately.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: Boris Brezillon <bbrezillon@kernel.org>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/raw/nand_amd.c b/drivers/mtd/nand/raw/nand_amd.c
index 9051e4e..1417559 100644 (file)
--- a/drivers/mtd/nand/raw/nand_amd.c
+++ b/drivers/mtd/nand/raw/nand_amd.c
@@ -45,7 +45,7 @@ static void amd_nand_decode_id(struct nand_chip *chip)
 static int amd_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-               chip->options |= NAND_BBM_SECONDPAGE;
+               chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        return 0;
 }

diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index e111129..6e2d728 100644 (file)
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -299,7 +299,8 @@ static int nand_block_bad(struct nand_chip *chip, loff_t ofs)
                ofs += mtd->erasesize - mtd->writesize;
 
        page = (int)(ofs >> chip->page_shift) & chip->pagemask;
-       page_end = page + ((chip->options & NAND_BBM_SECONDPAGE) ? 2 : 1);
+       page_end = page + (((chip->options & NAND_BBM_FIRSTPAGE) &&
+                           (chip->options & NAND_BBM_SECONDPAGE)) ? 2 : 1);
 
        for (; page < page_end; page++) {
                res = chip->ecc.read_oob(chip, page);
@@ -516,7 +517,8 @@ static int nand_default_block_markbad(struct nand_chip *chip, loff_t ofs)
 
                i++;
                ofs += mtd->writesize;
-       } while ((chip->options & NAND_BBM_SECONDPAGE) && i < 2);
+       } while ((chip->options & NAND_BBM_FIRSTPAGE) &&
+                (chip->options & NAND_BBM_SECONDPAGE) && i < 2);
 
        return ret;
 }

diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 4915dd7..4cb6648 100644 (file)
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -468,7 +468,8 @@ static int create_bbt(struct nand_chip *this, uint8_t *buf,
 
        pr_info("Scanning device for bad blocks\n");
 
-       if (this->options & NAND_BBM_SECONDPAGE)
+       if ((this->options & NAND_BBM_FIRSTPAGE) &&
+           (this->options & NAND_BBM_SECONDPAGE))
                numpages = 2;
        else
                numpages = 1;

diff --git a/drivers/mtd/nand/raw/nand_esmt.c b/drivers/mtd/nand/raw/nand_esmt.c
index 4320d4c..58646ed 100644 (file)
--- a/drivers/mtd/nand/raw/nand_esmt.c
+++ b/drivers/mtd/nand/raw/nand_esmt.c
@@ -36,7 +36,7 @@ static void esmt_nand_decode_id(struct nand_chip *chip)
 static int esmt_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-               chip->options |= NAND_BBM_SECONDPAGE;
+               chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        return 0;
 }

diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c
index 33cb10d..7c600c4 100644 (file)
--- a/drivers/mtd/nand/raw/nand_hynix.c
+++ b/drivers/mtd/nand/raw/nand_hynix.c
@@ -690,7 +690,7 @@ static int hynix_nand_init(struct nand_chip *chip)
        if (!nand_is_slc(chip))
                chip->options |= NAND_BBM_LASTPAGE;
        else
-               chip->options |= NAND_BBM_SECONDPAGE;
+               chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        hynix = kzalloc(sizeof(*hynix), GFP_KERNEL);
        if (!hynix)

diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c
index 6db7ced..e287e71 100644 (file)
--- a/drivers/mtd/nand/raw/nand_macronix.c
+++ b/drivers/mtd/nand/raw/nand_macronix.c
@@ -62,7 +62,7 @@ static void macronix_nand_fix_broken_get_timings(struct nand_chip *chip)
 static int macronix_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-               chip->options |= NAND_BBM_SECONDPAGE;
+               chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        macronix_nand_fix_broken_get_timings(chip);
 

diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c
index d43e157..cbd4f09 100644 (file)
--- a/drivers/mtd/nand/raw/nand_micron.c
+++ b/drivers/mtd/nand/raw/nand_micron.c
@@ -448,7 +448,7 @@ static int micron_nand_init(struct nand_chip *chip)
                goto err_free_manuf_data;
 
        if (mtd->writesize == 2048)
-               chip->options |= NAND_BBM_SECONDPAGE;
+               chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        ondie = micron_supports_on_die_ecc(chip);
 

diff --git a/drivers/mtd/nand/raw/nand_samsung.c b/drivers/mtd/nand/raw/nand_samsung.c
index f4db723..5552ce2 100644 (file)
--- a/drivers/mtd/nand/raw/nand_samsung.c
+++ b/drivers/mtd/nand/raw/nand_samsung.c
@@ -133,7 +133,7 @@ static int samsung_nand_init(struct nand_chip *chip)
        if (!nand_is_slc(chip))
                chip->options |= NAND_BBM_LASTPAGE;
        else
-               chip->options |= NAND_BBM_SECONDPAGE;
+               chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        return 0;
 }

diff --git a/drivers/mtd/nand/raw/nand_toshiba.c b/drivers/mtd/nand/raw/nand_toshiba.c
index 67f01ce..74ffcae 100644 (file)
--- a/drivers/mtd/nand/raw/nand_toshiba.c
+++ b/drivers/mtd/nand/raw/nand_toshiba.c
@@ -152,7 +152,7 @@ static void toshiba_nand_decode_id(struct nand_chip *chip)
 static int toshiba_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-               chip->options |=  NAND_BBM_SECONDPAGE;
+               chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        /* Check that chip is BENAND and ECC mode is on-die */
        if (nand_is_slc(chip) && chip->ecc.mode == NAND_ECC_ON_DIE &&

diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c
index 02a6768..e509c93 100644 (file)
--- a/drivers/mtd/nand/raw/sh_flctl.c
+++ b/drivers/mtd/nand/raw/sh_flctl.c
@@ -1177,7 +1177,7 @@ static int flctl_probe(struct platform_device *pdev)
        if (pdata->flcmncr_val & SEL_16BIT)
                nand->options |= NAND_BUSWIDTH_16;
 
-       nand->options |= NAND_BBM_SECONDPAGE;
+       nand->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
 
        pm_runtime_enable(&pdev->dev);
        pm_runtime_resume(&pdev->dev);

diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
index 8b3e28e..dbfffa5 100644 (file)
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
@@ -176,6 +176,7 @@ enum nand_ecc_algo {
  * Position within the block: Each of these pages needs to be checked for a
  * bad block marking pattern.
  */
+#define NAND_BBM_FIRSTPAGE             0x01000000
 #define NAND_BBM_SECONDPAGE            0x02000000
 #define NAND_BBM_LASTPAGE              0x04000000