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

Commit 6fe5a6ac authored by Vimal Singh's avatar Vimal Singh Committed by David Woodhouse
Browse files

mtd: nand: create a helper verification function 



... verification for 'nand_erase_nand'

These checks are expected to be used by 'nand_lock' and 'nand_unlock'
routines too. As all these three are block aligned operations.
So, creating a helper function for this makes sense.

Signed-off-by: default avatarVimal Singh <vimalsingh@ti.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 91f80266

drivers/mtd/nand/nand_base.c

+30 −18
Original line number Diff line number Diff line
@@ -108,6 +108,35 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, 
 */

DEFINE_LED_TRIGGER(nand_led_trigger);



static int check_offs_len(struct mtd_info *mtd,

					loff_t ofs, uint64_t len)

{

	struct nand_chip *chip = mtd->priv;

	int ret = 0;



	/* Start address must align on block boundary */

	if (ofs & ((1 << chip->phys_erase_shift) - 1)) {

		DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__);

		ret = -EINVAL;

	}



	/* Length must align on block boundary */

	if (len & ((1 << chip->phys_erase_shift) - 1)) {

		DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n",

					__func__);

		ret = -EINVAL;

	}



	/* Do not allow past end of device */

	if (ofs + len > mtd->size) {

		DEBUG(MTD_DEBUG_LEVEL0, "%s: Past end of device\n",

					__func__);

		ret = -EINVAL;

	}



	return ret;

}



/**

 * nand_release_device - [GENERIC] release chip

 * @mtd:	MTD device structure
@@ -2293,25 +2322,8 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, 
				__func__, (unsigned long long)instr->addr,

				(unsigned long long)instr->len);



	/* Start address must align on block boundary */

	if (instr->addr & ((1 << chip->phys_erase_shift) - 1)) {

		DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__);

		return -EINVAL;

	}



	/* Length must align on block boundary */

	if (instr->len & ((1 << chip->phys_erase_shift) - 1)) {

		DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n",

					__func__);

		return -EINVAL;

	}



	/* Do not allow erase past end of device */

	if ((instr->len + instr->addr) > mtd->size) {

		DEBUG(MTD_DEBUG_LEVEL0, "%s: Erase past end of device\n",

					__func__);

	if (check_offs_len(mtd, instr->addr, instr->len))

		return -EINVAL;

	}



	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;