Commit 1ac68709 authored by Miquel Raynal's avatar Miquel Raynal

mtd: rawnand: sharpsl: Move the ECC initialization to ->attach_chip()

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: d7157ff4 ("mtd: rawnand: Use the ECC framework user input parsing bits")
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 7ef969a0
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/io.h> #include <linux/io.h>
struct sharpsl_nand { struct sharpsl_nand {
struct nand_controller controller;
struct nand_chip chip; struct nand_chip chip;
void __iomem *io; void __iomem *io;
...@@ -96,6 +97,25 @@ static int sharpsl_nand_calculate_ecc(struct nand_chip *chip, ...@@ -96,6 +97,25 @@ static int sharpsl_nand_calculate_ecc(struct nand_chip *chip,
return readb(sharpsl->io + ECCCNTR) != 0; return readb(sharpsl->io + ECCCNTR) != 0;
} }
static int sharpsl_attach_chip(struct nand_chip *chip)
{
if (chip->ecc.engine_type != NAND_ECC_ENGINE_TYPE_ON_HOST)
return 0;
chip->ecc.size = 256;
chip->ecc.bytes = 3;
chip->ecc.strength = 1;
chip->ecc.hwctl = sharpsl_nand_enable_hwecc;
chip->ecc.calculate = sharpsl_nand_calculate_ecc;
chip->ecc.correct = nand_correct_data;
return 0;
}
static const struct nand_controller_ops sharpsl_ops = {
.attach_chip = sharpsl_attach_chip,
};
/* /*
* Main initialization routine * Main initialization routine
*/ */
...@@ -136,6 +156,10 @@ static int sharpsl_nand_probe(struct platform_device *pdev) ...@@ -136,6 +156,10 @@ static int sharpsl_nand_probe(struct platform_device *pdev)
/* Get pointer to private data */ /* Get pointer to private data */
this = (struct nand_chip *)(&sharpsl->chip); this = (struct nand_chip *)(&sharpsl->chip);
nand_controller_init(&sharpsl->controller);
sharpsl->controller.ops = &sharpsl_ops;
this->controller = &sharpsl->controller;
/* Link the private data with the MTD structure */ /* Link the private data with the MTD structure */
mtd = nand_to_mtd(this); mtd = nand_to_mtd(this);
mtd->dev.parent = &pdev->dev; mtd->dev.parent = &pdev->dev;
...@@ -156,15 +180,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev) ...@@ -156,15 +180,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev)
this->legacy.dev_ready = sharpsl_nand_dev_ready; this->legacy.dev_ready = sharpsl_nand_dev_ready;
/* 15 us command delay time */ /* 15 us command delay time */
this->legacy.chip_delay = 15; this->legacy.chip_delay = 15;
/* set eccmode using hardware ECC */
this->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
this->ecc.size = 256;
this->ecc.bytes = 3;
this->ecc.strength = 1;
this->badblock_pattern = data->badblock_pattern; this->badblock_pattern = data->badblock_pattern;
this->ecc.hwctl = sharpsl_nand_enable_hwecc;
this->ecc.calculate = sharpsl_nand_calculate_ecc;
this->ecc.correct = nand_correct_data;
/* Scan to find existence of the device */ /* Scan to find existence of the device */
err = nand_scan(this, 1); err = nand_scan(this, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment