Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mtd: rawnand: Deprecate ->block_{bad,markbad}() hooks 



Those hooks have been overloaded by some drivers for bad reasons:
either the driver was not fitting in the NAND framework and should
have been an MTD driver (docg4), or it was not properly implementing
the OOB read/write request or had a weird layout where BBM are trashed.
In any case, we should discourage people from overloading those
methods and encourage them to fix their driver instead.

Move the ->block_{bad,markbad}() hooks to the nand_legacy struct to
make it clear.

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

drivers/mtd/nand/raw/cafe_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static int cafe_nand_probe(struct pci_dev *pdev, 


	if (skipbbt) {

		cafe->nand.options |= NAND_SKIP_BBTSCAN;

		cafe->nand.block_bad = cafe_nand_block_bad;

		cafe->nand.legacy.block_bad = cafe_nand_block_bad;

	}



	if (numtimings && numtimings != 3) {

drivers/mtd/nand/raw/diskonchip.c

+1 −1
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ static int __init doc_probe(unsigned long physadr) 
	nand->legacy.cmd_ctrl		= doc200x_hwcontrol;

	nand->legacy.dev_ready	= doc200x_dev_ready;

	nand->legacy.waitfunc	= doc200x_wait;

	nand->block_bad		= doc200x_block_bad;

	nand->legacy.block_bad	= doc200x_block_bad;

	nand->ecc.hwctl		= doc200x_enable_hwecc;

	nand->ecc.calculate	= doc200x_calculate_ecc;

	nand->ecc.correct	= doc200x_correct_data;

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

+2 −2
Original line number Diff line number Diff line
@@ -1774,7 +1774,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(chip, byte);

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

			if (ret)

				dev_err(dev,

					"Failed to mark block bad with ret %d\n",
@@ -1908,7 +1908,7 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) 
	chip->legacy.read_buf	= gpmi_read_buf;

	chip->legacy.write_buf	= gpmi_write_buf;

	chip->badblock_pattern	= &gpmi_bbt_descr;

	chip->block_markbad	= gpmi_block_markbad;

	chip->legacy.block_markbad = gpmi_block_markbad;

	chip->options		|= NAND_NO_SUBPAGE_WRITE;



	/* Set up swap_block_mark, must be set before the gpmi_set_geometry() */

drivers/mtd/nand/raw/nand_base.c

+27 −10
Original line number Diff line number Diff line
@@ -475,6 +475,27 @@ static int nand_default_block_markbad(struct nand_chip *chip, loff_t ofs) 
	return ret;

}



/**

 * nand_markbad_bbm - mark a block by updating the BBM

 * @chip: NAND chip object

 * @ofs: offset of the block to mark bad

 */

int nand_markbad_bbm(struct nand_chip *chip, loff_t ofs)

{

	if (chip->legacy.block_markbad)

		return chip->legacy.block_markbad(chip, ofs);



	return nand_default_block_markbad(chip, ofs);

}



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

{

	if (chip->legacy.block_bad)

		return chip->legacy.block_bad(chip, ofs);



	return nand_block_bad(chip, ofs);

}



/**

 * nand_block_markbad_lowlevel - mark a block bad

 * @mtd: MTD device structure
@@ -482,7 +503,7 @@ static int nand_default_block_markbad(struct nand_chip *chip, loff_t ofs) 
 *

 * This function performs the generic NAND bad block marking steps (i.e., bad

 * block table(s) and/or marker(s)). We only allow the hardware driver to

 * specify how to write bad block markers to OOB (chip->block_markbad).

 * specify how to write bad block markers to OOB (chip->legacy.block_markbad).

 *

 * We try operations in the following order:

 *
@@ -510,7 +531,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(chip, ofs);

		ret = nand_markbad_bbm(chip, ofs);

		nand_release_device(mtd);

	}
@@ -582,11 +603,11 @@ 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(chip, ofs);



	/* Return info from the table */

	if (chip->bbt)

		return nand_isbad_bbt(chip, ofs, allowbbt);



	return nand_isbad_bbm(chip, ofs);

}



/**
@@ -4942,10 +4963,6 @@ static void nand_set_defaults(struct nand_chip *chip) 
	/* If called twice, pointers that depend on busw may need to be reset */

	if (!chip->legacy.read_byte || chip->legacy.read_byte == nand_read_byte)

		chip->legacy.read_byte = busw ? nand_read_byte16 : nand_read_byte;

	if (!chip->block_bad)

		chip->block_bad = nand_block_bad;

	if (!chip->block_markbad)

		chip->block_markbad = nand_default_block_markbad;

	if (!chip->legacy.write_buf || chip->legacy.write_buf == nand_write_buf)

		chip->legacy.write_buf = busw ? nand_write_buf16 : nand_write_buf;

	if (!chip->legacy.write_byte || chip->legacy.write_byte == nand_write_byte)

drivers/mtd/nand/raw/nand_bbt.c

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static void mark_bbt_block_bad(struct nand_chip *this, 
	bbt_mark_entry(this, block, BBT_BLOCK_WORN);



	to = (loff_t)block << this->bbt_erase_shift;

	res = this->block_markbad(this, to);

	res = nand_markbad_bbm(this, to);

	if (res)

		pr_warn("nand_bbt: error %d while marking block %d bad\n",

			res, block);