mtd: rawnand: fsl_ifc: fix FSL NAND driver to read all ONFI parameter pages

Linux commit a75bbe71a27 ("mtd: rawnand: fsl_ifc: fix FSL NAND driver to
 read all ONFI parameter pages")

Per ONFI specification (Rev. 4.0), if the CRC of the first parameter page
read is not valid, the host should read redundant parameter page copies.
Fix FSL NAND driver to read the two redundant copies which are mandatory
in the specification.

Signed-off-by: Jane Wan <Jane.Wan@nokia.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index cf20238782c696fe0bb6ef19872662643d8e2be9..e5ff937872e41b0a88247e3f9c986ceca7377f2b 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -411,9 +411,16 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, unsigned int command,
        /* READID must read all possible bytes while CEB is active */
        case NAND_CMD_READID:
        case NAND_CMD_PARAM: {
+               /*
+                * For READID, read 8 bytes that are currently used.
+                * For PARAM, read all 3 copies of 256-bytes pages.
+                */
+               int len = 8;
                int timing = IFC_FIR_OP_RB;
-               if (command == NAND_CMD_PARAM)
+               if (command == NAND_CMD_PARAM) {
                        timing = IFC_FIR_OP_RBCD;
+                       len = 256 * 3;
+               }
 
                ifc_out32(&ifc->ifc_nand.nand_fir0,
                          (IFC_FIR_OP_CW0 << IFC_NAND_FIR0_OP0_SHIFT) |
@@ -423,12 +430,8 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, unsigned int command,
                          command << IFC_NAND_FCR0_CMD0_SHIFT);
                ifc_out32(&ifc->ifc_nand.row3, column);
 
-               /*
-                * although currently it's 8 bytes for READID, we always read
-                * the maximum 256 bytes(for PARAM)
-                */
-               ifc_out32(&ifc->ifc_nand.nand_fbcr, 256);
-               ctrl->read_bytes = 256;
+               ifc_out32(&ifc->ifc_nand.nand_fbcr, len);
+               ctrl->read_bytes = len;
 
                set_addr(mtd, 0, 0, 0);
                fsl_ifc_run_command(mtd);