Commit e4aacaa1 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: davinci: switch to mtd_ooblayout_ops 



Implementing the mtd_ooblayout_ops interface is the new way of exposing
ECC/OOB layout to MTD users.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent a8ed6e66

drivers/mtd/nand/davinci_nand.c

+44 −74
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
 */

struct davinci_nand_info {

	struct nand_chip	chip;

	struct nand_ecclayout	ecclayout;



	struct device		*dev;

	struct clk		*clk;
@@ -480,63 +479,46 @@ static int nand_davinci_dev_ready(struct mtd_info *mtd) 
 * ten ECC bytes plus the manufacturer's bad block marker byte, and

 * and not overlapping the default BBT markers.

 */

static struct nand_ecclayout hwecc4_small = {

	.eccbytes = 10,

	.eccpos = { 0, 1, 2, 3, 4,

		/* offset 5 holds the badblock marker */

		6, 7,

		13, 14, 15, },

	.oobfree = {

		{.offset = 8, .length = 5, },

		{.offset = 16, },

	},

};

static int hwecc4_ooblayout_small_ecc(struct mtd_info *mtd, int section,

				      struct mtd_oob_region *oobregion)

{

	if (section > 2)

		return -ERANGE;



	if (!section) {

		oobregion->offset = 0;

		oobregion->length = 5;

	} else if (section == 1) {

		oobregion->offset = 6;

		oobregion->length = 2;

	} else {

		oobregion->offset = 13;

		oobregion->length = 3;

	}



/* An ECC layout for using 4-bit ECC with large-page (2048bytes) flash,

 * storing ten ECC bytes plus the manufacturer's bad block marker byte,

 * and not overlapping the default BBT markers.

 */

static struct nand_ecclayout hwecc4_2048 = {

	.eccbytes = 40,

	.eccpos = {

		/* at the end of spare sector */

		24, 25, 26, 27, 28, 29,	30, 31, 32, 33,

		34, 35, 36, 37, 38, 39,	40, 41, 42, 43,

		44, 45, 46, 47, 48, 49, 50, 51, 52, 53,

		54, 55, 56, 57, 58, 59, 60, 61, 62, 63,

		},

	.oobfree = {

		/* 2 bytes at offset 0 hold manufacturer badblock markers */

		{.offset = 2, .length = 22, },

		/* 5 bytes at offset 8 hold BBT markers */

		/* 8 bytes at offset 16 hold JFFS2 clean markers */

	},

};

	return 0;

}



/*

 * An ECC layout for using 4-bit ECC with large-page (4096bytes) flash,

 * storing ten ECC bytes plus the manufacturer's bad block marker byte,

 * and not overlapping the default BBT markers.

 */

static struct nand_ecclayout hwecc4_4096 = {

	.eccbytes = 80,

	.eccpos = {

		/* at the end of spare sector */

		48, 49, 50, 51, 52, 53, 54, 55, 56, 57,

		58, 59, 60, 61, 62, 63, 64, 65, 66, 67,

		68, 69, 70, 71, 72, 73, 74, 75, 76, 77,

		78, 79, 80, 81, 82, 83, 84, 85, 86, 87,

		88, 89, 90, 91, 92, 93, 94, 95, 96, 97,

		98, 99, 100, 101, 102, 103, 104, 105, 106, 107,

		108, 109, 110, 111, 112, 113, 114, 115, 116, 117,

		118, 119, 120, 121, 122, 123, 124, 125, 126, 127,

	},

	.oobfree = {

		/* 2 bytes at offset 0 hold manufacturer badblock markers */

		{.offset = 2, .length = 46, },

		/* 5 bytes at offset 8 hold BBT markers */

		/* 8 bytes at offset 16 hold JFFS2 clean markers */

	},

static int hwecc4_ooblayout_small_free(struct mtd_info *mtd, int section,

				       struct mtd_oob_region *oobregion)

{

	if (section > 1)

		return -ERANGE;



	if (!section) {

		oobregion->offset = 8;

		oobregion->length = 5;

	} else {

		oobregion->offset = 16;

		oobregion->length = mtd->oobsize - 16;

	}



	return 0;

}



static const struct mtd_ooblayout_ops hwecc4_small_ooblayout_ops = {

	.ecc = hwecc4_ooblayout_small_ecc,

	.free = hwecc4_ooblayout_small_free,

};



#if defined(CONFIG_OF)
@@ -805,26 +787,14 @@ static int nand_davinci_probe(struct platform_device *pdev) 
		 * table marker fits in the free bytes.

		 */

		if (chunks == 1) {

			info->ecclayout = hwecc4_small;

			info->ecclayout.oobfree[1].length = mtd->oobsize - 16;

			goto syndrome_done;

		}

		if (chunks == 4) {

			info->ecclayout = hwecc4_2048;

			info->chip.ecc.mode = NAND_ECC_HW_OOB_FIRST;

			goto syndrome_done;

		}

		if (chunks == 8) {

			info->ecclayout = hwecc4_4096;

			mtd_set_ooblayout(mtd, &hwecc4_small_ooblayout_ops);

		} else if (chunks == 4 || chunks == 8) {

			mtd_set_ooblayout(mtd, &nand_ooblayout_lp_ops);

			info->chip.ecc.mode = NAND_ECC_HW_OOB_FIRST;

			goto syndrome_done;

		}



		} else {

			ret = -EIO;

			goto err;



syndrome_done:

		info->chip.ecc.layout = &info->ecclayout;

		}

	}



	ret = nand_scan_tail(mtd);