Commit 53576c7b authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: Use nanddev_get/set_ecc_requirements() when relevant 



Instead of accessing ->strength/step_size directly.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200827085208.16276-15-miquel.raynal@bootlin.com
parent 3316c8e3

drivers/mtd/nand/raw/atmel/nand-controller.c

+6 −4
Original line number Diff line number Diff line
@@ -1043,6 +1043,8 @@ static int atmel_hsmc_nand_pmecc_read_page_raw(struct nand_chip *chip, 


static int atmel_nand_pmecc_init(struct nand_chip *chip)

{

	const struct nand_ecc_props *requirements =

		nanddev_get_ecc_requirements(&chip->base);

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct atmel_nand *nand = to_atmel_nand(chip);

	struct atmel_nand_controller *nc;
@@ -1072,15 +1074,15 @@ static int atmel_nand_pmecc_init(struct nand_chip *chip) 
		req.ecc.strength = ATMEL_PMECC_MAXIMIZE_ECC_STRENGTH;

	else if (chip->ecc.strength)

		req.ecc.strength = chip->ecc.strength;

	else if (chip->base.eccreq.strength)

		req.ecc.strength = chip->base.eccreq.strength;

	else if (requirements->strength)

		req.ecc.strength = requirements->strength;

	else

		req.ecc.strength = ATMEL_PMECC_MAXIMIZE_ECC_STRENGTH;



	if (chip->ecc.size)

		req.ecc.sectorsize = chip->ecc.size;

	else if (chip->base.eccreq.step_size)

		req.ecc.sectorsize = chip->base.eccreq.step_size;

	else if (requirements->step_size)

		req.ecc.sectorsize = requirements->step_size;

	else

		req.ecc.sectorsize = ATMEL_PMECC_SECTOR_SIZE_AUTO;

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+5 −3
Original line number Diff line number Diff line
@@ -2532,6 +2532,8 @@ static int brcmnand_setup_dev(struct brcmnand_host *host) 
{

	struct mtd_info *mtd = nand_to_mtd(&host->chip);

	struct nand_chip *chip = &host->chip;

	const struct nand_ecc_props *requirements =

		nanddev_get_ecc_requirements(&chip->base);

	struct brcmnand_controller *ctrl = host->ctrl;

	struct brcmnand_cfg *cfg = &host->hwcfg;

	char msg[128];
@@ -2589,10 +2591,10 @@ static int brcmnand_setup_dev(struct brcmnand_host *host) 


	if (chip->ecc.engine_type != NAND_ECC_ENGINE_TYPE_NONE &&

	    (!chip->ecc.size || !chip->ecc.strength)) {

		if (chip->base.eccreq.step_size && chip->base.eccreq.strength) {

		if (requirements->step_size && requirements->strength) {

			/* use detected ECC parameters */

			chip->ecc.size = chip->base.eccreq.step_size;

			chip->ecc.strength = chip->base.eccreq.strength;

			chip->ecc.size = requirements->step_size;

			chip->ecc.strength = requirements->strength;

			dev_info(ctrl->dev, "Using ECC step-size %d, strength %d\n",

				chip->ecc.size, chip->ecc.strength);

		}

drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

+7 −6
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ static int set_geometry_by_ecc_info(struct gpmi_nand_data *this, 
	default:

		dev_err(this->dev,

			"unsupported nand chip. ecc bits : %d, ecc size : %d\n",

			chip->base.eccreq.strength,

			chip->base.eccreq.step_size);

			nanddev_get_ecc_requirements(&chip->base)->strength,

			nanddev_get_ecc_requirements(&chip->base)->step_size);

		return -EINVAL;

	}

	geo->ecc_chunk_size = ecc_step;
@@ -510,6 +510,8 @@ 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;

	const struct nand_ecc_props *requirements =

		nanddev_get_ecc_requirements(&chip->base);



	if (chip->ecc.strength > 0 && chip->ecc.size > 0)

		return set_geometry_by_ecc_info(this, chip->ecc.strength,
@@ -517,13 +519,12 @@ static int common_nfc_set_geometry(struct gpmi_nand_data *this) 


	if ((of_property_read_bool(this->dev->of_node, "fsl,use-minimum-ecc"))

				|| legacy_set_geometry(this)) {

		if (!(chip->base.eccreq.strength > 0 &&

		      chip->base.eccreq.step_size > 0))

		if (!(requirements->strength > 0 && requirements->step_size > 0))

			return -EINVAL;



		return set_geometry_by_ecc_info(this,

						chip->base.eccreq.strength,

						chip->base.eccreq.step_size);

						requirements->strength,

						requirements->step_size);

	}



	return 0;

drivers/mtd/nand/raw/marvell_nand.c

+5 −3
Original line number Diff line number Diff line
@@ -2247,14 +2247,16 @@ static int marvell_nand_ecc_init(struct mtd_info *mtd, 
				 struct nand_ecc_ctrl *ecc)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	const struct nand_ecc_props *requirements =

		nanddev_get_ecc_requirements(&chip->base);

	struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);

	int ret;



	if (ecc->engine_type != NAND_ECC_ENGINE_TYPE_NONE &&

	    (!ecc->size || !ecc->strength)) {

		if (chip->base.eccreq.step_size && chip->base.eccreq.strength) {

			ecc->size = chip->base.eccreq.step_size;

			ecc->strength = chip->base.eccreq.strength;

		if (requirements->step_size && requirements->strength) {

			ecc->size = requirements->step_size;

			ecc->strength = requirements->strength;

		} else {

			dev_info(nfc->dev,

				 "No minimum ECC strength, using 1b/512B\n");

drivers/mtd/nand/raw/mtk_nand.c

+4 −2
Original line number Diff line number Diff line
@@ -1253,6 +1253,8 @@ static int mtk_nfc_set_spare_per_sector(u32 *sps, struct mtd_info *mtd) 
static int mtk_nfc_ecc_init(struct device *dev, struct mtd_info *mtd)

{

	struct nand_chip *nand = mtd_to_nand(mtd);

	const struct nand_ecc_props *requirements =

		nanddev_get_ecc_requirements(&nand->base);

	struct mtk_nfc *nfc = nand_get_controller_data(nand);

	u32 spare;

	int free, ret;
@@ -1266,8 +1268,8 @@ static int mtk_nfc_ecc_init(struct device *dev, struct mtd_info *mtd) 
	/* if optional dt settings not present */

	if (!nand->ecc.size || !nand->ecc.strength) {

		/* use datasheet requirements */

		nand->ecc.strength = nand->base.eccreq.strength;

		nand->ecc.size = nand->base.eccreq.step_size;

		nand->ecc.strength = requirements->strength;

		nand->ecc.size = requirements->step_size;



		/*

		 * align eccstrength and eccsize

CRA Git | Maintained and supported by SUSTech CRA and CCSE