mtd: rawnand: brcmnand: Fix mtd oobsize

brcmnand controller can only access the flash spare area up to certain
bytes based on the ECC level. It can be less than the actual flash spare
area size. For example, for many NAND chip supporting ECC BCH-8, it has
226 bytes spare area. But controller can only uses 218 bytes. So brcmand
driver overrides the mtd oobsize with the controller's accessible spare
area size. When the nand base driver utilizes the nand_device object, it
resets the oobsize back to the actual flash spare aprea size from
nand_memory_organization structure and controller may not able to access
all the oob area as mtd advises.

This change fixes the issue by overriding the oobsize in the
nand_memory_organization structure to the controller's accessible spare
area size.

Fixes: a7ab085d7c16 ("mtd: rawnand: Initialize the nand_device object")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230706182909.79151-6-william.zhang@broadcom.com

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 71d0ba652bee5a1e493305c6221e27b80209e514..39661e23d7d4fecccea9aa5bc9b69b11938e0398 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -2652,6 +2652,8 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
        struct nand_chip *chip = &host->chip;
        const struct nand_ecc_props *requirements =
                nanddev_get_ecc_requirements(&chip->base);
+       struct nand_memory_organization *memorg =
+               nanddev_get_memorg(&chip->base);
        struct brcmnand_controller *ctrl = host->ctrl;
        struct brcmnand_cfg *cfg = &host->hwcfg;
        char msg[128];
@@ -2673,10 +2675,11 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
        if (cfg->spare_area_size > ctrl->max_oob)
                cfg->spare_area_size = ctrl->max_oob;
        /*
-        * Set oobsize to be consistent with controller's spare_area_size, as
-        * the rest is inaccessible.
+        * Set mtd and memorg oobsize to be consistent with controller's
+        * spare_area_size, as the rest is inaccessible.
         */
        mtd->oobsize = cfg->spare_area_size * (mtd->writesize >> FC_SHIFT);
+       memorg->oobsize = mtd->oobsize;
 
        cfg->device_size = mtd->size;
        cfg->block_size = mtd->erasesize;