Commit 9f3e0429 authored by Archit Taneja's avatar Archit Taneja Committed by Brian Norris
Browse files

mtd: nand: don't select chip in nand_chip's block_bad op 



One of the arguments passed to struct nand_chip's block_bad op is
'getchip', which, if true, is supposed to get and select the nand device,
and later unselect and release the device.

This op is intended to be replaceable by drivers. The drivers shouldn't
be responsible for selecting/unselecting chip. Like other ops, the chip
should already be selected before the block_bad op is called.

Remove the getchip argument from the block_bad op and
nand_block_checkbad. Move the chip selection to nand_block_isbad, since it
is the only caller to nand_block_checkbad which requires chip selection.

Modify nand_block_bad (the default function for the op) such that it
doesn't select the chip.

Remove the getchip argument from the bad_block funcs in cafe_nand,
diskonchip and docg4 drivers.

Reviewed-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 9648388f

drivers/mtd/nand/cafe_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static int cafe_nand_write_page_lowlevel(struct mtd_info *mtd, 
	return 0;

}



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

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

{

	return 0;

}

drivers/mtd/nand/diskonchip.c

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

}



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

static int doc200x_block_bad(struct mtd_info *mtd, 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/docg4.c

+1 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,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, int getchip)

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

{

	/* only called when module_param ignore_badblocks is set */

	return 0;

drivers/mtd/nand/nand_base.c

+19 −22
Original line number Diff line number Diff line
@@ -317,9 +317,9 @@ static void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len) 
 *

 * Check, if the block is bad.

 */

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

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

{

	int page, chipnr, res = 0, i = 0;

	int page, res = 0, i = 0;

	struct nand_chip *chip = mtd_to_nand(mtd);

	u16 bad;
@@ -328,15 +328,6 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip) 


	page = (int)(ofs >> chip->page_shift) & chip->pagemask;



	if (getchip) {

		chipnr = (int)(ofs >> chip->chip_shift);



		nand_get_device(mtd, FL_READING);



		/* Select the NAND device */

		chip->select_chip(mtd, chipnr);

	}



	do {

		if (chip->options & NAND_BUSWIDTH_16) {

			chip->cmdfunc(mtd, NAND_CMD_READOOB,
@@ -361,11 +352,6 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip) 
		i++;

	} while (!res && i < 2 && (chip->bbt_options & NAND_BBT_SCAN2NDPAGE));



	if (getchip) {

		chip->select_chip(mtd, -1);

		nand_release_device(mtd);

	}



	return res;

}
@@ -503,19 +489,17 @@ static int nand_block_isreserved(struct mtd_info *mtd, loff_t ofs) 
 * nand_block_checkbad - [GENERIC] Check if a block is marked bad

 * @mtd: MTD device structure

 * @ofs: offset from device start

 * @getchip: 0, if the chip is already selected

 * @allowbbt: 1, if its allowed to access the bbt area

 *

 * Check, if the block is bad. Either by reading the bad block table or

 * calling of the scan function.

 */

static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,

			       int allowbbt)

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, getchip);

		return chip->block_bad(mtd, ofs);



	/* Return info from the table */

	return nand_isbad_bbt(mtd, ofs, allowbbt);
@@ -2949,7 +2933,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, 
	while (len) {

		/* Check if we have a bad block, we do not erase bad blocks! */

		if (nand_block_checkbad(mtd, ((loff_t) page) <<

					chip->page_shift, 0, allowbbt)) {

					chip->page_shift, allowbbt)) {

			pr_warn("%s: attempt to erase a bad block at page 0x%08x\n",

				    __func__, page);

			instr->state = MTD_ERASE_FAILED;
@@ -3036,7 +3020,20 @@ static void nand_sync(struct mtd_info *mtd) 
 */

static int nand_block_isbad(struct mtd_info *mtd, loff_t offs)

{

	return nand_block_checkbad(mtd, offs, 1, 0);

	struct nand_chip *chip = mtd_to_nand(mtd);

	int chipnr = (int)(offs >> chip->chip_shift);

	int ret;



	/* Select the NAND device */

	nand_get_device(mtd, FL_READING);

	chip->select_chip(mtd, chipnr);



	ret = nand_block_checkbad(mtd, offs, 0);



	chip->select_chip(mtd, -1);

	nand_release_device(mtd);



	return ret;

}



/**

include/linux/mtd/nand.h

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ struct nand_chip { 
	void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);

	void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);

	void (*select_chip)(struct mtd_info *mtd, int chip);

	int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip);

	int (*block_bad)(struct mtd_info *mtd, loff_t ofs);

	int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);

	void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl);

	int (*dev_ready)(struct mtd_info *mtd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE