Skip to content

Commit

Permalink
mtd: rawnand: stm32_fmc2: fix broken ECC
Browse files Browse the repository at this point in the history
Since commit d7157ff ("mtd: rawnand: Use the ECC framework user
input parsing bits"), ECC are broken in FMC2 driver in case of
nand-ecc-step-size and nand-ecc-strength are not set in the device tree.
To avoid this issue, the default settings are now set in
stm32_fmc2_nfc_attach_chip function.

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Fixes: d7157ff ("mtd: rawnand: Use the ECC framework user input parsing bits")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/1604064819-26861-1-git-send-email-christophe.kerello@st.com
  • Loading branch information
Christophe Kerello authored and Miquel Raynal committed Oct 30, 2020
1 parent 324f78d commit 9efac6c
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/mtd/nand/raw/stm32_fmc2_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,13 @@ static int stm32_fmc2_nfc_attach_chip(struct nand_chip *chip)
return -EINVAL;
}

/* Default ECC settings in case they are not set in the device tree */
if (!chip->ecc.size)
chip->ecc.size = FMC2_ECC_STEP_SIZE;

if (!chip->ecc.strength)
chip->ecc.strength = FMC2_ECC_BCH8;

ret = nand_ecc_choose_conf(chip, &stm32_fmc2_nfc_ecc_caps,
mtd->oobsize - FMC2_BBM_LEN);
if (ret) {
Expand All @@ -1727,8 +1734,7 @@ static int stm32_fmc2_nfc_attach_chip(struct nand_chip *chip)

mtd_set_ooblayout(mtd, &stm32_fmc2_nfc_ooblayout_ops);

if (chip->options & NAND_BUSWIDTH_16)
stm32_fmc2_nfc_set_buswidth_16(nfc, true);
stm32_fmc2_nfc_setup(chip);

return 0;
}
Expand Down Expand Up @@ -1952,11 +1958,6 @@ static int stm32_fmc2_nfc_probe(struct platform_device *pdev)
chip->options |= NAND_BUSWIDTH_AUTO | NAND_NO_SUBPAGE_WRITE |
NAND_USES_DMA;

/* Default ECC settings */
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
chip->ecc.size = FMC2_ECC_STEP_SIZE;
chip->ecc.strength = FMC2_ECC_BCH8;

/* Scan to find existence of the device */
ret = nand_scan(chip, nand->ncs);
if (ret)
Expand Down

0 comments on commit 9efac6c

Please sign in to comment.