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

Commit 6534e680 authored by Bean Huo's avatar Bean Huo Committed by Brian Norris
Browse files

mtd: cfi_cmdset_0002: fix do_write_buffer() timeout error 



For some NOR flashes, the size of the buffer program has been increased
from 256 bytes to 512 bytes, and so 2ms maximum timeout can may not be
sufficient for all different vendor's NOR flash. There is maximum
timeout information in the CFI area, so we instead of picking a fixed
value, we can calculate this according to the standard CFI parameters
parsed at probe time. If we haven't probed this information, or it is
smaller than 2000us, then specify a minimum value 2000us.

Tested with Micron JS28F512M29EWx and Micron MT28EW512ABA flash devices.

Signed-off-by: default avatarBean Huo <beanhuo@outlook.com>
[Brian: fix up comments, use 'max()']
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent d68a5c3d

drivers/mtd/chips/cfi_cmdset_0002.c

+23 −2
Original line number Diff line number Diff line
@@ -645,6 +645,23 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
		cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp;

		cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;

		cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;

		/*

		 * First calculate the timeout max according to timeout field

		 * of struct cfi_ident that probed from chip's CFI aera, if

		 * available. Specify a minimum of 2000us, in case the CFI data

		 * is wrong.

		 */

		if (cfi->cfiq->BufWriteTimeoutTyp &&

		    cfi->cfiq->BufWriteTimeoutMax)

			cfi->chips[i].buffer_write_time_max =

				1 << (cfi->cfiq->BufWriteTimeoutTyp +

				      cfi->cfiq->BufWriteTimeoutMax);

		else

			cfi->chips[i].buffer_write_time_max = 0;



		cfi->chips[i].buffer_write_time_max =

			max(cfi->chips[i].buffer_write_time_max, 2000);



		cfi->chips[i].ref_point_counter = 0;

		init_waitqueue_head(&(cfi->chips[i].wq));

	}
@@ -1774,8 +1791,12 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 
{

	struct cfi_private *cfi = map->fldrv_priv;

	unsigned long timeo = jiffies + HZ;

	/* see comments in do_write_oneword() regarding uWriteTimeo. */

	unsigned long uWriteTimeout = ( HZ / 1000 ) + 1;

	/*

	 * 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;