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

Commit 5cbad9e3 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: nandsim: convert driver to nand_scan() 



Two helpers have been added to the core to do all kind of controller
side configuration/initialization between the detection phase and the
final NAND scan. Implement these hooks so that we can convert the driver
to just use nand_scan() instead of the nand_scan_ident() +
nand_scan_tail() pair.

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

drivers/mtd/nand/raw/nandsim.c

+45 −37
Original line number Diff line number Diff line
@@ -2192,6 +2192,48 @@ static void ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) 
	return;

}



static int ns_attach_chip(struct nand_chip *chip)

{

	unsigned int eccsteps, eccbytes;



	if (!bch)

		return 0;



	if (!mtd_nand_has_bch()) {

		NS_ERR("BCH ECC support is disabled\n");

		return -EINVAL;

	}



	/* Use 512-byte ecc blocks */

	eccsteps = nsmtd->writesize / 512;

	eccbytes = ((bch * 13) + 7) / 8;



	/* Do not bother supporting small page devices */

	if (nsmtd->oobsize < 64 || !eccsteps) {

		NS_ERR("BCH not available on small page devices\n");

		return -EINVAL;

	}



	if (((eccbytes * eccsteps) + 2) > nsmtd->oobsize) {

		NS_ERR("Invalid BCH value %u\n", bch);

		return -EINVAL;

	}



	chip->ecc.mode = NAND_ECC_SOFT;

	chip->ecc.algo = NAND_ECC_BCH;

	chip->ecc.size = 512;

	chip->ecc.strength = bch;

	chip->ecc.bytes = eccbytes;



	NS_INFO("Using %u-bit/%u bytes BCH ECC\n", bch, chip->ecc.size);



	return 0;

}



static const struct nand_controller_ops ns_controller_ops = {

	.attach_chip = ns_attach_chip,

};



/*

 * Module initialization function

 */
@@ -2276,44 +2318,10 @@ static int __init ns_init_module(void) 
	if ((retval = parse_gravepages()) != 0)

		goto error;



	retval = nand_scan_ident(nsmtd, 1, NULL);

	if (retval) {

		NS_ERR("cannot scan NAND Simulator device\n");

		goto error;

	}



	if (bch) {

		unsigned int eccsteps, eccbytes;

		if (!mtd_nand_has_bch()) {

			NS_ERR("BCH ECC support is disabled\n");

			retval = -EINVAL;

			goto error;

		}

		/* use 512-byte ecc blocks */

		eccsteps = nsmtd->writesize/512;

		eccbytes = (bch*13+7)/8;

		/* do not bother supporting small page devices */

		if ((nsmtd->oobsize < 64) || !eccsteps) {

			NS_ERR("bch not available on small page devices\n");

			retval = -EINVAL;

			goto error;

		}

		if ((eccbytes*eccsteps+2) > nsmtd->oobsize) {

			NS_ERR("invalid bch value %u\n", bch);

			retval = -EINVAL;

			goto error;

		}

		chip->ecc.mode = NAND_ECC_SOFT;

		chip->ecc.algo = NAND_ECC_BCH;

		chip->ecc.size = 512;

		chip->ecc.strength = bch;

		chip->ecc.bytes = eccbytes;

		NS_INFO("using %u-bit/%u bytes BCH ECC\n", bch, chip->ecc.size);

	}



	retval = nand_scan_tail(nsmtd);

	chip->dummy_controller.ops = &ns_controller_ops;

	retval = nand_scan(nsmtd, 1);

	if (retval) {

		NS_ERR("can't register NAND Simulator\n");

		NS_ERR("Could not scan NAND Simulator device\n");

		goto error;

	}