Message ID | 20201113123424.32233-5-miquel.raynal@bootlin.com |
---|---|
State | Accepted |
Headers | show |
Series | Ensure good ECC settings | expand |
On Fri, 2020-11-13 at 12:34:09 UTC, Miquel Raynal wrote: > The probe function is only supposed to initialize the controller > hardware but not the ECC engine. Indeed, we don't know anything about > the NAND chip(s) at this stage. Let's move the logic initializing the > ECC engine, even pretty simple, to the ->attach_chip() hook which gets > called during nand_scan() routine, after the NAND chip discovery. As > the previously mentioned logic is supposed to parse the DT for us, it > is likely that the chip->ecc.* entries be overwritten. So let's avoid > this by moving these lines to ->attach_chip(). > > Fixes: d7157ff49a5b ("mtd: rawnand: Use the ECC framework user input parsing bits") > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes. Miquel
diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c index 79b057400fe9..7892022bd6dd 100644 --- a/drivers/mtd/nand/raw/au1550nd.c +++ b/drivers/mtd/nand/raw/au1550nd.c @@ -236,8 +236,17 @@ static int au1550nd_exec_op(struct nand_chip *this, return ret; } +static int au1550nd_attach_chip(struct nand_chip *chip) +{ + chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT; + chip->ecc.algo = NAND_ECC_ALGO_HAMMING; + + return 0; +} + static const struct nand_controller_ops au1550nd_ops = { .exec_op = au1550nd_exec_op, + .attach_chip = au1550nd_attach_chip, }; static int au1550nd_probe(struct platform_device *pdev) @@ -294,8 +303,6 @@ static int au1550nd_probe(struct platform_device *pdev) nand_controller_init(&ctx->controller); ctx->controller.ops = &au1550nd_ops; this->controller = &ctx->controller; - this->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT; - this->ecc.algo = NAND_ECC_ALGO_HAMMING; if (pd->devwidth) this->options |= NAND_BUSWIDTH_16;
The probe function is only supposed to initialize the controller hardware but not the ECC engine. Indeed, we don't know anything about the NAND chip(s) at this stage. Let's move the logic initializing the ECC engine, even pretty simple, to the ->attach_chip() hook which gets called during nand_scan() routine, after the NAND chip discovery. As the previously mentioned logic is supposed to parse the DT for us, it is likely that the chip->ecc.* entries be overwritten. So let's avoid this by moving these lines to ->attach_chip(). Fixes: d7157ff49a5b ("mtd: rawnand: Use the ECC framework user input parsing bits") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/au1550nd.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)