| Message ID | 20200602143124.29553-6-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Preparation to the generic ECC engine abstraction | expand |
On Tue, 2 Jun 2020 16:31:20 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > Embed a generic NAND ECC high-level object in the nand_device > structure to carry all the ECC engine configuration/data. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > drivers/mtd/nand/raw/nand_base.c | 4 +++- > include/linux/mtd/nand.h | 12 ++++++------ > 2 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index e8e22d79f422..ed0f642be993 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -5984,7 +5984,9 @@ static int nand_scan_tail(struct nand_chip *chip) > /* ECC sanity check: warn if it's too weak */ > if (!nand_ecc_strength_good(chip)) > pr_warn("WARNING: %s: the ECC used on your system (%db/%dB) is too weak compared to the one required by the NAND chip (%db/%dB)\n", > - mtd->name, chip->ecc.strength, chip->ecc.size, > + mtd->name, > + nanddev_get_ecc_conf(&chip->base)->strength, > + nanddev_get_ecc_conf(&chip->base)->step_size, Hm, are you sure all places using chip->ecc.{strength,size} have been patched to use nanddev_get_ecc_conf()? > nanddev_get_ecc_requirements(&chip->base)->strength, > nanddev_get_ecc_requirements(&chip->base)->step_size); > > diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h > index 0b89da54bef2..668c99c4aaa7 100644 > --- a/include/linux/mtd/nand.h > +++ b/include/linux/mtd/nand.h > @@ -290,7 +290,7 @@ struct nand_ecc { > * struct nand_device - NAND device > * @mtd: MTD instance attached to the NAND device > * @memorg: memory layout > - * @eccreq: ECC requirements > + * @ecc: NAND ECC object attached to the NAND device > * @rowconv: position to row address converter > * @bbt: bad block table info > * @ops: NAND operations attached to the NAND device > @@ -298,8 +298,8 @@ struct nand_ecc { > * Generic NAND object. Specialized NAND layers (raw NAND, SPI NAND, OneNAND) > * should declare their own NAND object embedding a nand_device struct (that's > * how inheritance is done). > - * struct_nand_device->memorg and struct_nand_device->eccreq should be filled > - * at device detection time to reflect the NAND device > + * struct_nand_device->memorg and struct_nand_device->ecc.requirements should > + * be filled at device detection time to reflect the NAND device > * capabilities/requirements. Once this is done nanddev_init() can be called. > * It will take care of converting NAND information into MTD ones, which means > * the specialized NAND layers should never manually tweak > @@ -308,7 +308,7 @@ struct nand_ecc { > struct nand_device { > struct mtd_info mtd; > struct nand_memory_organization memorg; > - struct nand_ecc_props eccreq; > + struct nand_ecc ecc; > struct nand_row_converter rowconv; > struct nand_bbt bbt; > const struct nand_ops *ops; > @@ -519,7 +519,7 @@ nanddev_get_memorg(struct nand_device *nand) > static inline const struct nand_ecc_props * > nanddev_get_ecc_conf(struct nand_device *nand) > { > - return &nand->eccreq; > + return &nand->ecc.ctx.conf; > } > > /** > @@ -530,7 +530,7 @@ nanddev_get_ecc_conf(struct nand_device *nand) > static inline const struct nand_ecc_props * > nanddev_get_ecc_requirements(struct nand_device *nand) > { > - return &nand->eccreq; > + return &nand->ecc.requirements; > } > > int nanddev_init(struct nand_device *nand, const struct nand_ops *ops,
Boris Brezillon <boris.brezillon@collabora.com> wrote on Tue, 2 Jun 2020 18:03:20 +0200: > On Tue, 2 Jun 2020 16:31:20 +0200 > Miquel Raynal <miquel.raynal@bootlin.com> wrote: > > > Embed a generic NAND ECC high-level object in the nand_device > > structure to carry all the ECC engine configuration/data. > > > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > > --- > > drivers/mtd/nand/raw/nand_base.c | 4 +++- > > include/linux/mtd/nand.h | 12 ++++++------ > > 2 files changed, 9 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > > index e8e22d79f422..ed0f642be993 100644 > > --- a/drivers/mtd/nand/raw/nand_base.c > > +++ b/drivers/mtd/nand/raw/nand_base.c > > @@ -5984,7 +5984,9 @@ static int nand_scan_tail(struct nand_chip *chip) > > /* ECC sanity check: warn if it's too weak */ > > if (!nand_ecc_strength_good(chip)) > > pr_warn("WARNING: %s: the ECC used on your system (%db/%dB) is too weak compared to the one required by the NAND chip (%db/%dB)\n", > > - mtd->name, chip->ecc.strength, chip->ecc.size, > > + mtd->name, > > + nanddev_get_ecc_conf(&chip->base)->strength, > > + nanddev_get_ecc_conf(&chip->base)->step_size, > > Hm, are you sure all places using chip->ecc.{strength,size} have been > patched to use nanddev_get_ecc_conf()? Not yet, I thought I removed this change but apparently not. I will drop this.
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index e8e22d79f422..ed0f642be993 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -5984,7 +5984,9 @@ static int nand_scan_tail(struct nand_chip *chip) /* ECC sanity check: warn if it's too weak */ if (!nand_ecc_strength_good(chip)) pr_warn("WARNING: %s: the ECC used on your system (%db/%dB) is too weak compared to the one required by the NAND chip (%db/%dB)\n", - mtd->name, chip->ecc.strength, chip->ecc.size, + mtd->name, + nanddev_get_ecc_conf(&chip->base)->strength, + nanddev_get_ecc_conf(&chip->base)->step_size, nanddev_get_ecc_requirements(&chip->base)->strength, nanddev_get_ecc_requirements(&chip->base)->step_size); diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 0b89da54bef2..668c99c4aaa7 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -290,7 +290,7 @@ struct nand_ecc { * struct nand_device - NAND device * @mtd: MTD instance attached to the NAND device * @memorg: memory layout - * @eccreq: ECC requirements + * @ecc: NAND ECC object attached to the NAND device * @rowconv: position to row address converter * @bbt: bad block table info * @ops: NAND operations attached to the NAND device @@ -298,8 +298,8 @@ struct nand_ecc { * Generic NAND object. Specialized NAND layers (raw NAND, SPI NAND, OneNAND) * should declare their own NAND object embedding a nand_device struct (that's * how inheritance is done). - * struct_nand_device->memorg and struct_nand_device->eccreq should be filled - * at device detection time to reflect the NAND device + * struct_nand_device->memorg and struct_nand_device->ecc.requirements should + * be filled at device detection time to reflect the NAND device * capabilities/requirements. Once this is done nanddev_init() can be called. * It will take care of converting NAND information into MTD ones, which means * the specialized NAND layers should never manually tweak @@ -308,7 +308,7 @@ struct nand_ecc { struct nand_device { struct mtd_info mtd; struct nand_memory_organization memorg; - struct nand_ecc_props eccreq; + struct nand_ecc ecc; struct nand_row_converter rowconv; struct nand_bbt bbt; const struct nand_ops *ops; @@ -519,7 +519,7 @@ nanddev_get_memorg(struct nand_device *nand) static inline const struct nand_ecc_props * nanddev_get_ecc_conf(struct nand_device *nand) { - return &nand->eccreq; + return &nand->ecc.ctx.conf; } /** @@ -530,7 +530,7 @@ nanddev_get_ecc_conf(struct nand_device *nand) static inline const struct nand_ecc_props * nanddev_get_ecc_requirements(struct nand_device *nand) { - return &nand->eccreq; + return &nand->ecc.requirements; } int nanddev_init(struct nand_device *nand, const struct nand_ops *ops,
Embed a generic NAND ECC high-level object in the nand_device structure to carry all the ECC engine configuration/data. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/nand_base.c | 4 +++- include/linux/mtd/nand.h | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)