5 files changed, 324 insertions, 111 deletions

diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index f4eda1e40d51..b5dc59389bb3 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/chips/Kconfig
-# $Id: Kconfig,v 1.14 2005/02/08 17:11:15 nico Exp $
+# $Id: Kconfig,v 1.15 2005/06/06 23:04:35 tpoynor Exp $
 
 menu "RAM/ROM/Flash chip drivers"
         depends on MTD!=n
@@ -300,7 +300,7 @@ config MTD_JEDEC
 
 config MTD_XIP
         bool "XIP aware MTD support"
-        depends on !SMP && MTD_CFI_INTELEXT && EXPERIMENTAL
+        depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL
         default y if XIP_KERNEL
         help
           This allows MTD support to work with flash memory which is also
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 49cd81207137..e42eefbda0e1 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -4,16 +4,20 @@
  *
  * Copyright (C) 2000 Crossnet Co. <info@crossnet.co.jp>
  * Copyright (C) 2004 Arcom Control Systems Ltd <linux@arcom.com>
+ * Copyright (C) 2005 MontaVista Software Inc. <source@mvista.com>
  *
  * 2_by_8 routines added by Simon Munton
  *
  * 4_by_16 work by Carolyn J. Smith
  *
+ * XIP support hooks by Vitaly Wool (based on code for Intel flash 
+ * by Nicolas Pitre)
+ * 
  * Occasionally maintained by Thayne Harbaugh tharbaugh at lnxi dot com
  *
  * This code is GPL
  *
- * $Id: cfi_cmdset_0002.c,v 1.116 2005/05/24 13:29:42 gleixner Exp $
+ * $Id: cfi_cmdset_0002.c,v 1.117 2005/06/06 23:04:35 tpoynor Exp $
  *
  */
 
@@ -34,6 +38,7 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/cfi.h>
+#include <linux/mtd/xip.h>
 
 #define AMD_BOOTLOC_BUG
 #define FORCE_WORD_WRITE 0
@@ -393,7 +398,7 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
  * correctly and is therefore not done  (particulary with interleaved chips
  * as each chip must be checked independantly of the others).
  */
-static int chip_ready(struct map_info *map, unsigned long addr)
+static int __xipram chip_ready(struct map_info *map, unsigned long addr)
 {
         map_word d, t;
 
@@ -418,7 +423,7 @@ static int chip_ready(struct map_info *map, unsigned long addr)
  * as each chip must be checked independantly of the others).
  *
  */
-static int chip_good(struct map_info *map, unsigned long addr, map_word expected)
+static int __xipram chip_good(struct map_info *map, unsigned long addr, map_word expected)
 {
         map_word oldd, curd;
 
@@ -448,12 +453,12 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
 
                         if (time_after(jiffies, timeo)) {
                                 printk(KERN_ERR "Waiting for chip to be ready timed out.\n");
-                                cfi_spin_unlock(chip->mutex);
+                                spin_unlock(chip->mutex);
                                 return -EIO;
                         }
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                         cfi_udelay(1);
-                        cfi_spin_lock(chip->mutex);
+                        spin_lock(chip->mutex);
                         /* Someone else might have been playing with it. */
                         goto retry;
                 }
@@ -501,15 +506,23 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                                 return -EIO;
                         }
                         
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                         cfi_udelay(1);
-                        cfi_spin_lock(chip->mutex);
+                        spin_lock(chip->mutex);
                         /* Nobody will touch it while it's in state FL_ERASE_SUSPENDING.
                            So we can just loop here. */
                 }
                 chip->state = FL_READY;
                 return 0;
 
+        case FL_XIP_WHILE_ERASING:
+                if (mode != FL_READY && mode != FL_POINT &&
+                    (!cfip || !(cfip->EraseSuspend&2)))
+                        goto sleep;
+                chip->oldstate = chip->state;
+                chip->state = FL_READY;
+                return 0;
+
         case FL_POINT:
                 /* Only if there's no operation suspended... */
                 if (mode == FL_READY && chip->oldstate == FL_READY)
@@ -519,10 +532,10 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
         sleep:
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 add_wait_queue(&chip->wq, &wait);
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
                 schedule();
                 remove_wait_queue(&chip->wq, &wait);
-                cfi_spin_lock(chip->mutex);
+                spin_lock(chip->mutex);
                 goto resettime;
         }
 }
