Skip to content

Commit f87b720

Browse files
committed
mtd: rawnand: orion: Do not force a particular software ECC engine
Originally, commit d7157ff ("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. Reported-by: Chris Packham <[email protected]> Fixes: 553508c ("mtd: rawnand: orion: Move the ECC initialization to ->attach_chip()") Signed-off-by: Miquel Raynal <[email protected]> Tested-by: Chris Packham <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected]
1 parent f49bde9 commit f87b720

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/mtd/nand/raw/orion_nand.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ static void orion_nand_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
8686
static int orion_nand_attach_chip(struct nand_chip *chip)
8787
{
8888
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
89-
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
89+
90+
if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
91+
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
9092

9193
return 0;
9294
}

0 commit comments

Comments
 (0)