Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c6cd1a authored by Miquel Raynal's avatar Miquel Raynal Committed by Boris Brezillon
Browse files

mtd: nand: sunxi: Fix ECC strength choice 



When the requested ECC strength does not exactly match the strengths
supported by the ECC engine, the driver is selecting the closest
strength meeting the 'selected_strength > requested_strength'
constraint. Fix the fact that, in this particular case, ecc->strength
value was not updated to match the 'selected_strength'.

For instance, one can encounter this issue when no ECC requirement is
filled in the device tree while the NAND chip minimum requirement is not
a strength/step_size combo natively supported by the ECC engine.

Fixes: 1fef62c1 ("mtd: nand: add sunxi NAND flash controller support")
Cc: <stable@vger.kernel.org>
Suggested-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@free-electrons.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 4c7e95b1

drivers/mtd/nand/sunxi_nand.c

+7 −1
Original line number Diff line number Diff line
@@ -1858,9 +1858,15 @@ static int sunxi_nand_hw_common_ecc_ctrl_init(struct mtd_info *mtd, 


	/* Add ECC info retrieval from DT */

	for (i = 0; i < ARRAY_SIZE(strengths); i++) {

		if (ecc->strength <= strengths[i])

		if (ecc->strength <= strengths[i]) {

			/*

			 * Update ecc->strength value with the actual strength

			 * that will be used by the ECC engine.

			 */

			ecc->strength = strengths[i];

			break;

		}

	}



	if (i >= ARRAY_SIZE(strengths)) {

		dev_err(nfc->dev, "unsupported strength\n");