From: xiaolei li <xiaolei.li@mediatek.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: richard@nod.at, linux-mediatek@lists.infradead.org,
linux-mtd@lists.infradead.org, srv_heupstream@mediatek.com
Subject: Re: [PATCH 4/5] mtd: rawnand: mtk: Fix wrongly assigned oob buffer pointer issue
Date: Mon, 29 Apr 2019 17:52:15 +0800 [thread overview]
Message-ID: <1556531535.26455.44.camel@mhfsdcap03> (raw)
In-Reply-To: <20190429111425.0c91c2f3@xps13>
Hi Miquel,
On Mon, 2019-04-29 at 11:14 +0200, Miquel Raynal wrote:
> Hi Xiaolei,
>
> Xiaolei Li <xiaolei.li@mediatek.com> wrote on Mon, 29 Apr 2019 14:38:33
> +0800:
>
> > One main goal of the function mtk_nfc_update_ecc_stats is to check
> > whether sectors are all empty. If they are empty, set these sectors's
> > data buffer and oob buffer as 0xff.
> >
> > But now, the sector oob buffer pointer is wrongly assigned. We always
> > do memset from sector 0.
> >
> > To fix this issue, pass start secotr number to make oob buffer pointer
>
> sector
Thanks. Will change this typo.
>
> > be properly assigned.
>
> Please use upper case for plain English acronyms: NAND, ECC, OOB, etc.
OK.
>
> >
> > Fixes: 93db446a424c ("mtd: nand: move raw NAND related code to the raw/ subdir")
>
> Same comment as before, wrong commit pointed in the Fixes tag.
>
> > Signed-off-by: Xiaolei Li <xiaolei.li@mediatek.com>
> > ---
> > drivers/mtd/nand/raw/mtk_nand.c | 21 ++++++++++-----------
> > 1 file changed, 10 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
> > index 7a5e8c9cf61b..cf5e50e704ae 100644
> > --- a/drivers/mtd/nand/raw/mtk_nand.c
> > +++ b/drivers/mtd/nand/raw/mtk_nand.c
> > @@ -873,19 +873,21 @@ static int mtk_nfc_write_oob_std(struct nand_chip *chip, int page)
> > return mtk_nfc_write_page_raw(chip, NULL, 1, page);
> > }
> >
> > -static int mtk_nfc_update_ecc_stats(struct mtd_info *mtd, u8 *buf, u32 sectors)
> > +static int mtk_nfc_update_ecc_stats(struct mtd_info *mtd, u8 *buf, u32 start,
> > + u32 sectors)
> > {
> > struct nand_chip *chip = mtd_to_nand(mtd);
> > struct mtk_nfc *nfc = nand_get_controller_data(chip);
> > struct mtk_nfc_nand_chip *mtk_nand = to_mtk_nand(chip);
> > struct mtk_ecc_stats stats;
> > + u32 reg_size = mtk_nand->fdm.reg_size;
> > int rc, i;
> >
> > rc = nfi_readl(nfc, NFI_STA) & STA_EMP_PAGE;
> > if (rc) {
> > memset(buf, 0xff, sectors * chip->ecc.size);
> > for (i = 0; i < sectors; i++)
> > - memset(oob_ptr(chip, i), 0xff, mtk_nand->fdm.reg_size);
> > + memset(oob_ptr(chip, start + i), 0xff, reg_size);
> > return 0;
> > }
> >
> > @@ -905,7 +907,7 @@ static int mtk_nfc_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
> > u32 spare = mtk_nand->spare_per_sector;
> > u32 column, sectors, start, end, reg;
> > dma_addr_t addr;
> > - int bitflips;
> > + int bitflips = 0;
> > size_t len;
> > u8 *buf;
> > int rc;
> > @@ -972,14 +974,11 @@ static int mtk_nfc_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
> > if (rc < 0) {
> > dev_err(nfc->dev, "subpage done timeout\n");
> > bitflips = -EIO;
> > - } else {
> > - bitflips = 0;
> > - if (!raw) {
> > - rc = mtk_ecc_wait_done(nfc->ecc, ECC_DECODE);
> > - bitflips = rc < 0 ? -ETIMEDOUT :
> > - mtk_nfc_update_ecc_stats(mtd, buf, sectors);
> > - mtk_nfc_read_fdm(chip, start, sectors);
> > - }
> > + } else if (!raw) {
> > + rc = mtk_ecc_wait_done(nfc->ecc, ECC_DECODE);
> > + bitflips = rc < 0 ? -ETIMEDOUT :
> > + mtk_nfc_update_ecc_stats(mtd, buf, start, sectors);
> > + mtk_nfc_read_fdm(chip, start, sectors);
> > }
> >
> > dma_unmap_single(nfc->dev, addr, len, DMA_FROM_DEVICE);
>
> With this addressed:
>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
>
>
> Thanks,
> Miquèl
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-04-29 9:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 6:38 [PATCH 0/5] MTK NAND driver improvements and fixes Xiaolei Li
2019-04-29 6:38 ` [PATCH 1/5] mtd: rawnand: mtk: Correct low level time calculation of r/w cycle Xiaolei Li
2019-04-29 9:03 ` Miquel Raynal
2019-04-29 9:35 ` xiaolei li
2019-04-29 10:02 ` Miquel Raynal
2019-04-30 0:59 ` xiaolei li
2019-04-29 6:38 ` [PATCH 2/5] mtd: rawnand: mtk: Improve data sampling timing for read cycle Xiaolei Li
2019-04-29 9:10 ` Miquel Raynal
2019-04-29 9:49 ` xiaolei li
2019-04-29 6:38 ` [PATCH 3/5] mtd: rawnand: mtk: Add validity check for CE# pin setting Xiaolei Li
2019-04-29 9:11 ` Miquel Raynal
2019-04-29 6:38 ` [PATCH 4/5] mtd: rawnand: mtk: Fix wrongly assigned oob buffer pointer issue Xiaolei Li
2019-04-29 9:14 ` Miquel Raynal
2019-04-29 9:52 ` xiaolei li [this message]
2019-04-29 6:38 ` [PATCH 5/5] mtd: rawnand: mtk: Setup empty page threshold correctly Xiaolei Li
2019-04-29 9:22 ` Miquel Raynal
2019-04-29 9:57 ` xiaolei li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1556531535.26455.44.camel@mhfsdcap03 \
--to=xiaolei.li@mediatek.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=srv_heupstream@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).