@@ -540,6 +553,11 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
                 chip->state = FL_ERASING;
                 break;
 
+        case FL_XIP_WHILE_ERASING:
+                chip->state = chip->oldstate;
+                chip->oldstate = FL_READY;
+                break;
+
         case FL_READY:
         case FL_STATUS:
                 /* We should really make set_vpp() count, rather than doing this */
@@ -551,6 +569,198 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
         wake_up(&chip->wq);
 }
 
+#ifdef CONFIG_MTD_XIP
+
+/*
+ * No interrupt what so ever can be serviced while the flash isn't in array
+ * mode.  This is ensured by the xip_disable() and xip_enable() functions
+ * enclosing any code path where the flash is known not to be in array mode.
+ * And within a XIP disabled code path, only functions marked with __xipram
+ * may be called and nothing else (it's a good thing to inspect generated
+ * assembly to make sure inline functions were actually inlined and that gcc
+ * didn't emit calls to its own support functions). Also configuring MTD CFI
+ * support to a single buswidth and a single interleave is also recommended.
+ */
+#include <asm/hardware.h>
+static void xip_disable(struct map_info *map, struct flchip *chip,
+                        unsigned long adr)
+{
+        /* TODO: chips with no XIP use should ignore and return */
+        (void) map_read(map, adr); /* ensure mmu mapping is up to date */
+        local_irq_disable();
+}
+
+static void __xipram xip_enable(struct map_info *map, struct flchip *chip,
+                                unsigned long adr)
+{
+        struct cfi_private *cfi = map->fldrv_priv;
+
+        if (chip->state != FL_POINT && chip->state != FL_READY) {
+                map_write(map, CMD(0xf0), adr);
+                chip->state = FL_READY;
+        }
+        (void) map_read(map, adr);
+        asm volatile (".rep 8; nop; .endr"); /* fill instruction prefetch */
+        local_irq_enable();
+}
+
+/*
+ * When a delay is required for the flash operation to complete, the
+ * xip_udelay() function is polling for both the given timeout and pending
+ * (but still masked) hardware interrupts.  Whenever there is an interrupt
+ * pending then the flash erase operation is suspended, array mode restored 
+ * and interrupts unmasked.  Task scheduling might also happen at that
+ * point.  The CPU eventually returns from the interrupt or the call to
+ * schedule() and the suspended flash operation is resumed for the remaining
+ * of the delay period.
+ *
+ * Warning: this function _will_ fool interrupt latency tracing tools.
+ */
+
+static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
+                                unsigned long adr, int usec)
+{
+        struct cfi_private *cfi = map->fldrv_priv;
+        struct cfi_pri_amdstd *extp = cfi->cmdset_priv;
+        map_word status, OK = CMD(0x80);
+        unsigned long suspended, start = xip_currtime();
+        flstate_t oldstate;
+
+        do {
+                cpu_relax();
+                if (xip_irqpending() && extp &&
+                    ((chip->state == FL_ERASING && (extp->EraseSuspend & 2))) &&
+                    (cfi_interleave_is_1(cfi) || chip->oldstate == FL_READY)) {
+                        /*
+                         * Let's suspend the erase operation when supported.  
+                         * Note that we currently don't try to suspend 
+                         * interleaved chips if there is already another 
+                         * operation suspended (imagine what happens
+                         * when one chip was already done with the current
+                         * operation while another chip suspended it, then
+                         * we resume the whole thing at once).  Yes, it
+                         * can happen!
+                         */
+                        map_write(map, CMD(0xb0), adr);
+                        usec -= xip_elapsed_since(start);
+                        suspended = xip_currtime();
+                        do {
+                                if (xip_elapsed_since(suspended) > 100000) {
+                                        /*
+                                         * The chip doesn't want to suspend
+                                         * after waiting for 100 msecs.
+                                         * This is a critical error but there
+                                         * is not much we can do here.
+                                         */
+                                        return;
+                                }
+                                status = map_read(map, adr);
+                        } while (!map_word_andequal(map, status, OK, OK));
+
+                        /* Suspend succeeded */
+                        oldstate = chip->state;
+                        if (!map_word_bitsset(map, status, CMD(0x40)))
+                                break;
+                        chip->state = FL_XIP_WHILE_ERASING;
+                        chip->erase_suspended = 1;
+                        map_write(map, CMD(0xf0), adr);
+                        (void) map_read(map, adr);
+                        asm volatile (".rep 8; nop; .endr");
+                        local_irq_enable();
+                        spin_unlock(chip->mutex);
+                        asm volatile (".rep 8; nop; .endr");
+                        cond_resched();
+
+                        /*
+                         * We're back.  However someone else might have
+                         * decided to go write to the chip if we are in
+                         * a suspended erase state.  If so let's wait
+                         * until it's done.
+                         */
+                        spin_lock(chip->mutex);
+                        while (chip->state != FL_XIP_WHILE_ERASING) {
+                                DECLARE_WAITQUEUE(wait, current);
+                                set_current_state(TASK_UNINTERRUPTIBLE);
+                                add_wait_queue(&chip->wq, &wait);
+                                spin_unlock(chip->mutex);
+                                schedule();
+                                remove_wait_queue(&chip->wq, &wait);
+                                spin_lock(chip->mutex);
+                        }
+                        /* Disallow XIP again */
+                        local_irq_disable();
+
+                        /* Resume the write or erase operation */
+                        map_write(map, CMD(0x30), adr);
+                        chip->state = oldstate;
+                        start = xip_currtime();
+                } else if (usec >= 1000000/HZ) {
+                        /*
+                         * Try to save on CPU power when waiting delay
+                         * is at least a system timer tick period.
+                         * No need to be extremely accurate here.
+                         */
+                        xip_cpu_idle();
+                }
+                status = map_read(map, adr);
+        } while (!map_word_andequal(map, status, OK, OK)
+                 && xip_elapsed_since(start) < usec);
+}
+
+#define UDELAY(map, chip, adr, usec)  xip_udelay(map, chip, adr, usec)
+
+/*
+ * The INVALIDATE_CACHED_RANGE() macro is normally used in parallel while
+ * the flash is actively programming or erasing since we have to poll for
+ * the operation to complete anyway.  We can't do that in a generic way with
+ * a XIP setup so do it before the actual flash operation in this case
+ * and stub it out from INVALIDATE_CACHE_UDELAY.
+ */
+#define XIP_INVAL_CACHED_RANGE(map, from, size)  \
+        INVALIDATE_CACHED_RANGE(map, from, size)
+
+#define INVALIDATE_CACHE_UDELAY(map, chip, adr, len, usec)  \
+        UDELAY(map, chip, adr, usec)
+
+/*
+ * Extra notes:
+ *
+ * Activating this XIP support changes the way the code works a bit.  For
+ * example the code to suspend the current process when concurrent access
+ * happens is never executed because xip_udelay() will always return with the
+ * same chip state as it was entered with.  This is why there is no care for
+ * the presence of add_wait_queue() or schedule() calls from within a couple
+ * xip_disable()'d  areas of code, like in do_erase_oneblock for example.
+ * The queueing and scheduling are always happening within xip_udelay().
+ *
+ * Similarly, get_chip() and put_chip() just happen to always be executed
+ * with chip->state set to FL_READY (or FL_XIP_WHILE_*) where flash state
+ * is in array mode, therefore never executing many cases therein and not
+ * causing any problem with XIP.
+ */
+
+#else
+
+#define xip_disable(map, chip, adr)
+#define xip_enable(map, chip, adr)
+#define XIP_INVAL_CACHED_RANGE(x...)
+
+#define UDELAY(map, chip, adr, usec)  \
+do {  \
+        spin_unlock(chip->mutex);  \
+        cfi_udelay(usec);  \
+        spin_lock(chip->mutex);  \
+} while (0)
+
+#define INVALIDATE_CACHE_UDELAY(map, chip, adr, len, usec)  \
+do {  \
+        spin_unlock(chip->mutex);  \
+        INVALIDATE_CACHED_RANGE(map, adr, len);  \
+        cfi_udelay(usec);  \
+        spin_lock(chip->mutex);  \
+} while (0)
+
+#endif
 
 static inline int do_read_onechip(struct map_info *map, struct flchip *chip, loff_t adr, size_t len, u_char *buf)
 {
@@ -563,10 +773,10 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
         /* Ensure cmd read/writes are aligned. */ 
         cmd_addr = adr & ~(map_bankwidth(map)-1); 
 
-        cfi_spin_lock(chip->mutex);
+        spin_lock(chip->mutex);
         ret = get_chip(map, chip, cmd_addr, FL_READY);
         if (ret) {
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
                 return ret;
         }
 
@@ -579,7 +789,7 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
 
         put_chip(map, chip, cmd_addr);
 
-        cfi_spin_unlock(chip->mutex);
+        spin_unlock(chip->mutex);
         return 0;
 }
 
