mtd: mxc-nand: Only enable hardware checksumming for fully detected flashes

At least on i.MX25 (i.e. NFCv2) preset_v2 is called with mtd->writesize
== 0 that is before the connect flash chip is detected. It then
configures for 8 bit ECC mode which needs 26 bytes of OOB per 512 bytes
main section. For flashes with a smaller OOB area issuing a read page
command makes the controller stuck with this config.

Note that this currently doesn't hurt because the first read page
command is issued only after detection is complete and preset is called
once more.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 27ba07c079661380e4b662a30151a2ded964dd9c..d9637ae34719ccb543b7a67e1d07e4c2307b986a 100644 (file)
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -928,7 +928,7 @@ static void preset_v1(struct mtd_info *mtd)
        struct mxc_nand_host *host = nand_chip->priv;
        uint16_t config1 = 0;
 
-       if (nand_chip->ecc.mode == NAND_ECC_HW)
+       if (nand_chip->ecc.mode == NAND_ECC_HW && mtd->writesize)
                config1 |= NFC_V1_V2_CONFIG1_ECC_EN;
 
        if (!host->devtype_data->irqpending_quirk)
@@ -956,9 +956,6 @@ static void preset_v2(struct mtd_info *mtd)
        struct mxc_nand_host *host = nand_chip->priv;
        uint16_t config1 = 0;
 
-       if (nand_chip->ecc.mode == NAND_ECC_HW)
-               config1 |= NFC_V1_V2_CONFIG1_ECC_EN;
-
        config1 |= NFC_V2_CONFIG1_FP_INT;
 
        if (!host->devtype_data->irqpending_quirk)
@@ -967,6 +964,9 @@ static void preset_v2(struct mtd_info *mtd)
        if (mtd->writesize) {
                uint16_t pages_per_block = mtd->erasesize / mtd->writesize;
 
+               if (nand_chip->ecc.mode == NAND_ECC_HW)
+                       config1 |= NFC_V1_V2_CONFIG1_ECC_EN;
+
                host->eccsize = get_eccsize(mtd);
                if (host->eccsize == 4)
                        config1 |= NFC_V2_CONFIG1_ECC_MODE_4;
@@ -1024,9 +1024,6 @@ static void preset_v3(struct mtd_info *mtd)
                NFC_V3_CONFIG2_INT_MSK |
                NFC_V3_CONFIG2_NUM_ADDR_PHASE0;
 
-       if (chip->ecc.mode == NAND_ECC_HW)
-               config2 |= NFC_V3_CONFIG2_ECC_EN;
-
        addr_phases = fls(chip->pagemask) >> 3;
 
        if (mtd->writesize == 2048) {
@@ -1041,6 +1038,9 @@ static void preset_v3(struct mtd_info *mtd)
        }
 
        if (mtd->writesize) {
+               if (chip->ecc.mode == NAND_ECC_HW)
+                       config2 |= NFC_V3_CONFIG2_ECC_EN;
+
                config2 |= NFC_V3_CONFIG2_PPB(
                                ffs(mtd->erasesize / mtd->writesize) - 6,
                                host->devtype_data->ppb_shift);