target/linux/ramips/patches-4.3/0037-mtd-cfi-cmdset-0002-force-word-write.patch

   1 From ee9081b2726a5ca8cde5497afdc5425e21ff8f8b Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Mon, 15 Jul 2013 00:39:21 +0200
   4 Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write
   5
   6 ---
   7  drivers/mtd/chips/cfi_cmdset_0002.c |    9 +++++++--
   8  1 file changed, 7 insertions(+), 2 deletions(-)
   9
  10 diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
  11 index 60d960a..a663e3b 100644
  12 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
  13 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
  14 @@ -40,7 +40,7 @@
  15  #include <linux/mtd/xip.h>
  16
  17  #define AMD_BOOTLOC_BUG
  18 -#define FORCE_WORD_WRITE 0
  19 +#define FORCE_WORD_WRITE 1
  20
  21  #define MAX_WORD_RETRIES 3
  22
  23 @@ -51,7 +51,9 @@
  24
  25  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  26  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  27 +#if !FORCE_WORD_WRITE
  28  static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  29 +#endif
  30  static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
  31  static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
  32  static void cfi_amdstd_sync (struct mtd_info *);
  33 @@ -202,6 +204,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd)
  34  }
  35  #endif
  36
  37 +#if !FORCE_WORD_WRITE
  38  static void fixup_use_write_buffers(struct mtd_info *mtd)
  39  {
  40         struct map_info *map = mtd->priv;
  41 @@ -211,6 +214,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd)
  42                 mtd->_write = cfi_amdstd_write_buffers;
  43         }
  44  }
  45 +#endif /* !FORCE_WORD_WRITE */
  46
  47  /* Atmel chips don't use the same PRI format as AMD chips */
  48  static void fixup_convert_atmel_pri(struct mtd_info *mtd)
  49 @@ -1789,6 +1793,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
  50  /*
  51   * FIXME: interleaved mode not tested, and probably not supported!
  52   */
  53 +#if !FORCE_WORD_WRITE
  54  static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
  55                                     unsigned long adr, const u_char *buf,
  56                                     int len)
  57 @@ -1916,7 +1921,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
  58         return ret;
  59  }
  60
  61 -
  62  static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
  63                                     size_t *retlen, const u_char *buf)
  64  {
  65 @@ -1991,6 +1995,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
  66
  67         return 0;
  68  }
  69 +#endif /* !FORCE_WORD_WRITE */
  70
  71  /*
  72   * Wait for the flash chip to become ready to write data
  73 --
  74 1.7.10.4
  75