@@ -633,7 +843,7 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi
         struct cfi_private *cfi = map->fldrv_priv;
 
  retry:
-        cfi_spin_lock(chip->mutex);
+        spin_lock(chip->mutex);
 
         if (chip->state != FL_READY){
 #if 0
@@ -642,7 +852,7 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 add_wait_queue(&chip->wq, &wait);
                 
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
 
                 schedule();
                 remove_wait_queue(&chip->wq, &wait);
@@ -671,7 +881,7 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi
         cfi_send_gen_cmd(0x00, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         
         wake_up(&chip->wq);
-        cfi_spin_unlock(chip->mutex);
+        spin_unlock(chip->mutex);
 
         return 0;
 }
@@ -720,7 +930,7 @@ static int cfi_amdstd_secsi_read (struct mtd_info *mtd, loff_t from, size_t len,
 }
 
 
-static int do_write_oneword(struct map_info *map, struct flchip *chip, unsigned long adr, map_word datum)
+static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, unsigned long adr, map_word datum)
 {
         struct cfi_private *cfi = map->fldrv_priv;
         unsigned long timeo = jiffies + HZ;
@@ -740,10 +950,10 @@ static int do_write_oneword(struct map_info *map, struct flchip *chip, unsigned
 
         adr += chip->start;
 
-        cfi_spin_lock(chip->mutex);
+        spin_lock(chip->mutex);
         ret = get_chip(map, chip, adr, FL_WRITING);
         if (ret) {
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
                 return ret;
         }
 
@@ -763,7 +973,9 @@ static int do_write_oneword(struct map_info *map, struct flchip *chip, unsigned
                 goto op_done;
         }
 
+        XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map));
         ENABLE_VPP(map);
+        xip_disable(map, chip, adr);
  retry:
         cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
@@ -771,9 +983,9 @@ static int do_write_oneword(struct map_info *map, struct flchip *chip, unsigned
         map_write(map, datum, adr);
         chip->state = FL_WRITING;
 
-        cfi_spin_unlock(chip->mutex);
-        cfi_udelay(chip->word_write_time);
-        cfi_spin_lock(chip->mutex);
+        INVALIDATE_CACHE_UDELAY(map, chip,
+                                adr, map_bankwidth(map),
+                                chip->word_write_time);
 
         /* See comment above for timeout value. */
         timeo = jiffies + uWriteTimeout; 
@@ -784,11 +996,11 @@ static int do_write_oneword(struct map_info *map, struct flchip *chip, unsigned
 
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         add_wait_queue(&chip->wq, &wait);
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                         schedule();
                         remove_wait_queue(&chip->wq, &wait);
                         timeo = jiffies + (HZ / 2); /* FIXME */
-                        cfi_spin_lock(chip->mutex);
+                        spin_lock(chip->mutex);
                         continue;
                 }
 
@@ -796,14 +1008,14 @@ static int do_write_oneword(struct map_info *map, struct flchip *chip, unsigned
                         break;
 
                 if (time_after(jiffies, timeo)) {
+                        xip_enable(map, chip, adr);
                         printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
+                        xip_disable(map, chip, adr);
                         break;
                 }
 
                 /* Latency issues. Drop the lock, wait a while and retry */
-                cfi_spin_unlock(chip->mutex);
-                cfi_udelay(1);
-                cfi_spin_lock(chip->mutex);
+                UDELAY(map, chip, adr, 1);
         }
         /* Did we succeed? */
         if (!chip_good(map, adr, datum)) {
@@ -816,10 +1028,11 @@ static int do_write_oneword(struct map_info *map, struct flchip *chip, unsigned
 
                 ret = -EIO;
         }
+        xip_enable(map, chip, adr);
  op_done:
         chip->state = FL_READY;
         put_chip(map, chip, adr);
-        cfi_spin_unlock(chip->mutex);
+        spin_unlock(chip->mutex);
 
         return ret;
 }
@@ -851,7 +1064,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
                 map_word tmp_buf;
 
  retry:
-                cfi_spin_lock(cfi->chips[chipnum].mutex);
+                spin_lock(cfi->chips[chipnum].mutex);
 
                 if (cfi->chips[chipnum].state != FL_READY) {
 #if 0
@@ -860,7 +1073,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         add_wait_queue(&cfi->chips[chipnum].wq, &wait);
 
-                        cfi_spin_unlock(cfi->chips[chipnum].mutex);
+                        spin_unlock(cfi->chips[chipnum].mutex);
 
                         schedule();
                         remove_wait_queue(&cfi->chips[chipnum].wq, &wait);
@@ -874,7 +1087,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
                 /* Load 'tmp_buf' with old contents of flash */
                 tmp_buf = map_read(map, bus_ofs+chipstart);
 
-                cfi_spin_unlock(cfi->chips[chipnum].mutex);
+                spin_unlock(cfi->chips[chipnum].mutex);
 
                 /* Number of bytes to copy from buffer */
                 n = min_t(int, len, map_bankwidth(map)-i);
@@ -929,7 +1142,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
                 map_word tmp_buf;
 
  retry1:
-                cfi_spin_lock(cfi->chips[chipnum].mutex);
+                spin_lock(cfi->chips[chipnum].mutex);
 
                 if (cfi->chips[chipnum].state != FL_READY) {
 #if 0
@@ -938,7 +1151,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         add_wait_queue(&cfi->chips[chipnum].wq, &wait);
 
-                        cfi_spin_unlock(cfi->chips[chipnum].mutex);
+                        spin_unlock(cfi->chips[chipnum].mutex);
 
                         schedule();
                         remove_wait_queue(&cfi->chips[chipnum].wq, &wait);
@@ -951,7 +1164,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
 
                 tmp_buf = map_read(map, ofs + chipstart);
 
-                cfi_spin_unlock(cfi->chips[chipnum].mutex);
+                spin_unlock(cfi->chips[chipnum].mutex);
 
                 tmp_buf = map_word_load_partial(map, tmp_buf, buf, 0, len);
         
@@ -970,8 +1183,9 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
 /*
  * FIXME: interleaved mode not tested, and probably not supported!
  */
-static inline int do_write_buffer(struct map_info *map, struct flchip *chip, 
-                                  unsigned long adr, const u_char *buf, int len)
+static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
+                                    unsigned long adr, const u_char *buf, 
+                                    int len)
 {
         struct cfi_private *cfi = map->fldrv_priv;
         unsigned long timeo = jiffies + HZ;
@@ -985,10 +1199,10 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
         adr += chip->start;
         cmd_adr = adr;
 
-        cfi_spin_lock(chip->mutex);
+        spin_lock(chip->mutex);
         ret = get_chip(map, chip, adr, FL_WRITING);
         if (ret) {
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
                 return ret;
         }
 
@@ -997,7 +1211,10 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
         DEBUG( MTD_DEBUG_LEVEL3, "MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n",
                __func__, adr, datum.x[0] );
 
+        XIP_INVAL_CACHED_RANGE(map, adr, len);
         ENABLE_VPP(map);
+        xip_disable(map, chip, cmd_adr);
+        
         cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
         //cfi_send_gen_cmd(0xA0, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
@@ -1027,9 +1244,9 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
         map_write(map, CMD(0x29), cmd_adr);
         chip->state = FL_WRITING;
 
-        cfi_spin_unlock(chip->mutex);
-        cfi_udelay(chip->buffer_write_time);
-        cfi_spin_lock(chip->mutex);
+        INVALIDATE_CACHE_UDELAY(map, chip,
+                                adr, map_bankwidth(map),
+                                chip->word_write_time);
 
         timeo = jiffies + uWriteTimeout; 
                 
@@ -1040,38 +1257,39 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
 
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         add_wait_queue(&chip->wq, &wait);
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                         schedule();
                         remove_wait_queue(&chip->wq, &wait);
                         timeo = jiffies + (HZ / 2); /* FIXME */
-                        cfi_spin_lock(chip->mutex);
+                        spin_lock(chip->mutex);
                         continue;
                 }
 
-                if (chip_ready(map, adr))
+                if (chip_ready(map, adr)) {
+                        xip_enable(map, chip, adr);
                         goto op_done;
+                }
                     
                 if( time_after(jiffies, timeo))
                         break;
 
                 /* Latency issues. Drop the lock, wait a while and retry */
-                cfi_spin_unlock(chip->mutex);
-                cfi_udelay(1);
-                cfi_spin_lock(chip->mutex);
+                UDELAY(map, chip, adr, 1);
         }
 
-        printk(KERN_WARNING "MTD %s(): software timeout\n",
-               __func__ );
-
         /* reset on all failures. */
         map_write( map, CMD(0xF0), chip->start );
+        xip_enable(map, chip, adr);
         /* FIXME - should have reset delay before continuing */
 
+        printk(KERN_WARNING "MTD %s(): software timeout\n",
+               __func__ );
+
         ret = -EIO;
  op_done:
         chip->state = FL_READY;
         put_chip(map, chip, adr);
-        cfi_spin_unlock(chip->mutex);
+        spin_unlock(chip->mutex);
 
         return ret;
 }
