| Message ID | 20200528113113.9166-5-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce the generic ECC engine abstraction | expand |
On Thu, 28 May 2020 13:30:59 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > Use it from nand_dt_init() to initialize the ECC structure. > > This allows the deprecation of the hw_syndrome ECC mode. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/mtd/nand/raw/nand_base.c | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index 9fbd2a474b62..fd0bfe9bf7ae 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -5047,6 +5047,34 @@ static int of_get_nand_ecc_mode(struct device_node *np) > return -ENODEV; > } > > +enum nand_ecc_placement of_get_nand_ecc_placement(struct device_node *np) > +{ > + enum nand_ecc_placement placement; > + const char *pm; > + int err; > + > + err = of_property_read_string(np, "nand-ecc-placement", &pm); > + if (!err) { > + for (placement = NAND_ECC_PLACEMENT_INTERLEAVED; > + placement < ARRAY_SIZE(nand_ecc_placement); placement++) { > + if (!strcasecmp(pm, nand_ecc_placement[placement])) > + return placement; > + } > + } > + > + /* > + * For backward compatibility we support few obsoleted values that don't > + * have their mappings into the nand_ecc_placement enum anymore. > + */ > + err = of_property_read_string(np, "nand-ecc-mode", &pm); > + if (!err) { > + if (!strcasecmp(pm, "hw_syndrome")) > + return NAND_ECC_PLACEMENT_INTERLEAVED; > + } > + > + return NAND_ECC_PLACEMENT_UNKNOWN; > +} > + > static const char * const nand_ecc_algos[] = { > [NAND_ECC_HAMMING] = "hamming", > [NAND_ECC_BCH] = "bch", > @@ -5143,6 +5171,7 @@ static int nand_dt_init(struct nand_chip *chip) > > ecc_mode = of_get_nand_ecc_mode(dn); > ecc_algo = of_get_nand_ecc_algo(dn); > + chip->ecc.placement = of_get_nand_ecc_placement(dn); > ecc_strength = of_get_nand_ecc_strength(dn); > ecc_step = of_get_nand_ecc_step_size(dn); >
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 9fbd2a474b62..fd0bfe9bf7ae 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -5047,6 +5047,34 @@ static int of_get_nand_ecc_mode(struct device_node *np) return -ENODEV; } +enum nand_ecc_placement of_get_nand_ecc_placement(struct device_node *np) +{ + enum nand_ecc_placement placement; + const char *pm; + int err; + + err = of_property_read_string(np, "nand-ecc-placement", &pm); + if (!err) { + for (placement = NAND_ECC_PLACEMENT_INTERLEAVED; + placement < ARRAY_SIZE(nand_ecc_placement); placement++) { + if (!strcasecmp(pm, nand_ecc_placement[placement])) + return placement; + } + } + + /* + * For backward compatibility we support few obsoleted values that don't + * have their mappings into the nand_ecc_placement enum anymore. + */ + err = of_property_read_string(np, "nand-ecc-mode", &pm); + if (!err) { + if (!strcasecmp(pm, "hw_syndrome")) + return NAND_ECC_PLACEMENT_INTERLEAVED; + } + + return NAND_ECC_PLACEMENT_UNKNOWN; +} + static const char * const nand_ecc_algos[] = { [NAND_ECC_HAMMING] = "hamming", [NAND_ECC_BCH] = "bch", @@ -5143,6 +5171,7 @@ static int nand_dt_init(struct nand_chip *chip) ecc_mode = of_get_nand_ecc_mode(dn); ecc_algo = of_get_nand_ecc_algo(dn); + chip->ecc.placement = of_get_nand_ecc_placement(dn); ecc_strength = of_get_nand_ecc_strength(dn); ecc_step = of_get_nand_ecc_step_size(dn);
Use it from nand_dt_init() to initialize the ECC structure. This allows the deprecation of the hw_syndrome ECC mode. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/nand_base.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)