Commit 3c97be69 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: nandsim: Fix the logic when selecting Hamming soft ECC engine 



I have been fooled by the logic picking the right ECC engine which is
spread across two functions: *init_module() and *_attach(). I thought
this driver was not impacted by the recent changes around the ECC
engines DT parsing logic but in fact it is.

Reported-by: default avatarkernel test robot <oliver.sang@intel.com>
Fixes: d7157ff4 ("mtd: rawnand: Use the ECC framework user input parsing bits")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210104093057.31178-1-miquel.raynal@bootlin.com
parent 4883a60c

drivers/mtd/nand/raw/nandsim.c

+3 −4
Original line number Diff line number Diff line
@@ -2210,6 +2210,9 @@ static int ns_attach_chip(struct nand_chip *chip) 
{

	unsigned int eccsteps, eccbytes;



	chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

	chip->ecc.algo = bch ? NAND_ECC_ALGO_BCH : NAND_ECC_ALGO_HAMMING;



	if (!bch)

		return 0;
@@ -2233,8 +2236,6 @@ static int ns_attach_chip(struct nand_chip *chip) 
		return -EINVAL;

	}



	chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

	chip->ecc.algo = NAND_ECC_ALGO_BCH;

	chip->ecc.size = 512;

	chip->ecc.strength = bch;

	chip->ecc.bytes = eccbytes;
@@ -2273,8 +2274,6 @@ static int __init ns_init_module(void) 
	nsmtd       = nand_to_mtd(chip);

	nand_set_controller_data(chip, (void *)ns);



	chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

	chip->ecc.algo   = NAND_ECC_ALGO_HAMMING;

	/* The NAND_SKIP_BBTSCAN option is necessary for 'overridesize' */

	/* and 'badblocks' parameters to work */

	chip->options   |= NAND_SKIP_BBTSCAN;