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

Commit ac6bfe41 authored by Tokunori Ikegami's avatar Tokunori Ikegami Committed by Greg Kroah-Hartman
Browse files

mtd: cfi_cmdset_0002: Change erase functions to check chip good only 



commit 79ca484b613041ca223f74b34608bb6f5221724b upstream.

Currently the functions use to check both chip ready and good.
But the chip ready is not enough to check the operation status.
So change this to check the chip good instead of this.
About the retry functions to make sure the error handling remain it.

Signed-off-by: default avatarTokunori Ikegami <ikegami@allied-telesis.co.jp>
Reviewed-by: default avatarJoakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Cc: linux-mtd@lists.infradead.org
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b76d8aa0

drivers/mtd/chips/cfi_cmdset_0002.c

+12 −10
Original line number Diff line number Diff line
@@ -2296,12 +2296,13 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip) 
			chip->erase_suspended = 0;

		}



		if (chip_ready(map, adr))

		if (chip_good(map, adr, map_word_ff(map)))

			break;



		if (time_after(jiffies, timeo)) {

			printk(KERN_WARNING "MTD %s(): software timeout\n",

				__func__ );

			ret = -EIO;

			break;

		}
@@ -2309,15 +2310,15 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip) 
		UDELAY(map, chip, adr, 1000000/HZ);

	}

	/* Did we succeed? */

	if (!chip_good(map, adr, map_word_ff(map))) {

	if (ret) {

		/* reset on all failures. */

		map_write( map, CMD(0xF0), chip->start );

		/* FIXME - should have reset delay before continuing */



		if (++retry_cnt <= MAX_RETRIES)

		if (++retry_cnt <= MAX_RETRIES) {

			ret = 0;

			goto retry;



		ret = -EIO;

		}

	}



	chip->state = FL_READY;
@@ -2391,7 +2392,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 
			chip->erase_suspended = 0;

		}



		if (chip_ready(map, adr)) {

		if (chip_good(map, adr, map_word_ff(map))) {

			xip_enable(map, chip, adr);

			break;

		}
@@ -2400,6 +2401,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 
			xip_enable(map, chip, adr);

			printk(KERN_WARNING "MTD %s(): software timeout\n",

				__func__ );

			ret = -EIO;

			break;

		}
@@ -2407,15 +2409,15 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 
		UDELAY(map, chip, adr, 1000000/HZ);

	}

	/* Did we succeed? */

	if (!chip_good(map, adr, map_word_ff(map))) {

	if (ret) {

		/* reset on all failures. */

		map_write( map, CMD(0xF0), chip->start );

		/* FIXME - should have reset delay before continuing */



		if (++retry_cnt <= MAX_RETRIES)

		if (++retry_cnt <= MAX_RETRIES) {

			ret = 0;

			goto retry;



		ret = -EIO;

		}

	}



	chip->state = FL_READY;