Commit ef422e1e authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal

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: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Tested-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 23017807
...@@ -65,6 +65,7 @@ struct nand_onfi_vendor_micron { ...@@ -65,6 +65,7 @@ struct nand_onfi_vendor_micron {
} __packed; } __packed;
struct micron_on_die_ecc { struct micron_on_die_ecc {
bool forced;
void *rawbuf; void *rawbuf;
}; };
...@@ -171,8 +172,12 @@ static const struct mtd_ooblayout_ops micron_nand_on_die_8_ooblayout_ops = { ...@@ -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) 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, }; u8 feature[ONFI_SUBFEATURE_PARAM_LEN] = { 0, };
if (micron->ecc.forced)
return 0;
if (enable) if (enable)
feature[0] |= ONFI_FEATURE_ON_DIE_ECC_EN; feature[0] |= ONFI_FEATURE_ON_DIE_ECC_EN;
...@@ -452,6 +457,9 @@ static int micron_nand_init(struct nand_chip *chip) ...@@ -452,6 +457,9 @@ static int micron_nand_init(struct nand_chip *chip)
goto err_free_manuf_data; 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 * 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 * page dumped in raw mode so that we can compare its content
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment