diff options
| author | Tadashi Abe <tabe@mvista.com> | 2011-05-19 15:58:15 +0900 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-05-25 02:11:11 +0100 |
| commit | 100f2341e305f98de3aa12fb472771ab029cbda7 (patch) | |
| tree | 40cc6edf73cf06b6392a18fd496cb9dc071c98d4 /drivers/mtd/chips/cfi_cmdset_0001.c | |
| parent | 52534f2dba5d033c0c33e515faa2767d7e8e986a (diff) | |
| download | op-kernel-dev-100f2341e305f98de3aa12fb472771ab029cbda7.zip op-kernel-dev-100f2341e305f98de3aa12fb472771ab029cbda7.tar.gz | |
mtd: fix hang-up in cfi erase and read contention
cfi erase command hangs up when erase and read contention occurs.
If read runs at the same address as erase operation, read issues
Erase-Suspend via get_chip() and the erase goes into sleep in wait queue.
But in this case, read operation exits by time-out without waking it up.
I think the other variants (0001, 0020 and lpddr) have the same problem too.
Tested and verified the patch only on CFI-0002 flash, though.
Signed-off-by: Tadashi Abe <tabe@mvista.com>
Acked-by: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/chips/cfi_cmdset_0001.c')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 09cb7c8..121be02 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -812,12 +812,9 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long break; if (time_after(jiffies, timeo)) { - /* Urgh. Resume and pretend we weren't here. */ - map_write(map, CMD(0xd0), adr); - /* Make sure we're in 'read status' mode if it had finished */ - map_write(map, CMD(0x70), adr); - chip->state = FL_ERASING; - chip->oldstate = FL_READY; + /* Urgh. Resume and pretend we weren't here. + * Make sure we're in 'read status' mode if it had finished */ + put_chip(map, chip, adr); printk(KERN_ERR "%s: Chip not ready after erase " "suspended: status = 0x%lx\n", map->name, status.x[0]); return -EIO; |
