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

Commit 6beb3ea7 authored by Tokunori Ikegami's avatar Tokunori Ikegami Committed by Vignesh Raghavendra
Browse files

mtd: cfi_cmdset_0002: Split wait for write buffer completion sequence 



Split wait for write completion from do_write_buffer() into separate
function.

Cc: Fabio Bettoni <fbettoni@gmail.com>
Co: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: default avatarTokunori Ikegami <ikegami.t@gmail.com>
[vigneshr@ti.com: Reword commit message]
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent 816a6d14

drivers/mtd/chips/cfi_cmdset_0002.c

+51 −41
Original line number Diff line number Diff line
@@ -1919,6 +1919,56 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, 
	return 0;

}



static int __xipram do_write_buffer_wait(struct map_info *map,

					 struct flchip *chip, unsigned long adr,

					 map_word datum)

{

	unsigned long timeo;

	unsigned long u_write_timeout;

	int ret = 0;



	/*

	 * Timeout is calculated according to CFI data, if available.

	 * See more comments in cfi_cmdset_0002().

	 */

	u_write_timeout = usecs_to_jiffies(chip->buffer_write_time_max);

	timeo = jiffies + u_write_timeout;



	for (;;) {

		if (chip->state != FL_WRITING) {

			/* Someone's suspended the write. Sleep */

			DECLARE_WAITQUEUE(wait, current);



			set_current_state(TASK_UNINTERRUPTIBLE);

			add_wait_queue(&chip->wq, &wait);

			mutex_unlock(&chip->mutex);

			schedule();

			remove_wait_queue(&chip->wq, &wait);

			timeo = jiffies + (HZ / 2); /* FIXME */

			mutex_lock(&chip->mutex);

			continue;

		}



		/*

		 * We check "time_after" and "!chip_good" before checking

		 * "chip_good" to avoid the failure due to scheduling.

		 */

		if (time_after(jiffies, timeo) &&

		    !chip_good(map, chip, adr, datum)) {

			ret = -EIO;

			break;

		}



		if (chip_good(map, chip, adr, datum))

			break;



		/* Latency issues. Drop the lock, wait a while and retry */

		UDELAY(map, chip, adr, 1);

	}



	return ret;

}



static void __xipram do_write_buffer_reset(struct map_info *map,

					   struct flchip *chip,

					   struct cfi_private *cfi)
@@ -1949,13 +1999,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 
				    int len)

{

	struct cfi_private *cfi = map->fldrv_priv;

	unsigned long timeo = jiffies + HZ;

	/*

	 * Timeout is calculated according to CFI data, if available.

	 * See more comments in cfi_cmdset_0002().

	 */

	unsigned long uWriteTimeout =

				usecs_to_jiffies(chip->buffer_write_time_max);

	int ret = -EIO;

	unsigned long cmd_adr;

	int z, words;
@@ -2012,40 +2055,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 
				adr, map_bankwidth(map),

				chip->word_write_time);



	timeo = jiffies + uWriteTimeout;



	for (;;) {

		if (chip->state != FL_WRITING) {

			/* Someone's suspended the write. Sleep */

			DECLARE_WAITQUEUE(wait, current);



			set_current_state(TASK_UNINTERRUPTIBLE);

			add_wait_queue(&chip->wq, &wait);

			mutex_unlock(&chip->mutex);

			schedule();

			remove_wait_queue(&chip->wq, &wait);

			timeo = jiffies + (HZ / 2); /* FIXME */

			mutex_lock(&chip->mutex);

			continue;

		}



		/*

		 * We check "time_after" and "!chip_good" before checking "chip_good" to avoid

		 * the failure due to scheduling.

		 */

		if (time_after(jiffies, timeo) &&

		    !chip_good(map, chip, adr, datum)) {

			ret = -EIO;

			break;

		}



		if (chip_good(map, chip, adr, datum))

			break;



		/* Latency issues. Drop the lock, wait a while and retry */

		UDELAY(map, chip, adr, 1);

	}



	ret = do_write_buffer_wait(map, chip, adr, datum);

	if (ret) {

		cfi_check_err_status(map, chip, adr);

		do_write_buffer_reset(map, chip, cfi);