lkml.org 
[lkml]   [2016]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v2 6/7] mtd: nand: raw: make BBT code more generic
Hi Boris,

I found a bug during my review. Please see below.

On Sun, Oct 16, 2016 at 10:35 PM, Boris Brezillon
<boris.brezillon@free-electrons.com> wrote:
> BBT support is currently tightly tied to raw NAND, though this is the kind
> of code we could share across all NAND based devices, no matter what
> physical interface is to communicate with the NAND chip.
>
> Make BBT code interface agnostic by replacing all occurrence of
> struct nand_chip by struct nand_device, and move functions that are
> specific to raw NANDs to drivers/mtd/nand/rawnand/nand_base.c.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> drivers/mtd/nand/raw/nand_base.c | 78 ++++-
> drivers/mtd/nand/raw/nand_bbt.c | 609 ++++++++++++++++++---------------------
> include/linux/mtd/nand.h | 8 +
> include/linux/mtd/rawnand.h | 4 -
> 4 files changed, 361 insertions(+), 338 deletions(-)
>
[...]
> /**
> * write_bbt - [GENERIC] (Re)write the bad block table
> - * @mtd: MTD device structure
> + * @this: NAND device
> * @buf: temporary buffer
> * @td: descriptor for the bad block table
> * @md: descriptor for the bad block table mirror
> @@ -708,11 +707,11 @@ static void mark_bbt_block_bad(struct nand_chip *this,
> *
> * (Re)write the bad block table.
> */
> -static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
> +static int write_bbt(struct nand_device *this, uint8_t *buf,
> struct nand_bbt_descr *td, struct nand_bbt_descr *md,
> int chipsel)
> {
> - struct nand_chip *this = mtd_to_nandc(mtd);
> + struct mtd_info *mtd = nand_to_mtd(this);
> struct erase_info einfo;
> int i, res, chip = 0;
> int bits, page, offs, numblocks, sft, sftmsk;
> @@ -723,7 +722,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
> loff_t to;
> struct mtd_oob_ops ops;
>
> - ops.ooblen = mtd->oobsize;
> + ops.ooblen = nand_per_page_oobsize(this);
> ops.ooboffs = 0;
> ops.datbuf = NULL;
> ops.mode = MTD_OPS_PLACE_OOB;
> @@ -732,16 +731,16 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
> rcode = 0xff;
> /* Write bad block table per chip rather than per device? */
> if (td->options & NAND_BBT_PERCHIP) {
> - numblocks = (int)(this->chipsize >> this->bbt_erase_shift);
> + numblocks = nand_eraseblocks_per_die(this);
> /* Full device write or specific chip? */
> if (chipsel == -1) {
> - nrchips = this->numchips;
> + nrchips = nand_ndies(this);
> } else {
> nrchips = chipsel + 1;
> chip = chipsel;
> }
> } else {
> - numblocks = (int)(mtd->size >> this->bbt_erase_shift);
> + numblocks = nand_neraseblocks(this);
> nrchips = 1;
> }
>
> @@ -760,7 +759,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
> * get_bbt_block() returns a block number, shift the value to
> * get a page number.
> */
> - page = block << (this->bbt_erase_shift - this->page_shift);
> + nand_eraseblock_to_page(this, block);

Should be page = nand_eraseblock_to_page(this, block);

I will continue to review and test your patch. Hope give you feedback this week.

Thanks,
Peter Pan

\
 
 \ /
  Last update: 2016-11-16 09:44    [W:0.101 / U:1.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site