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

Commit 1f92267c authored by Vitaly Wool's avatar Vitaly Wool Committed by David Woodhouse
Browse files

[MTD] [NAND] make oobavail public 



During the MTD rework the oobavail parameter of mtd_info structure has become
private. This is not quite correct in terms of integrity and logic. If we have
means to write to OOB area, then we'd like to know upfront how many bytes out
of OOB are spare per page to be able to adapt to specific cases.
The patch inlined adds the public oobavail parameter.

Signed-off-by: default avatarVitaly Wool <vwool@ru.mvista.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent eee8abe5

drivers/mtd/mtdconcat.c

+1 −0
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c 
	concat->mtd.erasesize = subdev[0]->erasesize;

	concat->mtd.writesize = subdev[0]->writesize;

	concat->mtd.oobsize = subdev[0]->oobsize;

	concat->mtd.oobavail = subdev[0]->oobavail;

	if (subdev[0]->writev)

		concat->mtd.writev = concat_writev;

	if (subdev[0]->read_oob)

drivers/mtd/mtdpart.c

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ int add_mtd_partitions(struct mtd_info *master, 
		slave->mtd.size = parts[i].size;

		slave->mtd.writesize = master->writesize;

		slave->mtd.oobsize = master->oobsize;

		slave->mtd.oobavail = master->oobavail;

		slave->mtd.subpage_sft = master->subpage_sft;



		slave->mtd.name = parts[i].name;

drivers/mtd/nand/nand_base.c

+1 −0
Original line number Diff line number Diff line
@@ -2524,6 +2524,7 @@ int nand_scan_tail(struct mtd_info *mtd) 
	for (i = 0; chip->ecc.layout->oobfree[i].length; i++)

		chip->ecc.layout->oobavail +=

			chip->ecc.layout->oobfree[i].length;

	mtd->oobavail = chip->ecc.layout->oobavail;



	/*

	 * Set the number of read / write steps for one page depending on ECC

drivers/mtd/onenand/onenand_base.c

+1 −0
Original line number Diff line number Diff line
@@ -2367,6 +2367,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) 
	for (i = 0; this->ecclayout->oobfree[i].length; i++)

		this->ecclayout->oobavail +=

			this->ecclayout->oobfree[i].length;

	mtd->oobavail = this->ecclayout->oobavail;



	mtd->ecclayout = this->ecclayout;

include/linux/mtd/mtd.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct mtd_info { 
	u_int32_t writesize;



	u_int32_t oobsize;   // Amount of OOB data per block (e.g. 16)

	u_int32_t oobavail;  // Available OOB bytes per block



	// Kernel-only stuff starts here.

	char *name;