@@ -1161,7 +1379,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
  * Handle devices with one erase region, that only implement
  * the chip erase command.
  */
-static inline int do_erase_chip(struct map_info *map, struct flchip *chip)
+static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
 {
         struct cfi_private *cfi = map->fldrv_priv;
         unsigned long timeo = jiffies + HZ;
@@ -1171,17 +1389,20 @@ static inline int do_erase_chip(struct map_info *map, struct flchip *chip)
 
         adr = cfi->addr_unlock1;
 
-        cfi_spin_lock(chip->mutex);
+        spin_lock(chip->mutex);
         ret = get_chip(map, chip, adr, FL_WRITING);
         if (ret) {
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
                 return ret;
         }
 
         DEBUG( MTD_DEBUG_LEVEL3, "MTD %s(): ERASE 0x%.8lx\n",
                __func__, chip->start );
 
+        XIP_INVAL_CACHED_RANGE(map, adr, map->size);
         ENABLE_VPP(map);
+        xip_disable(map, chip, adr);
+
         cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
@@ -1193,9 +1414,9 @@ static inline int do_erase_chip(struct map_info *map, struct flchip *chip)
         chip->erase_suspended = 0;
         chip->in_progress_block_addr = adr;
 
-        cfi_spin_unlock(chip->mutex);
-        msleep(chip->erase_time/2);
-        cfi_spin_lock(chip->mutex);
+        INVALIDATE_CACHE_UDELAY(map, chip,
+                                adr, map->size,
+                                chip->erase_time*500);
 
         timeo = jiffies + (HZ*20);
 
@@ -1204,10 +1425,10 @@ static inline int do_erase_chip(struct map_info *map, struct flchip *chip)
                         /* Someone's suspended the erase. Sleep */
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         add_wait_queue(&chip->wq, &wait);
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                         schedule();
                         remove_wait_queue(&chip->wq, &wait);
-                        cfi_spin_lock(chip->mutex);
+                        spin_lock(chip->mutex);
                         continue;
                 }
                 if (chip->erase_suspended) {
@@ -1227,10 +1448,7 @@ static inline int do_erase_chip(struct map_info *map, struct flchip *chip)
                 }
 
                 /* Latency issues. Drop the lock, wait a while and retry */
