mtd: rawnand: micron: Avoid enabling/disabling ECC when it can't be disabled

Some chips have their on-die ECC forcibly enabled, there's no point in
trying to enable/disable the ECC engine in that case.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c
index 2cff25f7b48b6fd026309c0790dae0ca3ea356ce..9d13b701e581e71e6ed29843e301bfaa960b2fe0 100644 (file)
--- a/drivers/mtd/nand/raw/nand_micron.c
+++ b/drivers/mtd/nand/raw/nand_micron.c
@@ -65,6 +65,7 @@ struct nand_onfi_vendor_micron {
 } __packed;
 
 struct micron_on_die_ecc {
+       bool forced;
        void *rawbuf;
 };
 
@@ -171,8 +172,12 @@ static const struct mtd_ooblayout_ops micron_nand_on_die_8_ooblayout_ops = {
 
 static int micron_nand_on_die_ecc_setup(struct nand_chip *chip, bool enable)
 {
+       struct micron_nand *micron = nand_get_manufacturer_data(chip);
        u8 feature[ONFI_SUBFEATURE_PARAM_LEN] = { 0, };
 
+       if (micron->ecc.forced)
+               return 0;
+
        if (enable)
                feature[0] |= ONFI_FEATURE_ON_DIE_ECC_EN;
 
@@ -452,6 +457,9 @@ static int micron_nand_init(struct nand_chip *chip)
                        goto err_free_manuf_data;
                }
 
+               if (ondie == MICRON_ON_DIE_MANDATORY)
+                       micron->ecc.forced = true;
+
                /*
                 * In case of 4bit on-die ECC, we need a buffer to store a
                 * page dumped in raw mode so that we can compare its content