Commit cf75f00f authored Dec 03, 2020 by Miquel Raynal

mtd: rawnand: socrates: Do not force a particular software ECC engine

Originally, commit d7157ff4 ("mtd: rawnand: Use the ECC framework
user input parsing bits") kind of broke the logic around the
initialization of several ECC engines.

Unfortunately, the fix (which indeed moved the ECC initialization to
the right place) did not take into account the fact that a different
ECC algorithm could have been used thanks to a DT property,
considering the "Hamming" algorithm entry a configuration while it was
only a default.

Add the necessary logic to be sure Hamming keeps being only a default.

Fixes: b36bf0a0 ("mtd: rawnand: socrates: Move the ECC initialization to ->attach_chip()")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20201203190340.15522-9-miquel.raynal@bootlin.com

parent 148b4f16

drivers/mtd/nand/raw/socrates_nand.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -120,6 +120,8 @@ static int socrates_nand_device_ready(struct nand_chip *nand_chip)
		static int socrates_attach_chip(struct nand_chip *chip)
		{
		chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

		if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
		chip->ecc.algo = NAND_ECC_ALGO_HAMMING;

		return 0;

Admin message