mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 05:45:53 +03:00
ramips: force word write on flashes with AMD cmdset (#9252)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27385 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
db3a7e64a2
commit
a46ef02052
@ -0,0 +1,70 @@
|
|||||||
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
#include <linux/mtd/xip.h>
|
||||||
|
|
||||||
|
#define AMD_BOOTLOC_BUG
|
||||||
|
-#define FORCE_WORD_WRITE 0
|
||||||
|
+#define FORCE_WORD_WRITE 1
|
||||||
|
|
||||||
|
#define MAX_WORD_RETRIES 3
|
||||||
|
|
||||||
|
@@ -50,7 +50,9 @@
|
||||||
|
|
||||||
|
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
||||||
|
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||||
|
+#if !FORCE_WORD_WRITE
|
||||||
|
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||||
|
+#endif
|
||||||
|
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
|
||||||
|
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
|
||||||
|
static void cfi_amdstd_sync (struct mtd_info *);
|
||||||
|
@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !FORCE_WORD_WRITE
|
||||||
|
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
|
||||||
|
{
|
||||||
|
struct map_info *map = mtd->priv;
|
||||||
|
@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru
|
||||||
|
mtd->write = cfi_amdstd_write_buffers;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#endif /* !FORCE_WORD_WRITE */
|
||||||
|
|
||||||
|
/* Atmel chips don't use the same PRI format as AMD chips */
|
||||||
|
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
|
||||||
|
@@ -472,7 +476,7 @@ struct mtd_info *cfi_cmdset_0002(struct
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4
|
||||||
|
- * see: Spec 1.3 http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19
|
||||||
|
+ * see: Spec 1.3 http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19
|
||||||
|
* http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
|
||||||
|
* Spec 1.4 http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf, page 9
|
||||||
|
*/
|
||||||
|
@@ -1386,6 +1390,7 @@ static int cfi_amdstd_write_words(struct
|
||||||
|
/*
|
||||||
|
* FIXME: interleaved mode not tested, and probably not supported!
|
||||||
|
*/
|
||||||
|
+#if !FORCE_WORD_WRITE
|
||||||
|
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
||||||
|
unsigned long adr, const u_char *buf,
|
||||||
|
int len)
|
||||||
|
@@ -1496,7 +1501,6 @@ static int __xipram do_write_buffer(stru
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
||||||
|
size_t *retlen, const u_char *buf)
|
||||||
|
{
|
||||||
|
@@ -1575,6 +1579,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+#endif /* !FORCE_WORD_WRITE */
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
Loading…
Reference in New Issue
Block a user