| Message ID | 1326111847-13085-1-git-send-email-prabhakar@freescale.com |
|---|---|
| State | New, archived |
| Headers | show |
On 01/09/2012 06:24 AM, Prabhakar Kushwaha wrote: > @@ -215,12 +215,15 @@ static int is_blank(struct mtd_info *mtd, unsigned int bufnum) > static int check_read_ecc(struct mtd_info *mtd, struct fsl_ifc_ctrl *ctrl, > u32 *eccstat, unsigned int bufnum) > { > + struct nand_chip *chip = mtd->priv; > + int bufperpage = mtd->writesize / chip->ecc.size; > + int eccbuf_num = bufnum + (bufnum / bufperpage) * bufperpage; This is unnecessarily complicated (and introduces two more, dependent, runtime divisions). I don't think there are any changes required in this function. You're awkwardly compensating for the fact that the caller hasn't been updated for the new definition of bufnum. bufperpage used in fsl_ifc_run_command should be doubled to account for the OOB buffers. We should probably rename it from "buf" to something else (chunk? subpage?) to avoid confusion with bufnum_mask, which refers to page-sized buffers. > u32 reg = eccstat[bufnum / 4]; > int errors = (reg >> ((3 - bufnum % 4) * 8)) & 15; > > if (errors == 15) { /* uncorrectable */ > /* Blank pages fail hw ECC checks */ > - if (is_blank(mtd, bufnum)) > + if (is_blank(mtd, eccbuf_num)) > return 1; > > /* > @@ -273,7 +276,7 @@ static void fsl_ifc_run_command(struct mtd_info *mtd) > dev_err(priv->dev, "NAND Flash Write Protect Error\n"); > > if (nctrl->eccread) { > - int bufperpage = mtd->writesize / 512; > + int bufperpage = mtd->writesize / chip->ecc.size; > int bufnum = (nctrl->page & priv->bufnum_mask) * bufperpage; > int bufnum_end = bufnum + bufperpage - 1; > Again, please calculate bufperpage (chunksperpage? subsperpage? perbuf?) at driver init, as is done with bufnum_mask. -Scott
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index 8475b88..c0529ea 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -1,7 +1,7 @@ /* * Freescale Integrated Flash Controller NAND driver * - * Copyright 2011 Freescale Semiconductor, Inc + * Copyright 2011,2012 Freescale Semiconductor, Inc * * Author: Dipen Dudhat <Dipen.Dudhat@freescale.com> * @@ -191,12 +191,12 @@ static int is_blank(struct mtd_info *mtd, unsigned int bufnum) { struct nand_chip *chip = mtd->priv; struct fsl_ifc_mtd *priv = chip->priv; - u8 __iomem *addr = priv->vbase + bufnum * (mtd->writesize * 2); + u8 __iomem *addr = priv->vbase + bufnum * chip->ecc.size; u32 __iomem *mainarea = (u32 *)addr; u8 __iomem *oob = addr + mtd->writesize; int i; - for (i = 0; i < mtd->writesize / 4; i++) { + for (i = 0; i < chip->ecc.size / 4; i++) { if (__raw_readl(&mainarea[i]) != 0xffffffff) return 0; } @@ -215,12 +215,15 @@ static int is_blank(struct mtd_info *mtd, unsigned int bufnum) static int check_read_ecc(struct mtd_info *mtd, struct fsl_ifc_ctrl *ctrl, u32 *eccstat, unsigned int bufnum) { + struct nand_chip *chip = mtd->priv; + int bufperpage = mtd->writesize / chip->ecc.size; + int eccbuf_num = bufnum + (bufnum / bufperpage) * bufperpage; u32 reg = eccstat[bufnum / 4]; int errors = (reg >> ((3 - bufnum % 4) * 8)) & 15; if (errors == 15) { /* uncorrectable */ /* Blank pages fail hw ECC checks */ - if (is_blank(mtd, bufnum)) + if (is_blank(mtd, eccbuf_num)) return 1; /* @@ -273,7 +276,7 @@ static void fsl_ifc_run_command(struct mtd_info *mtd) dev_err(priv->dev, "NAND Flash Write Protect Error\n"); if (nctrl->eccread) { - int bufperpage = mtd->writesize / 512; + int bufperpage = mtd->writesize / chip->ecc.size; int bufnum = (nctrl->page & priv->bufnum_mask) * bufperpage; int bufnum_end = bufnum + bufperpage - 1;