Skip to contentSkip to conversation

mtd: CFI: fix bug - bonnie++ error on BF548 NOR flash

PATCH New Bryan Wu 1 participant 1 message Mar 6, 2009 Memory technology devices (MTD)

lore
Share & tools
lore

Bryan Wu

author
#0 lore raw

PATCH 1/1 mtd: CFI: fix bug - bonnie++ error on BF548 NOR flash

From: Graf Yang <[email protected]>

The function inval_cache_and_wait_for_operation() is called both by write and erase operation. If erase call it and stayed there, then write call it and male-cleared chip->erase_suspended, the time out error may arise.

---
 drivers/mtd/chips/cfi_cmdset_0001.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/mtd/chips/cfi_cmdset_0001.c +6 -2
index f5ab6fa..c151075 100644
@@ -1236,10 +1236,14 @@ static int inval_cache_and_wait_for_operation(
 			remove_wait_queue(&chip->wq, &wait);
 			spin_lock(chip->mutex);
 		}
-		if (chip->erase_suspended || chip->write_suspended)  {
-			/* Suspend has occured while sleep: reset timeout */
+		if (chip->erase_suspended && chip_state == FL_ERASING)  {
+			/* Erase suspend has occured while sleep: reset timeout */
 			timeo = reset_timeo;
 			chip->erase_suspended = 0;
+		}
+		if (chip->write_suspended && chip_state == FL_WRITING)  {
+			/* Write suspend has occured while sleep: reset timeout */
+			timeo = reset_timeo;
 			chip->write_suspended = 0;
 		}
 	}
Signature · 1 line
1.5.6.3