mtd: rawnand: cadence: fix the calculation of the avaialble OOB size

commit e4578af0354176ff6b4ae78b9998b4f479f7c31c upstream.

The value of cdns_chip->sector_count is not known at the moment
of the derivation of ecc_size, leading to a zero value. Fix
this by assigning ecc_size later in the code.

Fixes: ec4ba01e894d ("mtd: rawnand: Add new Cadence NAND driver to MTD subsystem")
Cc: stable@vger.kernel.org
Signed-off-by: Piotr Sroka <piotrs@cadence.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/1581328530-29966-2-git-send-email-piotrs@cadence.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index f6c7102a1e3253f79cbc1f6c0bf54858661c7564..10f4fd1b322d74f66746adada37260cb3365f349 100644 (file)
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -2585,7 +2585,7 @@ int cadence_nand_attach_chip(struct nand_chip *chip)
 {
        struct cdns_nand_ctrl *cdns_ctrl = to_cdns_nand_ctrl(chip->controller);
        struct cdns_nand_chip *cdns_chip = to_cdns_nand_chip(chip);
-       u32 ecc_size = cdns_chip->sector_count * chip->ecc.bytes;
+       u32 ecc_size;
        struct mtd_info *mtd = nand_to_mtd(chip);
        u32 max_oob_data_size;
        int ret;
@@ -2625,6 +2625,7 @@ int cadence_nand_attach_chip(struct nand_chip *chip)
        /* Error correction configuration. */
        cdns_chip->sector_size = chip->ecc.size;
        cdns_chip->sector_count = mtd->writesize / cdns_chip->sector_size;
+       ecc_size = cdns_chip->sector_count * chip->ecc.bytes;
 
        cdns_chip->avail_oob_size = mtd->oobsize - ecc_size;