Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb2bf403 authored by Chris Packham's avatar Chris Packham Committed by Miquel Raynal
Browse files

mtd: rawnand: micron: allow forced on-die ECC 



Some Micron NAND chips have on-die ECC forceably enabled. Allow such
chips to be used as long as the controller has set chip->ecc.mode to
NAND_ECC_ON_DIE.

Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 0d6030ac

drivers/mtd/nand/raw/nand_micron.c

+10 −3
Original line number Diff line number Diff line
@@ -374,7 +374,8 @@ static int micron_nand_init(struct nand_chip *chip) 


	ondie = micron_supports_on_die_ecc(chip);



	if (ondie == MICRON_ON_DIE_MANDATORY) {

	if (ondie == MICRON_ON_DIE_MANDATORY &&

	    chip->ecc.mode != NAND_ECC_ON_DIE) {

		pr_err("On-die ECC forcefully enabled, not supported\n");

		return -EINVAL;

	}
@@ -398,9 +399,15 @@ static int micron_nand_init(struct nand_chip *chip) 
		chip->ecc.algo = NAND_ECC_BCH;

		chip->ecc.read_page = micron_nand_read_page_on_die_ecc;

		chip->ecc.write_page = micron_nand_write_page_on_die_ecc;



		if (ondie == MICRON_ON_DIE_MANDATORY) {

			chip->ecc.read_page_raw = nand_read_page_raw_notsupp;

			chip->ecc.write_page_raw = nand_write_page_raw_notsupp;

		} else {

			chip->ecc.read_page_raw = nand_read_page_raw;

			chip->ecc.write_page_raw = nand_write_page_raw;

		}

	}



	return 0;

}