linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer
@ 2019-01-31 23:30 Liu Jian
  2019-02-03  8:26 ` Boris Brezillon
  0 siblings, 1 reply; 11+ messages in thread
From: Liu Jian @ 2019-01-31 23:30 UTC (permalink / raw)
  To: dwmw2, computersforpeace, bbrezillon, marek.vasut, richard,
	joakim.tjernlund, ikegami, keescook
  Cc: linux-mtd, liujian56, linux-kernel

In function do_write_buffer(), in the for loop, there is a case
chip_ready() returns 1 while chip_good() returns 0, so it never
break the loop.
To fix this, chip_good() is enough and it should timeout if it stay
bad for a while.

Fixes: dfeae1073583(mtd: cfi_cmdset_0002: Change write buffer to check
correct value)
Signed-off-by: Yi Huaijie <yihuaijie@huawei.com>
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 72428b6..818e94b 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1876,14 +1876,14 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 			continue;
 		}
 
-		if (time_after(jiffies, timeo) && !chip_ready(map, adr))
-			break;
-
 		if (chip_good(map, adr, datum)) {
 			xip_enable(map, chip, adr);
 			goto op_done;
 		}
 
+		if (time_after(jiffies, timeo))
+			break;
+
 		/* Latency issues. Drop the lock, wait a while and retry */
 		UDELAY(map, chip, adr, 1);
 	}
-- 
2.7.4


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2019-02-14  1:34 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-31 23:30 [PATCH] cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer Liu Jian
2019-02-03  8:26 ` Boris Brezillon
2019-02-03  8:35   ` Boris Brezillon
2019-02-05 22:28     ` Sobon, Przemyslaw
2019-02-05 23:03       ` ikegami_to
2019-02-07  8:56       ` Boris Brezillon
2019-02-07 22:59         ` ikegami_to
2019-02-07 23:50           ` Sobon, Przemyslaw
2019-02-08  8:45             ` Joakim Tjernlund
2019-02-08 14:23             ` Tokunori Ikegami
2019-02-14  1:34               ` liujian (CE)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).