Skip to content

Commit 7e3cdba

Browse files
committed
mtd: rawnand: au1550nd: Keep the driver compatible with on-die ECC engines
Following the introduction of the generic ECC engine infrastructure, it was necessary to reorganize the code and move the ECC configuration in the ->attach_chip() hook. Failing to do that properly lead to a first series of fixes supposed to stabilize the situation. Unfortunately, this only fixed the use of software ECC engines, preventing any other kind of engine to be used, including on-die ones. It is now time to (finally) fix the situation by ensuring that we still provide a default (eg. software ECC) but will still support different ECC engines such as on-die ECC engines if properly described in the device tree. There are no changes needed on the core side in order to do this, but we just need to leverage the logic there which allows: 1- a subsystem default (set to Host engines in the raw NAND world) 2- a driver specific default (here set to software ECC engines) 3- any type of engine requested by the user (ie. described in the DT) As the raw NAND subsystem has not yet been fully converted to the ECC engine infrastructure, in order to provide a default ECC engine for this driver we need to set chip->ecc.engine_type *before* calling nand_scan(). During the initialization step, the core will consider this entry as the default engine for this driver. This value may of course be overloaded by the user if the usual DT properties are provided. Fixes: dbffc8c ("mtd: rawnand: au1550: Move the ECC initialization to ->attach_chip()") Cc: [email protected] Signed-off-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected]
1 parent d707bb7 commit 7e3cdba

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

drivers/mtd/nand/raw/au1550nd.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,8 @@ static int au1550nd_exec_op(struct nand_chip *this,
239239

240240
static int au1550nd_attach_chip(struct nand_chip *chip)
241241
{
242-
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
243-
244-
if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
242+
if (chip->ecc.engine_type == NAND_ECC_ENGINE_TYPE_SOFT &&
243+
chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
245244
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
246245

247246
return 0;
@@ -310,6 +309,13 @@ static int au1550nd_probe(struct platform_device *pdev)
310309
if (pd->devwidth)
311310
this->options |= NAND_BUSWIDTH_16;
312311

312+
/*
313+
* This driver assumes that the default ECC engine should be TYPE_SOFT.
314+
* Set ->engine_type before registering the NAND devices in order to
315+
* provide a driver specific default value.
316+
*/
317+
this->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
318+
313319
ret = nand_scan(this, 1);
314320
if (ret) {
315321
dev_err(&pdev->dev, "NAND scan failed with %d\n", ret);

0 commit comments

Comments
 (0)