-                cfi_spin_unlock(chip->mutex);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
-                cfi_spin_lock(chip->mutex);
+                UDELAY(map, chip, adr, 1000000/HZ);
         }
         /* Did we succeed? */
         if (!chip_good(map, adr, map_word_ff(map))) {
@@ -1242,14 +1460,15 @@ static inline int do_erase_chip(struct map_info *map, struct flchip *chip)
         }
 
         chip->state = FL_READY;
+        xip_enable(map, chip, adr);
         put_chip(map, chip, adr);
-        cfi_spin_unlock(chip->mutex);
+        spin_unlock(chip->mutex);
 
         return ret;
 }
 
 
-static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr, int len, void *thunk)
+static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, unsigned long adr, int len, void *thunk)
 {
         struct cfi_private *cfi = map->fldrv_priv;
         unsigned long timeo = jiffies + HZ;
@@ -1258,17 +1477,20 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
 
         adr += chip->start;
 
-        cfi_spin_lock(chip->mutex);
+        spin_lock(chip->mutex);
         ret = get_chip(map, chip, adr, FL_ERASING);
         if (ret) {
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
                 return ret;
         }
 
         DEBUG( MTD_DEBUG_LEVEL3, "MTD %s(): ERASE 0x%.8lx\n",
                __func__, adr );
 
+        XIP_INVAL_CACHED_RANGE(map, adr, len);
         ENABLE_VPP(map);
+        xip_disable(map, chip, adr);
+
         cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
@@ -1279,10 +1501,10 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
         chip->state = FL_ERASING;
         chip->erase_suspended = 0;
         chip->in_progress_block_addr = adr;
-        
-        cfi_spin_unlock(chip->mutex);
-        msleep(chip->erase_time/2);
-        cfi_spin_lock(chip->mutex);
+
+        INVALIDATE_CACHE_UDELAY(map, chip,
+                                adr, len,
+                                chip->erase_time*500);
 
         timeo = jiffies + (HZ*20);
 
@@ -1291,10 +1513,10 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
                         /* Someone's suspended the erase. Sleep */
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         add_wait_queue(&chip->wq, &wait);
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                         schedule();
                         remove_wait_queue(&chip->wq, &wait);
-                        cfi_spin_lock(chip->mutex);
+                        spin_lock(chip->mutex);
                         continue;
                 }
                 if (chip->erase_suspended) {
@@ -1304,20 +1526,20 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
                         chip->erase_suspended = 0;
                 }
 
