mtd: rawnand: brcmnand: Fix ecc chunk calculation for erased page bitfips

In brcmstb_nand_verify_erased_page(), the ECC chunk pointer calculation
while correcting erased page bitflips is wrong, fix it.

Fixes: 02b88eea9f9c ("mtd: brcmnand: Add check for erased page bitflips")
Signed-off-by: Claire Lin <claire.lin@broadcom.com>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
[Ported to U-Boot from the Linux kernel]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: William Zhang <william.zhang@broadcom.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 170aece0aa797ececf5628e2f6071b8f36af7e22..0402cb06a74b780b10247225d2fbf138e611ee54 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1765,6 +1765,7 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd,
        int bitflips = 0;
        int page = addr >> chip->page_shift;
        int ret;
+       void *ecc_chunk;
 
        if (!buf) {
 #ifndef __UBOOT__
@@ -1784,7 +1785,9 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd,
                return ret;
 
        for (i = 0; i < chip->ecc.steps; i++, oob += sas) {
-               ret = nand_check_erased_ecc_chunk(buf, chip->ecc.size,
+               ecc_chunk = buf + chip->ecc.size * i;
+               ret = nand_check_erased_ecc_chunk(ecc_chunk,
+                                                 chip->ecc.size,
                                                  oob, sas, NULL, 0,
                                                  chip->ecc.strength);
                if (ret < 0)