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

Commit 29f1058a authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

mtd: create an mtd_oobavail() helper and make use of it 



Currently, all MTD drivers/sublayers exposing an OOB area are
doing the same kind of test to extract the available OOB size
based on the mtd_info and mtd_oob_ops structures.
Move this common logic into an inline function and make use of it.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Suggested-by: default avatarPriit Laes <plaes@plaes.org>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent f5b8aa78

drivers/mtd/mtdpart.c

+1 −4
Original line number Diff line number Diff line
@@ -126,10 +126,7 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from, 
	if (ops->oobbuf) {

		size_t len, pages;



		if (ops->mode == MTD_OPS_AUTO_OOB)

			len = mtd->oobavail;

		else

			len = mtd->oobsize;

		len = mtd_oobavail(mtd, ops);

		pages = mtd_div_by_ws(mtd->size, mtd);

		pages -= mtd_div_by_ws(from, mtd);

		if (ops->ooboffs + ops->ooblen > pages * len)

drivers/mtd/nand/nand_base.c

+4 −12
Original line number Diff line number Diff line
@@ -1723,8 +1723,7 @@ 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_OPS_AUTO_OOB ?

		mtd->oobavail : mtd->oobsize;

	uint32_t max_oobsize = mtd_oobavail(mtd, ops);



	uint8_t *bufpoi, *oob, *buf;

	int use_bufpoi;
@@ -2075,10 +2074,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from, 


	stats = mtd->ecc_stats;



	if (ops->mode == MTD_OPS_AUTO_OOB)

		len = mtd->oobavail;

	else

		len = mtd->oobsize;

	len = mtd_oobavail(mtd, ops);



	if (unlikely(ops->ooboffs >= len)) {

		pr_debug("%s: attempt to start read outside oob\n",
@@ -2575,8 +2571,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, 
	uint32_t writelen = ops->len;



	uint32_t oobwritelen = ops->ooblen;

	uint32_t oobmaxlen = ops->mode == MTD_OPS_AUTO_OOB ?

				mtd->oobavail : mtd->oobsize;

	uint32_t oobmaxlen = mtd_oobavail(mtd, ops);



	uint8_t *oob = ops->oobbuf;

	uint8_t *buf = ops->datbuf;
@@ -2766,10 +2761,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, 
	pr_debug("%s: to = 0x%08x, len = %i\n",

			 __func__, (unsigned int)to, (int)ops->ooblen);



	if (ops->mode == MTD_OPS_AUTO_OOB)

		len = mtd->oobavail;

	else

		len = mtd->oobsize;

	len = mtd_oobavail(mtd, ops);



	/* Do not allow write past end of page */

	if ((ops->ooboffs + ops->ooblen) > len) {

drivers/mtd/onenand/onenand_base.c

+3 −16
Original line number Diff line number Diff line
@@ -1124,11 +1124,7 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from, 
	pr_debug("%s: from = 0x%08x, len = %i\n", __func__, (unsigned int)from,

			(int)len);



	if (ops->mode == MTD_OPS_AUTO_OOB)

		oobsize = mtd->oobavail;

	else

		oobsize = mtd->oobsize;



	oobsize = mtd_oobavail(mtd, ops);

	oobcolumn = from & (mtd->oobsize - 1);



	/* Do not allow reads past end of device */
@@ -1229,11 +1225,7 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, 
	pr_debug("%s: from = 0x%08x, len = %i\n", __func__, (unsigned int)from,

			(int)len);



	if (ops->mode == MTD_OPS_AUTO_OOB)

		oobsize = mtd->oobavail;

	else

		oobsize = mtd->oobsize;



	oobsize = mtd_oobavail(mtd, ops);

	oobcolumn = from & (mtd->oobsize - 1);



	/* Do not allow reads past end of device */
@@ -1885,12 +1877,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to, 
	/* Check zero length */

	if (!len)

		return 0;



	if (ops->mode == MTD_OPS_AUTO_OOB)

		oobsize = mtd->oobavail;

	else

		oobsize = mtd->oobsize;



	oobsize = mtd_oobavail(mtd, ops);

	oobcolumn = to & (mtd->oobsize - 1);



	column = to & (mtd->writesize - 1);

include/linux/mtd/mtd.h

+5 −0
Original line number Diff line number Diff line
@@ -264,6 +264,11 @@ static inline struct device_node *mtd_get_of_node(struct mtd_info *mtd) 
	return mtd->dev.of_node;

}



static inline int mtd_oobavail(struct mtd_info *mtd, struct mtd_oob_ops *ops)

{

	return ops->mode == MTD_OPS_AUTO_OOB ? mtd->oobavail : mtd->oobsize;

}



int mtd_erase(struct mtd_info *mtd, struct erase_info *instr);

int mtd_point(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen,

	      void **virt, resource_size_t *phys);