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

Commit 9aca334e authored by Maxim Levitsky's avatar Maxim Levitsky Committed by David Woodhouse
Browse files

mtd: nand: make MTD_OOB_PLACE work correctly. 



MTD_OOB_PLACE is supposed to read/write the raw oob data similiar to the 
MTD_OOB_RAW however due to a bug, currently it is not possible to read 
more data that is specified by the oob 'free' regions.

Signed-off-by: default avatarMaxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 49ef3c6e

drivers/mtd/nand/nand_base.c

+5 −1
Original line number Diff line number Diff line
@@ -1420,6 +1420,9 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, 
	int ret = 0;

	uint32_t readlen = ops->len;

	uint32_t oobreadlen = ops->ooblen;

	uint32_t max_oobsize = ops->mode == MTD_OOB_AUTO ?

		mtd->oobavail : mtd->oobsize;



	uint8_t *bufpoi, *oob, *buf;



	stats = mtd->ecc_stats;
@@ -1470,10 +1473,11 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, 
			buf += bytes;



			if (unlikely(oob)) {



				/* Raw mode does data:oob:data:oob */

				if (ops->mode != MTD_OOB_RAW) {

					int toread = min(oobreadlen,

						chip->ecc.layout->oobavail);

								max_oobsize);

					if (toread) {

						oob = nand_transfer_oob(chip,

							oob, ops, toread);