-                if (chip_ready(map, adr))
+                if (chip_ready(map, adr)) {
+                        xip_enable(map, chip, adr);
                         break;
+                }
 
                 if (time_after(jiffies, timeo)) {
+                        xip_enable(map, chip, adr);
                         printk(KERN_WARNING "MTD %s(): software timeout\n",
                                 __func__ );
                         break;
                 }
 
                 /* Latency issues. Drop the lock, wait a while and retry */
-                cfi_spin_unlock(chip->mutex);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
-                cfi_spin_lock(chip->mutex);
+                UDELAY(map, chip, adr, 1000000/HZ);
         }
         /* Did we succeed? */
         if (!chip_good(map, adr, map_word_ff(map))) {
@@ -1330,7 +1552,7 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
 
         chip->state = FL_READY;
         put_chip(map, chip, adr);
-        cfi_spin_unlock(chip->mutex);
+        spin_unlock(chip->mutex);
         return ret;
 }
 
@@ -1390,7 +1612,7 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
                 chip = &cfi->chips[i];
 
         retry:
-                cfi_spin_lock(chip->mutex);
+                spin_lock(chip->mutex);
 
                 switch(chip->state) {
                 case FL_READY:
@@ -1404,14 +1626,14 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
                          * with the chip now anyway.
                          */
                 case FL_SYNCING:
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                         break;
 
                 default:
                         /* Not an idle state */
                         add_wait_queue(&chip->wq, &wait);
                         
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
 
                         schedule();
 
@@ -1426,13 +1648,13 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
         for (i--; i >=0; i--) {
                 chip = &cfi->chips[i];
 
-                cfi_spin_lock(chip->mutex);
+                spin_lock(chip->mutex);
                 
                 if (chip->state == FL_SYNCING) {
                         chip->state = chip->oldstate;
                         wake_up(&chip->wq);
                 }
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
         }
 }
 
@@ -1448,7 +1670,7 @@ static int cfi_amdstd_suspend(struct mtd_info *mtd)
         for (i=0; !ret && i<cfi->numchips; i++) {
                 chip = &cfi->chips[i];
 
-                cfi_spin_lock(chip->mutex);
+                spin_lock(chip->mutex);
 
                 switch(chip->state) {
                 case FL_READY:
@@ -1468,7 +1690,7 @@ static int cfi_amdstd_suspend(struct mtd_info *mtd)
                         ret = -EAGAIN;
                         break;
                 }
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
         }
 
         /* Unlock the chips again */
@@ -1477,13 +1699,13 @@ static int cfi_amdstd_suspend(struct mtd_info *mtd)
                 for (i--; i >=0; i--) {
                         chip = &cfi->chips[i];
 
-                        cfi_spin_lock(chip->mutex);
+                        spin_lock(chip->mutex);
                 
                         if (chip->state == FL_PM_SUSPENDED) {
                                 chip->state = chip->oldstate;
                                 wake_up(&chip->wq);
                         }
-                        cfi_spin_unlock(chip->mutex);
+                        spin_unlock(chip->mutex);
                 }
         }
         
