| Message ID | 20220404195427.8871-1-han.xu@nxp.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v3,1/4] mtd: rawnand: gpmi: Refactor bch geometry settings function | expand |
Hi Han, han.xu@nxp.com wrote on Mon, 4 Apr 2022 14:54:24 -0500: > The code change refactor the bch geometry setting function, which still > use the legacy bch setting as default option, while user may choose to > use chips required minimum ecc strength by DT flag "fsl,use-minimum-ecc". > > The driver uses legacy bch geometry settings by default, if the NAND Shall we really refer to a legacy geometry? It's just that there was a default value until know, you need another default for bigger devices, but the ancient geometry is still completely valid (at least for existing devices). Can you change the naming? You can however mention in a comment that this way of deriving the geometry is deprecated for larger devices (and mention the split). Otherwise LGTM. > chips oob size is less than 1KB. The legacy_set_geometry() sets the data > chunk size(step_size) larger than oob size to make sure BBM locates in > data chunk, then set the maximum ecc strength oob can hold. It always use > unbalanced ECC layout, which ecc0 will cover both meta and data0 chunk. > > For all other cases,set the bch geometry by chip required strength and > step size, which uses the minimum ecc strength chip required. It can be > explicitly enabled by DT flag "fsl,use-minimum-ecc", but need to be > en/disabled in both u-boot and kernel at the same time. > > Signed-off-by: Han Xu <han.xu@nxp.com> > Tested-by: Sean Nyekjaer <sean@geanix.com> > > --- > Changes since v2 > - split the ecc check to a single patch > > Changes since v1 > - split the patch to two parts > - change the commit log > - add test tag > --- > --- > drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 32 ++++++++++++++-------- > 1 file changed, 20 insertions(+), 12 deletions(-) > > diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c > index d96899fa90b7..4144d5937103 100644 > --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c > +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c > @@ -514,24 +514,32 @@ static int legacy_set_geometry(struct gpmi_nand_data *this) > static int common_nfc_set_geometry(struct gpmi_nand_data *this) > { > struct nand_chip *chip = &this->nand; > + struct mtd_info *mtd = nand_to_mtd(&this->nand); > const struct nand_ecc_props *requirements = > nanddev_get_ecc_requirements(&chip->base); > + bool use_minimun_ecc; > + int err; > > - if (chip->ecc.strength > 0 && chip->ecc.size > 0) > - return set_geometry_by_ecc_info(this, chip->ecc.strength, > - chip->ecc.size); > - > - if ((of_property_read_bool(this->dev->of_node, "fsl,use-minimum-ecc")) > - || legacy_set_geometry(this)) { > - if (!(requirements->strength > 0 && requirements->step_size > 0)) > - return -EINVAL; > + use_minimun_ecc = of_property_read_bool(this->dev->of_node, > + "fsl,use-minimum-ecc"); > > - return set_geometry_by_ecc_info(this, > - requirements->strength, > - requirements->step_size); > + /* use legacy bch geometry settings by default*/ > + if ((!use_minimun_ecc && mtd->oobsize < 1024) || > + !(requirements->strength > 0 && requirements->step_size > 0)) { > + dev_dbg(this->dev, "use legacy bch geometry\n"); > + err = legacy_set_geometry(this); > + if (!err) > + return 0; > } > > - return 0; > + /* otherwise use the minimum ecc nand chip required */ > + dev_dbg(this->dev, "use minimum ecc bch geometry\n"); > + err = set_geometry_by_ecc_info(this, requirements->strength, > + requirements->step_size); > + if (err) > + dev_err(this->dev, "none of the bch geometry setting works\n"); > + > + return err; > } > > /* Configures the geometry for BCH. */ Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c index d96899fa90b7..4144d5937103 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c @@ -514,24 +514,32 @@ static int legacy_set_geometry(struct gpmi_nand_data *this) static int common_nfc_set_geometry(struct gpmi_nand_data *this) { struct nand_chip *chip = &this->nand; + struct mtd_info *mtd = nand_to_mtd(&this->nand); const struct nand_ecc_props *requirements = nanddev_get_ecc_requirements(&chip->base); + bool use_minimun_ecc; + int err; - if (chip->ecc.strength > 0 && chip->ecc.size > 0) - return set_geometry_by_ecc_info(this, chip->ecc.strength, - chip->ecc.size); - - if ((of_property_read_bool(this->dev->of_node, "fsl,use-minimum-ecc")) - || legacy_set_geometry(this)) { - if (!(requirements->strength > 0 && requirements->step_size > 0)) - return -EINVAL; + use_minimun_ecc = of_property_read_bool(this->dev->of_node, + "fsl,use-minimum-ecc"); - return set_geometry_by_ecc_info(this, - requirements->strength, - requirements->step_size); + /* use legacy bch geometry settings by default*/ + if ((!use_minimun_ecc && mtd->oobsize < 1024) || + !(requirements->strength > 0 && requirements->step_size > 0)) { + dev_dbg(this->dev, "use legacy bch geometry\n"); + err = legacy_set_geometry(this); + if (!err) + return 0; } - return 0; + /* otherwise use the minimum ecc nand chip required */ + dev_dbg(this->dev, "use minimum ecc bch geometry\n"); + err = set_geometry_by_ecc_info(this, requirements->strength, + requirements->step_size); + if (err) + dev_err(this->dev, "none of the bch geometry setting works\n"); + + return err; } /* Configures the geometry for BCH. */