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

Commit ebe8a642 authored by Kyungmin Park's avatar Kyungmin Park Committed by David Woodhouse
Browse files

mtd: OneNAND: S5PC110: Add timeout to prevent the endless loop 



There's no case timeout but add it for some H/W problem or
wrong codes implementation

Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 12a40a57

drivers/mtd/onenand/samsung.c

+10 −1
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ static int s5pc110_dma_ops(void *dst, void *src, size_t count, int direction) 
{

	void __iomem *base = onenand->dma_addr;

	int status;

	unsigned long timeout;



	writel(src, base + S5PC110_DMA_SRC_ADDR);

	writel(dst, base + S5PC110_DMA_DST_ADDR);
@@ -552,6 +553,13 @@ static int s5pc110_dma_ops(void *dst, void *src, size_t count, int direction) 


	writel(S5PC110_DMA_TRANS_CMD_TR, base + S5PC110_DMA_TRANS_CMD);



	/*

	 * There's no exact timeout values at Spec.

	 * In real case it takes under 1 msec.

	 * So 20 msecs are enough.

	 */

	timeout = jiffies + msecs_to_jiffies(20);



	do {

		status = readl(base + S5PC110_DMA_TRANS_STATUS);

		if (status & S5PC110_DMA_TRANS_STATUS_TE) {
@@ -559,7 +567,8 @@ static int s5pc110_dma_ops(void *dst, void *src, size_t count, int direction) 
					base + S5PC110_DMA_TRANS_CMD);

			return -EIO;

		}

	} while (!(status & S5PC110_DMA_TRANS_STATUS_TD));

	} while (!(status & S5PC110_DMA_TRANS_STATUS_TD) &&

		time_before(jiffies, timeout));



	writel(S5PC110_DMA_TRANS_CMD_TDC, base + S5PC110_DMA_TRANS_CMD);