@@ -1502,7 +1724,7 @@ static void cfi_amdstd_resume(struct mtd_info *mtd)
         
                 chip = &cfi->chips[i];
 
-                cfi_spin_lock(chip->mutex);
+                spin_lock(chip->mutex);
                 
                 if (chip->state == FL_PM_SUSPENDED) {
                         chip->state = FL_READY;
@@ -1512,7 +1734,7 @@ static void cfi_amdstd_resume(struct mtd_info *mtd)
                 else
                         printk(KERN_ERR "Argh. Chip not in PM_SUSPENDED state upon resume()\n");
 
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
         }
 }
 
diff --git a/drivers/mtd/chips/fwh_lock.h b/drivers/mtd/chips/fwh_lock.h
index fbf44708a861..e1a5b76596c5 100644
--- a/drivers/mtd/chips/fwh_lock.h
+++ b/drivers/mtd/chips/fwh_lock.h
@@ -58,10 +58,10 @@ static int fwh_xxlock_oneblock(struct map_info *map, struct flchip *chip,
          * to flash memory - that means that we don't have to check status
          * and timeout.
          */
-        cfi_spin_lock(chip->mutex);
+        spin_lock(chip->mutex);
         ret = get_chip(map, chip, adr, FL_LOCKING);
         if (ret) {
-                cfi_spin_unlock(chip->mutex);
+                spin_unlock(chip->mutex);
                 return ret;
         }
 
@@ -71,7 +71,7 @@ static int fwh_xxlock_oneblock(struct map_info *map, struct flchip *chip,
         /* Done and happy. */
         chip->state = FL_READY;
         put_chip(map, chip, adr);
-        cfi_spin_unlock(chip->mutex);
+        spin_unlock(chip->mutex);
         return 0;
 }
 
diff --git a/drivers/mtd/maps/map_funcs.c b/drivers/mtd/maps/map_funcs.c
index 38f6a7af53f8..9105e6ca0aa6 100644
--- a/drivers/mtd/maps/map_funcs.c
+++ b/drivers/mtd/maps/map_funcs.c
@@ -1,5 +1,5 @@
 /*
- * $Id: map_funcs.c,v 1.9 2004/07/13 22:33:15 dwmw2 Exp $
+ * $Id: map_funcs.c,v 1.10 2005/06/06 23:04:36 tpoynor Exp $
  *
  * Out-of-line map I/O functions for simple maps when CONFIG_COMPLEX_MAPPINGS
  * is enabled.
@@ -9,23 +9,24 @@
 #include <linux/module.h>
 
 #include <linux/mtd/map.h>
+#include <linux/mtd/xip.h>
 
-static map_word simple_map_read(struct map_info *map, unsigned long ofs)
+static map_word __xipram simple_map_read(struct map_info *map, unsigned long ofs)
 {
         return inline_map_read(map, ofs);
 }
 
-static void simple_map_write(struct map_info *map, const map_word datum, unsigned long ofs)
+static void __xipram simple_map_write(struct map_info *map, const map_word datum, unsigned long ofs)
 {
         inline_map_write(map, datum, ofs);
 }
 
-static void simple_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
+static void __xipram simple_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
 {
         inline_map_copy_from(map, to, from, len);
 }
 
-static void simple_map_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
+static void __xipram simple_map_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
 {
         inline_map_copy_to(map, to, from, len);
 }
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 66e0a32efbac..e6b6a1c66bd5 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -1,7 +1,7 @@
 
 /* Common Flash Interface structures 
  * See http://support.intel.com/design/flash/technote/index.htm
- * $Id: cfi.h,v 1.53 2005/03/15 19:03:13 gleixner Exp $
+ * $Id: cfi.h,v 1.54 2005/06/06 23:04:36 tpoynor Exp $
  */
 
 #ifndef __MTD_CFI_H__
@@ -428,16 +428,6 @@ static inline void cfi_udelay(int us)
         }
 }
 
-static inline void cfi_spin_lock(spinlock_t *mutex)
-{
-        spin_lock_bh(mutex);
-}
-
-static inline void cfi_spin_unlock(spinlock_t *mutex)
-{
-        spin_unlock_bh(mutex);
-}
-
 struct cfi_extquery *cfi_read_pri(struct map_info *map, uint16_t adr, uint16_t size,
                              const char* name);
 struct cfi_fixup {