mtd: rawnand: mxc: Move the ECC engine initialization to the right place

No ECC initialization should happen during the host controller probe.

In fact, we need the probe function to call nand_scan() in order to:

- identify the device, its capabilities and constraints (nand_scan_ident())
- configure the ECC engine accordingly (->attach_chip())
- scan its content and prepare the core (nand_scan_tail())

Moving these lines to mxcnd_attach_chip() fixes a regression caused by a previous commit supposed to clarify these steps.

When moving the ECC initialization from probe() to attach(), get rid of the pdata usage to determine the engine type and let the core decide instead.

Tested on a imx27-pdk board.

Reported-by Fabio Estevam <[email protected]>

Co-developed-by Miquel Raynal <[email protected]>

Signed-off-by Miquel Raynal <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

No ECC initialization should happen during the host controller probe.

In fact, we need the probe function to call nand_scan() in order to:

- identify the device, its capabilities and constraints (nand_scan_ident())
- configure the ECC engine accordingly (->attach_chip())
- scan its content and prepare the core (nand_scan_tail())

Moving these lines to mxcnd_attach_chip() fixes a regression caused by a previous commit supposed to clarify these steps.

When moving the ECC initialization from probe() to attach(), get rid of the pdata usage to determine the engine type and let the core decide instead.

Tested on a imx27-pdk board.

Reported-by Fabio Estevam <[email protected]>

Co-developed-by Miquel Raynal <[email protected]>

Signed-off-by Miquel Raynal <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v2:
- Remove pdata check in attach() and let the core determine the engine type

 drivers/mtd/nand/raw/mxc_nand.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

drivers/mtd/nand/raw/mxc_nand.c +5 -12

index d4200eb2ad32..684c51e5e60d 100644
@@ -1681,6 +1681,11 @@ static int mxcnd_attach_chip(struct nand_chip *chip)
 	struct mxc_nand_host *host = nand_get_controller_data(chip);
 	struct device *dev = mtd->dev.parent;
 
+	chip->ecc.bytes = host->devtype_data->eccbytes;
+	host->eccsize = host->devtype_data->eccsize;
+	chip->ecc.size = 512;
+	mtd_set_ooblayout(mtd, host->devtype_data->ooblayout);
+
 	switch (chip->ecc.engine_type) {
 	case NAND_ECC_ENGINE_TYPE_ON_HOST:
 		chip->ecc.read_page = mxc_nand_read_page;

@@ -1836,19 +1841,7 @@ static int mxcnd_probe(struct platform_device *pdev)
 	if (host->devtype_data->axi_offset)
 		host->regs_axi = host->base + host->devtype_data->axi_offset;
 
-	this->ecc.bytes = host->devtype_data->eccbytes;
-	host->eccsize = host->devtype_data->eccsize;
-
 	this->legacy.select_chip = host->devtype_data->select_chip;
-	this->ecc.size = 512;
-	mtd_set_ooblayout(mtd, host->devtype_data->ooblayout);
-
-	if (host->pdata.hw_ecc) {
-		this->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
-	} else {
-		this->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
-		this->ecc.algo = NAND_ECC_ALGO_HAMMING;
-	}
 
 	/* NAND bus width determines access functions used by upper layer */
 	if (host->pdata.width == 2)

Signature · 1 line

2.17.1

Quoted 16 lines

No ECC initialization should happen during the host controller probe.

In fact, we need the probe function to call nand_scan() in order to:

- identify the device, its capabilities and constraints (nand_scan_ident())
- configure the ECC engine accordingly (->attach_chip())
- scan its content and prepare the core (nand_scan_tail())

Moving these lines to mxcnd_attach_chip() fixes a regression caused by a previous commit supposed to clarify these steps.

When moving the ECC initialization from probe() to attach(), get rid of the pdata usage to determine the engine type and let the core decide instead.

Tested on a imx27-pdk board.

Quoted 4 lines

Reported-by Fabio Estevam <[email protected]>

Co-developed-by Miquel Raynal <[email protected]>

Signed-off-by Miquel Raynal <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

I gave it a test on a Phytec phyCARD board, this fixes it.

Tested-by Sascha Hauer <[email protected]>

No ECC initialization should happen during the host controller probe.

In fact, we need the probe function to call nand_scan() in order to:

- identify the device, its capabilities and constraints (nand_scan_ident())
- configure the ECC engine accordingly (->attach_chip())
- scan its content and prepare the core (nand_scan_tail())

Moving these lines to mxcnd_attach_chip() fixes a regression caused by a previous commit supposed to clarify these steps.

When moving the ECC initialization from probe() to attach(), get rid of the pdata usage to determine the engine type and let the core decide instead.

Tested on a imx27-pdk board.

Reported-by Fabio Estevam <[email protected]>

Co-developed-by Miquel Raynal <[email protected]>

Signed-off-by Miquel Raynal <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

Tested-by Sascha Hauer <[email protected]>

Tested-by Martin Kaiser <[email protected]>

Quoted 15 lines

No ECC initialization should happen during the host controller probe.

In fact, we need the probe function to call nand_scan() in order to:

- identify the device, its capabilities and constraints (nand_scan_ident())
- configure the ECC engine accordingly (->attach_chip())
- scan its content and prepare the core (nand_scan_tail())

Moving these lines to mxcnd_attach_chip() fixes a regression caused by a previous commit supposed to clarify these steps.

When moving the ECC initialization from probe() to attach(), get rid of the pdata usage to determine the engine type and let the core decide instead.

Quoted 8 lines

Tested on a imx27-pdk board.

Reported-by Fabio Estevam <[email protected]>

Co-developed-by Miquel Raynal <[email protected]>

Signed-off-by Miquel Raynal <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

Tested-by Sascha Hauer <[email protected]>

Tested-by Martin Kaiser <[email protected]>