On Tue,  8 May 2018 14:19:53 -0700
Jane Wan <jane....@nokia.com> wrote:

> 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....@nokia.com>

I'm gonna take this patch, but I'd like to make it clear: this is the
last time I accept fixes touching fsl_ifc_cmdfunc() for bugs that could
have been addressed by switching to ->exec_op() (note that I had a look
at a freescale datasheet, and I'm now 100% sure this driver can be
converted to ->exec_op()).

> ---
>  drivers/mtd/nand/raw/fsl_ifc_nand.c |   17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c 
> b/drivers/mtd/nand/raw/fsl_ifc_nand.c
> index 61aae02..98aac1f 100644
> --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
> +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
> @@ -342,9 +342,16 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, 
> unsigned int command,
>  
>       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_FIR_OP_CW0 << IFC_NAND_FIR0_OP0_SHIFT) |
>                         (IFC_FIR_OP_UA  << IFC_NAND_FIR0_OP1_SHIFT) |
> @@ -354,12 +361,8 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, 
> unsigned int command,
>                         &ifc->ifc_nand.nand_fcr0);
>               ifc_out32(column, &ifc->ifc_nand.row3);
>  
> -             /*
> -              * although currently it's 8 bytes for READID, we always read
> -              * the maximum 256 bytes(for PARAM)
> -              */
> -             ifc_out32(256, &ifc->ifc_nand.nand_fbcr);
> -             ifc_nand_ctrl->read_bytes = 256;
> +             ifc_out32(len, &ifc->ifc_nand.nand_fbcr);
> +             ifc_nand_ctrl->read_bytes = len;
>  
>               set_addr(mtd, 0, 0, 0);
>               fsl_ifc_run_command(mtd);

Reply via email to