6 files changed, 43 insertions, 15 deletions

diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index effa0d7a73ac..205bb7083335 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -301,7 +301,7 @@ config MTD_JEDEC
 
 config MTD_XIP
         bool "XIP aware MTD support"
-        depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARM
+        depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARCH_MTD_XIP
         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_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 69c04945591f..1c074d63ff3a 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -408,6 +408,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
                 cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;
                 cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;
                 cfi->chips[i].ref_point_counter = 0;
+                init_waitqueue_head(&(cfi->chips[i].wq));
         }
 
         map->fldrv = &cfi_intelext_chipdrv;
@@ -1019,8 +1020,8 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
 #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)
+#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \
+        UDELAY(map, chip, cmd_adr, usec)
 
 /*
  * Extra notes:
@@ -1052,7 +1053,7 @@ do {  \
         spin_lock(chip->mutex);  \
 } while (0)
 
-#define INVALIDATE_CACHE_UDELAY(map, chip, adr, len, usec)  \
+#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \
 do {  \
         spin_unlock(chip->mutex);  \
         INVALIDATE_CACHED_RANGE(map, adr, len);  \
@@ -1284,7 +1285,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
         map_write(map, datum, adr);
         chip->state = mode;
 
-        INVALIDATE_CACHE_UDELAY(map, chip,
+        INVALIDATE_CACHE_UDELAY(map, chip, adr,
                                 adr, map_bankwidth(map),
                                 chip->word_write_time);
 
@@ -1572,8 +1573,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         map_write(map, CMD(0xd0), cmd_adr);
         chip->state = FL_WRITING;
 
-        INVALIDATE_CACHE_UDELAY(map, chip,
-                                cmd_adr, len,
+        INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr,
+                                adr, len,
                                 chip->buffer_write_time);
 
         timeo = jiffies + (HZ/2);
@@ -1744,7 +1745,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
         chip->state = FL_ERASING;
         chip->erase_suspended = 0;
 
-        INVALIDATE_CACHE_UDELAY(map, chip,
+        INVALIDATE_CACHE_UDELAY(map, chip, adr,
                                 adr, len,
                                 chip->erase_time*1000/2);
 
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 155737e7483f..a19480d07888 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -178,7 +178,7 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
                  * we're at a block boundary and need to erase the whole block.
                  */
                 pageaddr = instr->addr / priv->page_size;
-                do_block = (pageaddr & 0x7) == 0 && instr->len <= blocksize;
+                do_block = (pageaddr & 0x7) == 0 && instr->len >= blocksize;
                 pageaddr = pageaddr << priv->page_offset;
 
                 command[0] = do_block ? OP_ERASE_BLOCK : OP_ERASE_PAGE;
diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c
index 701620b6baed..8b3784e2de89 100644
--- a/drivers/mtd/maps/dc21285.c
+++ b/drivers/mtd/maps/dc21285.c
@@ -110,8 +110,9 @@ static void dc21285_copy_to_32(struct map_info *map, unsigned long to, const voi
 {
         while (len > 0) {
                 map_word d;
-                d.x[0] = *((uint32_t*)from)++;
+                d.x[0] = *((uint32_t*)from);
                 dc21285_write32(map, d, to);
+                from += 4;
                 to += 4;
                 len -= 4;
         }
@@ -121,8 +122,9 @@ static void dc21285_copy_to_16(struct map_info *map, unsigned long to, const voi
 {
         while (len > 0) {
                 map_word d;
-                d.x[0] = *((uint16_t*)from)++;
+                d.x[0] = *((uint16_t*)from);
                 dc21285_write16(map, d, to);
+                from += 2;
                 to += 2;
                 len -= 2;
         }
@@ -131,8 +133,9 @@ static void dc21285_copy_to_16(struct map_info *map, unsigned long to, const voi
 static void dc21285_copy_to_8(struct map_info *map, unsigned long to, const void *from, ssize_t len)
 {
         map_word d;
-        d.x[0] = *((uint8_t*)from)++;
+        d.x[0] = *((uint8_t*)from);
         dc21285_write8(map, d, to);
+        from++;
         to++;
         len--;
 }
diff --git a/drivers/mtd/maps/tsunami_flash.c b/drivers/mtd/maps/tsunami_flash.c
index 9e21e6c02f80..0f915ac3102e 100644
--- a/drivers/mtd/maps/tsunami_flash.c
+++ b/drivers/mtd/maps/tsunami_flash.c
@@ -62,7 +62,7 @@ static void tsunami_flash_copy_to(
 static struct map_info tsunami_flash_map = {
         .name = "flash chip on the Tsunami TIG bus",
         .size = MAX_TIG_FLASH_SIZE,
-        .phys = NO_XIP;
+        .phys = NO_XIP,
         .bankwidth = 1,
         .read = tsunami_flash_read8,
         .copy_from = tsunami_flash_copy_from,
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 7b7ca5ab5ae4..8815c8dbef2d 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $
+ * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $
  *
  * Parse RedBoot-style Flash Image System (FIS) tables and
  * produce a Linux partition array to match.
@@ -89,8 +89,32 @@ static int parse_redboot_partitions(struct mtd_info *master,
                         i = numslots;
                         break;
                 }
-                if (!memcmp(buf[i].name, "FIS directory", 14))
+                if (!memcmp(buf[i].name, "FIS directory", 14)) {
+                        /* This is apparently the FIS directory entry for the
+                         * FIS directory itself.  The FIS directory size is
+                         * one erase block; if the buf[i].size field is
+                         * swab32(erasesize) then we know we are looking at
+                         * a byte swapped FIS directory - swap all the entries!
+                         * (NOTE: this is 'size' not 'data_length'; size is
+                         * the full size of the entry.)
+                         */
+                        if (swab32(buf[i].size) == master->erasesize) {
+                                int j;
+                                for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
+                                        /* The unsigned long fields were written with the
+                                         * wrong byte sex, name and pad have no byte sex.
+                                         */
+                                        swab32s(&buf[j].flash_base);
+                                        swab32s(&buf[j].mem_base);
+                                        swab32s(&buf[j].size);
+                                        swab32s(&buf[j].entry_point);
+                                        swab32s(&buf[j].data_length);
+                                        swab32s(&buf[j].desc_cksum);
+                                        swab32s(&buf[j].file_cksum);
+                                }
+                        }
                         break;
+                }
         }
         if (i == numslots) {
                 /* Didn't find it */