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

Commit 8afbc114 authored by Adrian Hunter's avatar Adrian Hunter Committed by David Woodhouse
Browse files

[MTD] [NAND] OMAP2: add retry after read timeout 



Very occasionally, (about one in a million) read operations are
ongoing after the timeout has expired.  So, retry three times
while the ongoing bit remains set.

Signed-off-by: default avatarAdrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 34f6e157

drivers/mtd/onenand/omap2.c

+23 −3
Original line number Diff line number Diff line
@@ -187,16 +187,36 @@ static int omap2_onenand_wait(struct mtd_info *mtd, int state) 
			}

		}

	} else {

		int retry_cnt = 0;



		/* Turn interrupts off */

		syscfg = read_reg(c, ONENAND_REG_SYS_CFG1);

		syscfg &= ~ONENAND_SYS_CFG1_IOBE;

		write_reg(c, syscfg, ONENAND_REG_SYS_CFG1);



		timeout = jiffies + msecs_to_jiffies(20);

		while (time_before(jiffies, timeout)) {

		while (1) {

			if (time_before(jiffies, timeout)) {

				intr = read_reg(c, ONENAND_REG_INTERRUPT);

				if (intr & ONENAND_INT_MASTER)

					break;

			} else {

				/* Timeout after 20ms */

				ctrl = read_reg(c, ONENAND_REG_CTRL_STATUS);

				if (ctrl & ONENAND_CTRL_ONGO) {

					/*

					 * The operation seems to be still going

					 * so give it some more time.

					 */

					retry_cnt += 1;

					if (retry_cnt < 3) {

						timeout = jiffies +

							  msecs_to_jiffies(20);

						continue;

					}

				}

				break;

			}

		}

	}