| Message ID | 20180709210937.30150-2-boris.brezillon@bootlin.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | mtd: rawnand: micron: Fix on-die ECC | expand |
On 10/07/18 09:09, Boris Brezillon wrote: > The MT29F1G08ABAFAWP datasheet says that all ECC bytes are placed at the > end of the OOB area. > > Fixes: 386fc2609d15 ("mtd: rawnand: micron: support 8/512 on-die ECC") > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> With d73e5d29 reverted, Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > drivers/mtd/nand/raw/nand_micron.c | 59 ++++++++++++++++++++++++++++++++------ > 1 file changed, 50 insertions(+), 9 deletions(-) > > diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c > index 754e9cdd44ac..00a965ad7ab2 100644 > --- a/drivers/mtd/nand/raw/nand_micron.c > +++ b/drivers/mtd/nand/raw/nand_micron.c > @@ -103,8 +103,9 @@ static int micron_nand_onfi_init(struct nand_chip *chip) > return 0; > } > > -static int micron_nand_on_die_ooblayout_ecc(struct mtd_info *mtd, int section, > - struct mtd_oob_region *oobregion) > +static int micron_nand_on_die_4_ooblayout_ecc(struct mtd_info *mtd, > + int section, > + struct mtd_oob_region *oobregion) > { > if (section >= 4) > return -ERANGE; > @@ -115,8 +116,9 @@ static int micron_nand_on_die_ooblayout_ecc(struct mtd_info *mtd, int section, > return 0; > } > > -static int micron_nand_on_die_ooblayout_free(struct mtd_info *mtd, int section, > - struct mtd_oob_region *oobregion) > +static int micron_nand_on_die_4_ooblayout_free(struct mtd_info *mtd, > + int section, > + struct mtd_oob_region *oobregion) > { > if (section >= 4) > return -ERANGE; > @@ -127,9 +129,44 @@ static int micron_nand_on_die_ooblayout_free(struct mtd_info *mtd, int section, > return 0; > } > > -static const struct mtd_ooblayout_ops micron_nand_on_die_ooblayout_ops = { > - .ecc = micron_nand_on_die_ooblayout_ecc, > - .free = micron_nand_on_die_ooblayout_free, > +static const struct mtd_ooblayout_ops micron_nand_on_die_4_ooblayout_ops = { > + .ecc = micron_nand_on_die_4_ooblayout_ecc, > + .free = micron_nand_on_die_4_ooblayout_free, > +}; > + > +static int micron_nand_on_die_8_ooblayout_ecc(struct mtd_info *mtd, > + int section, > + struct mtd_oob_region *oobregion) > +{ > + struct nand_chip *chip = mtd_to_nand(mtd); > + > + if (section) > + return -ERANGE; > + > + oobregion->offset = mtd->oobsize - chip->ecc.total; > + oobregion->length = chip->ecc.total; > + > + return 0; > +} > + > +static int micron_nand_on_die_8_ooblayout_free(struct mtd_info *mtd, > + int section, > + struct mtd_oob_region *oobregion) > +{ > + struct nand_chip *chip = mtd_to_nand(mtd); > + > + if (section) > + return -ERANGE; > + > + oobregion->offset = 2; > + oobregion->length = mtd->oobsize - chip->ecc.total - 2; > + > + return 0; > +} > + > +static const struct mtd_ooblayout_ops micron_nand_on_die_8_ooblayout_ops = { > + .ecc = micron_nand_on_die_8_ooblayout_ecc, > + .free = micron_nand_on_die_8_ooblayout_free, > }; > > static int micron_nand_on_die_ecc_setup(struct nand_chip *chip, bool enable) > @@ -425,6 +462,12 @@ static int micron_nand_init(struct nand_chip *chip) > ret = -ENOMEM; > goto err_free_manuf_data; > } > + > + mtd_set_ooblayout(mtd, > + µn_nand_on_die_4_ooblayout_ops); > + } else { > + mtd_set_ooblayout(mtd, > + µn_nand_on_die_8_ooblayout_ops); > } > > chip->ecc.bytes = chip->ecc_strength_ds * 2; > @@ -435,8 +478,6 @@ static int micron_nand_init(struct nand_chip *chip) > chip->ecc.write_page = micron_nand_write_page_on_die_ecc; > chip->ecc.read_page_raw = nand_read_page_raw; > chip->ecc.write_page_raw = nand_write_page_raw; > - > - mtd_set_ooblayout(mtd, µn_nand_on_die_ooblayout_ops); > } > > return 0; >
diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c index 754e9cdd44ac..00a965ad7ab2 100644 --- a/drivers/mtd/nand/raw/nand_micron.c +++ b/drivers/mtd/nand/raw/nand_micron.c @@ -103,8 +103,9 @@ static int micron_nand_onfi_init(struct nand_chip *chip) return 0; } -static int micron_nand_on_die_ooblayout_ecc(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobregion) +static int micron_nand_on_die_4_ooblayout_ecc(struct mtd_info *mtd, + int section, + struct mtd_oob_region *oobregion) { if (section >= 4) return -ERANGE; @@ -115,8 +116,9 @@ static int micron_nand_on_die_ooblayout_ecc(struct mtd_info *mtd, int section, return 0; } -static int micron_nand_on_die_ooblayout_free(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobregion) +static int micron_nand_on_die_4_ooblayout_free(struct mtd_info *mtd, + int section, + struct mtd_oob_region *oobregion) { if (section >= 4) return -ERANGE; @@ -127,9 +129,44 @@ static int micron_nand_on_die_ooblayout_free(struct mtd_info *mtd, int section, return 0; } -static const struct mtd_ooblayout_ops micron_nand_on_die_ooblayout_ops = { - .ecc = micron_nand_on_die_ooblayout_ecc, - .free = micron_nand_on_die_ooblayout_free, +static const struct mtd_ooblayout_ops micron_nand_on_die_4_ooblayout_ops = { + .ecc = micron_nand_on_die_4_ooblayout_ecc, + .free = micron_nand_on_die_4_ooblayout_free, +}; + +static int micron_nand_on_die_8_ooblayout_ecc(struct mtd_info *mtd, + int section, + struct mtd_oob_region *oobregion) +{ + struct nand_chip *chip = mtd_to_nand(mtd); + + if (section) + return -ERANGE; + + oobregion->offset = mtd->oobsize - chip->ecc.total; + oobregion->length = chip->ecc.total; + + return 0; +} + +static int micron_nand_on_die_8_ooblayout_free(struct mtd_info *mtd, + int section, + struct mtd_oob_region *oobregion) +{ + struct nand_chip *chip = mtd_to_nand(mtd); + + if (section) + return -ERANGE; + + oobregion->offset = 2; + oobregion->length = mtd->oobsize - chip->ecc.total - 2; + + return 0; +} + +static const struct mtd_ooblayout_ops micron_nand_on_die_8_ooblayout_ops = { + .ecc = micron_nand_on_die_8_ooblayout_ecc, + .free = micron_nand_on_die_8_ooblayout_free, }; static int micron_nand_on_die_ecc_setup(struct nand_chip *chip, bool enable) @@ -425,6 +462,12 @@ static int micron_nand_init(struct nand_chip *chip) ret = -ENOMEM; goto err_free_manuf_data; } + + mtd_set_ooblayout(mtd, + µn_nand_on_die_4_ooblayout_ops); + } else { + mtd_set_ooblayout(mtd, + µn_nand_on_die_8_ooblayout_ops); } chip->ecc.bytes = chip->ecc_strength_ds * 2; @@ -435,8 +478,6 @@ static int micron_nand_init(struct nand_chip *chip) chip->ecc.write_page = micron_nand_write_page_on_die_ecc; chip->ecc.read_page_raw = nand_read_page_raw; chip->ecc.write_page_raw = nand_write_page_raw; - - mtd_set_ooblayout(mtd, µn_nand_on_die_ooblayout_ops); } return 0;
The MT29F1G08ABAFAWP datasheet says that all ECC bytes are placed at the end of the OOB area. Fixes: 386fc2609d15 ("mtd: rawnand: micron: support 8/512 on-die ECC") Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- drivers/mtd/nand/raw/nand_micron.c | 59 ++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-)