From 43c13af427d6900c7ce0111c53d3a428146b3f50 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 28 Jul 2013 18:02:06 +0200 Subject: [PATCH 17/34] MTD: lantiq: xway: remove endless loop The reset loop logic could run into a endless loop. Lets fix it as requested. --> http://lists.infradead.org/pipermail/linux-mtd/2012-September/044240.html Signed-off-by: John Crispin --- drivers/mtd/nand/xway_nand.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c index 7f2bdd1..8d14f1b 100644 --- a/drivers/mtd/nand/xway_nand.c +++ b/drivers/mtd/nand/xway_nand.c @@ -59,16 +59,22 @@ static u32 xway_latchcmd; static void xway_reset_chip(struct nand_chip *chip) { unsigned long nandaddr = (unsigned long) chip->IO_ADDR_W; + unsigned long timeout; unsigned long flags; nandaddr &= ~NAND_WRITE_ADDR; nandaddr |= NAND_WRITE_CMD; /* finish with a reset */ + timeout = jiffies + msecs_to_jiffies(20); + spin_lock_irqsave(&ebu_lock, flags); writeb(NAND_WRITE_CMD_RESET, (void __iomem *) nandaddr); - while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0) - ; + do { + if ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0) + break; + cond_resched(); + } while (!time_after_eq(jiffies, timeout)); spin_unlock_irqrestore(&ebu_lock, flags); } -- 1.7.10.4