Commit c17556f5 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Pass a nand_chip object to chip->block_xxx() hooks 



Let's make the raw NAND API consistent by patching all helpers and
hooks to take a nand_chip object instead of an mtd_info one or
remove the mtd_info object when both are passed.

Let's tackle all chip->block_xxx() hooks at once.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 758b56f5

drivers/mtd/nand/raw/cafe_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static int cafe_nand_write_page_lowlevel(struct nand_chip *chip, 
	return nand_prog_page_end_op(chip);

}



static int cafe_nand_block_bad(struct mtd_info *mtd, loff_t ofs)

static int cafe_nand_block_bad(struct nand_chip *chip, loff_t ofs)

{

	return 0;

}

drivers/mtd/nand/raw/diskonchip.c

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static int doc200x_dev_ready(struct mtd_info *mtd) 
	}

}



static int doc200x_block_bad(struct mtd_info *mtd, loff_t ofs)

static int doc200x_block_bad(struct nand_chip *this, loff_t ofs)

{

	/* This is our last resort if we couldn't find or create a BBT.  Just

	   pretend all blocks are good. */

drivers/mtd/nand/raw/docg4.c

+3 −3
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ static int __init read_factory_bbt(struct mtd_info *mtd) 
	return 0;

}



static int docg4_block_markbad(struct mtd_info *mtd, loff_t ofs)

static int docg4_block_markbad(struct nand_chip *nand, loff_t ofs)

{

	/*

	 * Mark a block as bad.  Bad blocks are marked in the oob area of the
@@ -1115,7 +1115,7 @@ static int docg4_block_markbad(struct mtd_info *mtd, loff_t ofs) 


	int ret, i;

	uint8_t *buf;

	struct nand_chip *nand = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(nand);

	struct docg4_priv *doc = nand_get_controller_data(nand);

	struct nand_bbt_descr *bbtd = nand->badblock_pattern;

	int page = (int)(ofs >> nand->page_shift);
@@ -1147,7 +1147,7 @@ static int docg4_block_markbad(struct mtd_info *mtd, loff_t ofs) 
	return ret;

}



static int docg4_block_neverbad(struct mtd_info *mtd, loff_t ofs)

static int docg4_block_neverbad(struct nand_chip *nand, loff_t ofs)

{

	/* only called when module_param ignore_badblocks is set */

	return 0;

drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

+3 −3
Original line number Diff line number Diff line
@@ -1542,9 +1542,9 @@ static int gpmi_ecc_write_oob_raw(struct nand_chip *chip, int page) 
	return gpmi_ecc_write_page_raw(chip, NULL, 1, page);

}



static int gpmi_block_markbad(struct mtd_info *mtd, loff_t ofs)

static int gpmi_block_markbad(struct nand_chip *chip, loff_t ofs)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct gpmi_nand_data *this = nand_get_controller_data(chip);

	int ret = 0;

	uint8_t *block_mark;
@@ -1776,7 +1776,7 @@ static int mx23_boot_init(struct gpmi_nand_data *this) 
		 */

		if (block_mark != 0xff) {

			dev_dbg(dev, "Transcribing mark in block %u\n", block);

			ret = chip->block_markbad(mtd, byte);

			ret = chip->block_markbad(chip, byte);

			if (ret)

				dev_err(dev,

					"Failed to mark block bad with ret %d\n",

drivers/mtd/nand/raw/nand_base.c

+8 −8
Original line number Diff line number Diff line
@@ -398,15 +398,15 @@ static void nand_read_buf16(struct nand_chip *chip, uint8_t *buf, int len) 


/**

 * nand_block_bad - [DEFAULT] Read bad block marker from the chip

 * @mtd: MTD device structure

 * @chip: NAND chip object

 * @ofs: offset from device start

 *

 * Check, if the block is bad.

 */

static int nand_block_bad(struct mtd_info *mtd, loff_t ofs)

static int nand_block_bad(struct nand_chip *chip, loff_t ofs)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	int page, page_end, res;

	struct nand_chip *chip = mtd_to_nand(mtd);

	u8 bad;



	if (chip->bbt_options & NAND_BBT_SCANLASTPAGE)
@@ -435,16 +435,16 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs) 


/**

 * nand_default_block_markbad - [DEFAULT] mark a block bad via bad block marker

 * @mtd: MTD device structure

 * @chip: NAND chip object

 * @ofs: offset from device start

 *

 * This is the default implementation, which can be overridden by a hardware

 * specific driver. It provides the details for writing a bad block marker to a

 * block.

 */

static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)

static int nand_default_block_markbad(struct nand_chip *chip, loff_t ofs)

{

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct mtd_oob_ops ops;

	uint8_t buf[2] = { 0, 0 };

	int ret = 0, res, i = 0;
@@ -510,7 +510,7 @@ static int nand_block_markbad_lowlevel(struct mtd_info *mtd, loff_t ofs) 


		/* Write bad block marker to OOB */

		nand_get_device(mtd, FL_WRITING);

		ret = chip->block_markbad(mtd, ofs);

		ret = chip->block_markbad(chip, ofs);

		nand_release_device(mtd);

	}
@@ -583,7 +583,7 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int allowbbt) 
	struct nand_chip *chip = mtd_to_nand(mtd);



	if (!chip->bbt)

		return chip->block_bad(mtd, ofs);

		return chip->block_bad(chip, ofs);



	/* Return info from the table */

	return nand_isbad_bbt(mtd, ofs, allowbbt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE