Patch: fix suspend/resume on cfi_cmdset_00xx.c

Patch: fix suspend/resume on cfi_cmdset_00xx.c

[John Hall]

Hi,

I found a bug in cfi_cmdset_0001.c when doing suspend and resume on my
board. The suspend function overwrites the oldstate member of the
cfi_private struct, which seems to break things.

The identical bug exists in 0002 and 0020 too. The following patch is for
all three.

Regards,
John

--- mtd/drivers/mtd/chips/cfi_cmdset_0001.c Wed Feb 11 10:03:56 2004
+++ mtd-jdh/drivers/mtd/chips/cfi_cmdset_0001.c Fri Feb 20 16:32:44 2004
@@ -1608,6 +1608,7 @@
 {
  struct map_info *map = mtd->priv;
  struct cfi_private *cfi = map->fldrv_priv;
+ flstate_t oldstates[cfi->numchips];
  int i;
  struct flchip *chip;
  int ret = 0;
@@ -1623,7 +1624,7 @@
   case FL_CFI_QUERY:
   case FL_JEDEC_QUERY:
    if (chip->oldstate == FL_READY) {
-    chip->oldstate = chip->state;
+    oldstates[i] = chip->state;
     chip->state = FL_PM_SUSPENDED;
     /* No need to wake_up() on this state change -
      * as the whole point is that nobody can do anything
@@ -1632,6 +1633,7 @@
    }
    break;
   default:
+   printk(KERN_ALERT "cfi_cmdset_0001: disallowing suspend\n");
    ret = -EAGAIN;
   case FL_PM_SUSPENDED:
    break;
@@ -1651,7 +1653,7 @@
     /* No need to force it into a known state here,
        because we're returning failure, and it didn't
        get power cycled */
-    chip->state = chip->oldstate;
+    chip->state = oldstates[i];
     wake_up(&chip->wq);
    }
    spin_unlock(chip->mutex);
--- mtd/drivers/mtd/chips/cfi_cmdset_0002.c Wed Feb 11 10:03:58 2004
+++ mtd-jdh/drivers/mtd/chips/cfi_cmdset_0002.c Fri Feb 20 16:32:44 2004
@@ -1975,6 +1975,7 @@
 {
  struct map_info *map = mtd->priv;
  struct cfi_private *cfi = map->fldrv_priv;
+ flstate_t oldstates[cfi->numchips];
  int i;
  struct flchip *chip;
  int ret = 0;
@@ -1989,7 +1990,7 @@
   case FL_STATUS:
   case FL_CFI_QUERY:
   case FL_JEDEC_QUERY:
-   chip->oldstate = chip->state;
+   oldstates[i] = chip->state;
    chip->state = FL_PM_SUSPENDED;
    /* No need to wake_up() on this state change -
     * as the whole point is that nobody can do anything
@@ -2014,7 +2015,7 @@
    cfi_spin_lock(chip->mutex);

    if (chip->state == FL_PM_SUSPENDED) {
-    chip->state = chip->oldstate;
+    chip->state = oldstates[i];
     wake_up(&chip->wq);
    }
    cfi_spin_unlock(chip->mutex);
--- mtd/drivers/mtd/chips/cfi_cmdset_0020.c Wed Feb 11 10:03:58 2004
+++ mtd-jdh/drivers/mtd/chips/cfi_cmdset_0020.c Fri Feb 20 16:32:44 2004
@@ -1319,6 +1319,7 @@
 {
  struct map_info *map = mtd->priv;
  struct cfi_private *cfi = map->fldrv_priv;
+ flstate_t oldstates[cfi->numchips];
  int i;
  struct flchip *chip;
  int ret = 0;
@@ -1333,7 +1334,7 @@
   case FL_STATUS:
   case FL_CFI_QUERY:
   case FL_JEDEC_QUERY:
-   chip->oldstate = chip->state;
+   oldstates[i] = chip->state;
    chip->state = FL_PM_SUSPENDED;
    /* No need to wake_up() on this state change -
     * as the whole point is that nobody can do anything
@@ -1361,7 +1362,7 @@
     /* No need to force it into a known state here,
        because we're returning failure, and it didn't
        get power cycled */
-    chip->state = chip->oldstate;
+    chip->state = oldstates[i];
     wake_up(&chip->wq);
    }
    spin_unlock_bh(chip->mutex);