]> git.kernelconcepts.de Git - karo-tx-uboot.git/blob - drivers/mtd/cfi_flash.c
cfi: Check for blank before erase
[karo-tx-uboot.git] / drivers / mtd / cfi_flash.c
1 /*
2  * (C) Copyright 2002-2004
3  * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com
4  *
5  * Copyright (C) 2003 Arabella Software Ltd.
6  * Yuli Barcohen <yuli@arabellasw.com>
7  *
8  * Copyright (C) 2004
9  * Ed Okerson
10  *
11  * Copyright (C) 2006
12  * Tolunay Orkun <listmember@orkun.us>
13  *
14  * See file CREDITS for list of people who contributed to this
15  * project.
16  *
17  * This program is free software; you can redistribute it and/or
18  * modify it under the terms of the GNU General Public License as
19  * published by the Free Software Foundation; either version 2 of
20  * the License, or (at your option) any later version.
21  *
22  * This program is distributed in the hope that it will be useful,
23  * but WITHOUT ANY WARRANTY; without even the implied warranty of
24  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
25  * GNU General Public License for more details.
26  *
27  * You should have received a copy of the GNU General Public License
28  * along with this program; if not, write to the Free Software
29  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
30  * MA 02111-1307 USA
31  *
32  */
33
34 /* The DEBUG define must be before common to enable debugging */
35 /* #define DEBUG        */
36
37 #include <common.h>
38 #include <asm/processor.h>
39 #include <asm/io.h>
40 #include <asm/byteorder.h>
41 #include <environment.h>
42 #include <mtd/cfi_flash.h>
43 #include <watchdog.h>
44
45 /*
46  * This file implements a Common Flash Interface (CFI) driver for
47  * U-Boot.
48  *
49  * The width of the port and the width of the chips are determined at
50  * initialization.  These widths are used to calculate the address for
51  * access CFI data structures.
52  *
53  * References
54  * JEDEC Standard JESD68 - Common Flash Interface (CFI)
55  * JEDEC Standard JEP137-A Common Flash Interface (CFI) ID Codes
56  * Intel Application Note 646 Common Flash Interface (CFI) and Command Sets
57  * Intel 290667-008 3 Volt Intel StrataFlash Memory datasheet
58  * AMD CFI Specification, Release 2.0 December 1, 2001
59  * AMD/Spansion Application Note: Migration from Single-byte to Three-byte
60  *   Device IDs, Publication Number 25538 Revision A, November 8, 2001
61  *
62  * Define CONFIG_SYS_WRITE_SWAPPED_DATA, if you have to swap the Bytes between
63  * reading and writing ... (yes there is such a Hardware).
64  */
65
66 static uint flash_offset_cfi[2] = { FLASH_OFFSET_CFI, FLASH_OFFSET_CFI_ALT };
67 #ifdef CONFIG_FLASH_CFI_MTD
68 static uint flash_verbose = 1;
69 #else
70 #define flash_verbose 1
71 #endif
72
73 flash_info_t flash_info[CFI_MAX_FLASH_BANKS];   /* FLASH chips info */
74
75 /*
76  * Check if chip width is defined. If not, start detecting with 8bit.
77  */
78 #ifndef CONFIG_SYS_FLASH_CFI_WIDTH
79 #define CONFIG_SYS_FLASH_CFI_WIDTH      FLASH_CFI_8BIT
80 #endif
81
82 /*
83  * 0xffff is an undefined value for the configuration register. When
84  * this value is returned, the configuration register shall not be
85  * written at all (default mode).
86  */
87 static u16 cfi_flash_config_reg(int i)
88 {
89 #ifdef CONFIG_SYS_CFI_FLASH_CONFIG_REGS
90         return ((u16 [])CONFIG_SYS_CFI_FLASH_CONFIG_REGS)[i];
91 #else
92         return 0xffff;
93 #endif
94 }
95
96 #if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT)
97 int cfi_flash_num_flash_banks = CONFIG_SYS_MAX_FLASH_BANKS_DETECT;
98 #endif
99
100 static phys_addr_t __cfi_flash_bank_addr(int i)
101 {
102         return ((phys_addr_t [])CONFIG_SYS_FLASH_BANKS_LIST)[i];
103 }
104 phys_addr_t cfi_flash_bank_addr(int i)
105         __attribute__((weak, alias("__cfi_flash_bank_addr")));
106
107 static unsigned long __cfi_flash_bank_size(int i)
108 {
109 #ifdef CONFIG_SYS_FLASH_BANKS_SIZES
110         return ((unsigned long [])CONFIG_SYS_FLASH_BANKS_SIZES)[i];
111 #else
112         return 0;
113 #endif
114 }
115 unsigned long cfi_flash_bank_size(int i)
116         __attribute__((weak, alias("__cfi_flash_bank_size")));
117
118 static void __flash_write8(u8 value, void *addr)
119 {
120         __raw_writeb(value, addr);
121 }
122
123 static void __flash_write16(u16 value, void *addr)
124 {
125         __raw_writew(value, addr);
126 }
127
128 static void __flash_write32(u32 value, void *addr)
129 {
130         __raw_writel(value, addr);
131 }
132
133 static void __flash_write64(u64 value, void *addr)
134 {
135         /* No architectures currently implement __raw_writeq() */
136         *(volatile u64 *)addr = value;
137 }
138
139 static u8 __flash_read8(void *addr)
140 {
141         return __raw_readb(addr);
142 }
143
144 static u16 __flash_read16(void *addr)
145 {
146         return __raw_readw(addr);
147 }
148
149 static u32 __flash_read32(void *addr)
150 {
151         return __raw_readl(addr);
152 }
153
154 static u64 __flash_read64(void *addr)
155 {
156         /* No architectures currently implement __raw_readq() */
157         return *(volatile u64 *)addr;
158 }
159
160 #ifdef CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
161 void flash_write8(u8 value, void *addr)__attribute__((weak, alias("__flash_write8")));
162 void flash_write16(u16 value, void *addr)__attribute__((weak, alias("__flash_write16")));
163 void flash_write32(u32 value, void *addr)__attribute__((weak, alias("__flash_write32")));
164 void flash_write64(u64 value, void *addr)__attribute__((weak, alias("__flash_write64")));
165 u8 flash_read8(void *addr)__attribute__((weak, alias("__flash_read8")));
166 u16 flash_read16(void *addr)__attribute__((weak, alias("__flash_read16")));
167 u32 flash_read32(void *addr)__attribute__((weak, alias("__flash_read32")));
168 u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));
169 #else
170 #define flash_write8    __flash_write8
171 #define flash_write16   __flash_write16
172 #define flash_write32   __flash_write32
173 #define flash_write64   __flash_write64
174 #define flash_read8     __flash_read8
175 #define flash_read16    __flash_read16
176 #define flash_read32    __flash_read32
177 #define flash_read64    __flash_read64
178 #endif
179
180 /*-----------------------------------------------------------------------
181  */
182 #if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
183 flash_info_t *flash_get_info(ulong base)
184 {
185         int i;
186         flash_info_t *info = NULL;
187
188         for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
189                 info = & flash_info[i];
190                 if (info->size && info->start[0] <= base &&
191                     base <= info->start[0] + info->size - 1)
192                         break;
193         }
194
195         return info;
196 }
197 #endif
198
199 unsigned long flash_sector_size(flash_info_t *info, flash_sect_t sect)
200 {
201         if (sect != (info->sector_count - 1))
202                 return info->start[sect + 1] - info->start[sect];
203         else
204                 return info->start[0] + info->size - info->start[sect];
205 }
206
207 /*-----------------------------------------------------------------------
208  * create an address based on the offset and the port width
209  */
210 static inline void *
211 flash_map (flash_info_t * info, flash_sect_t sect, uint offset)
212 {
213         unsigned int byte_offset = offset * info->portwidth;
214
215         return (void *)(info->start[sect] + byte_offset);
216 }
217
218 static inline void flash_unmap(flash_info_t *info, flash_sect_t sect,
219                 unsigned int offset, void *addr)
220 {
221 }
222
223 /*-----------------------------------------------------------------------
224  * make a proper sized command based on the port and chip widths
225  */
226 static void flash_make_cmd(flash_info_t *info, u32 cmd, void *cmdbuf)
227 {
228         int i;
229         int cword_offset;
230         int cp_offset;
231 #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
232         u32 cmd_le = cpu_to_le32(cmd);
233 #endif
234         uchar val;
235         uchar *cp = (uchar *) cmdbuf;
236
237         for (i = info->portwidth; i > 0; i--){
238                 cword_offset = (info->portwidth-i)%info->chipwidth;
239 #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
240                 cp_offset = info->portwidth - i;
241                 val = *((uchar*)&cmd_le + cword_offset);
242 #else
243                 cp_offset = i - 1;
244                 val = *((uchar*)&cmd + sizeof(u32) - cword_offset - 1);
245 #endif
246                 cp[cp_offset] = (cword_offset >= sizeof(u32)) ? 0x00 : val;
247         }
248 }
249
250 #ifdef DEBUG
251 /*-----------------------------------------------------------------------
252  * Debug support
253  */
254 static void print_longlong (char *str, unsigned long long data)
255 {
256         int i;
257         char *cp;
258
259         cp = (char *) &data;
260         for (i = 0; i < 8; i++)
261                 sprintf (&str[i * 2], "%2.2x", *cp++);
262 }
263
264 static void flash_printqry (struct cfi_qry *qry)
265 {
266         u8 *p = (u8 *)qry;
267         int x, y;
268
269         for (x = 0; x < sizeof(struct cfi_qry); x += 16) {
270                 debug("%02x : ", x);
271                 for (y = 0; y < 16; y++)
272                         debug("%2.2x ", p[x + y]);
273                 debug(" ");
274                 for (y = 0; y < 16; y++) {
275                         unsigned char c = p[x + y];
276                         if (c >= 0x20 && c <= 0x7e)
277                                 debug("%c", c);
278                         else
279                                 debug(".");
280                 }
281                 debug("\n");
282         }
283 }
284 #endif
285
286
287 /*-----------------------------------------------------------------------
288  * read a character at a port width address
289  */
290 static inline uchar flash_read_uchar (flash_info_t * info, uint offset)
291 {
292         uchar *cp;
293         uchar retval;
294
295         cp = flash_map (info, 0, offset);
296 #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
297         retval = flash_read8(cp);
298 #else
299         retval = flash_read8(cp + info->portwidth - 1);
300 #endif
301         flash_unmap (info, 0, offset, cp);
302         return retval;
303 }
304
305 /*-----------------------------------------------------------------------
306  * read a word at a port width address, assume 16bit bus
307  */
308 static inline ushort flash_read_word (flash_info_t * info, uint offset)
309 {
310         ushort *addr, retval;
311
312         addr = flash_map (info, 0, offset);
313         retval = flash_read16 (addr);
314         flash_unmap (info, 0, offset, addr);
315         return retval;
316 }
317
318
319 /*-----------------------------------------------------------------------
320  * read a long word by picking the least significant byte of each maximum
321  * port size word. Swap for ppc format.
322  */
323 static ulong flash_read_long (flash_info_t * info, flash_sect_t sect,
324                               uint offset)
325 {
326         uchar *addr;
327         ulong retval;
328
329 #ifdef DEBUG
330         int x;
331 #endif
332         addr = flash_map (info, sect, offset);
333
334 #ifdef DEBUG
335         debug ("long addr is at %p info->portwidth = %d\n", addr,
336                info->portwidth);
337         for (x = 0; x < 4 * info->portwidth; x++) {
338                 debug ("addr[%x] = 0x%x\n", x, flash_read8(addr + x));
339         }
340 #endif
341 #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
342         retval = ((flash_read8(addr) << 16) |
343                   (flash_read8(addr + info->portwidth) << 24) |
344                   (flash_read8(addr + 2 * info->portwidth)) |
345                   (flash_read8(addr + 3 * info->portwidth) << 8));
346 #else
347         retval = ((flash_read8(addr + 2 * info->portwidth - 1) << 24) |
348                   (flash_read8(addr + info->portwidth - 1) << 16) |
349                   (flash_read8(addr + 4 * info->portwidth - 1) << 8) |
350                   (flash_read8(addr + 3 * info->portwidth - 1)));
351 #endif
352         flash_unmap(info, sect, offset, addr);
353
354         return retval;
355 }
356
357 /*
358  * Write a proper sized command to the correct address
359  */
360 void flash_write_cmd (flash_info_t * info, flash_sect_t sect,
361                       uint offset, u32 cmd)
362 {
363
364         void *addr;
365         cfiword_t cword;
366
367         addr = flash_map (info, sect, offset);
368         flash_make_cmd (info, cmd, &cword);
369         switch (info->portwidth) {
370         case FLASH_CFI_8BIT:
371                 debug ("fwc addr %p cmd %x %x 8bit x %d bit\n", addr, cmd,
372                        cword.c, info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
373                 flash_write8(cword.c, addr);
374                 break;
375         case FLASH_CFI_16BIT:
376                 debug ("fwc addr %p cmd %x %4.4x 16bit x %d bit\n", addr,
377                        cmd, cword.w,
378                        info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
379                 flash_write16(cword.w, addr);
380                 break;
381         case FLASH_CFI_32BIT:
382                 debug ("fwc addr %p cmd %x %8.8lx 32bit x %d bit\n", addr,
383                        cmd, cword.l,
384                        info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
385                 flash_write32(cword.l, addr);
386                 break;
387         case FLASH_CFI_64BIT:
388 #ifdef DEBUG
389                 {
390                         char str[20];
391
392                         print_longlong (str, cword.ll);
393
394                         debug ("fwrite addr %p cmd %x %s 64 bit x %d bit\n",
395                                addr, cmd, str,
396                                info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
397                 }
398 #endif
399                 flash_write64(cword.ll, addr);
400                 break;
401         }
402
403         /* Ensure all the instructions are fully finished */
404         sync();
405
406         flash_unmap(info, sect, offset, addr);
407 }
408
409 static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect)
410 {
411         flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_UNLOCK_START);
412         flash_write_cmd (info, sect, info->addr_unlock2, AMD_CMD_UNLOCK_ACK);
413 }
414
415 /*-----------------------------------------------------------------------
416  */
417 static int flash_isequal (flash_info_t * info, flash_sect_t sect,
418                           uint offset, uchar cmd)
419 {
420         void *addr;
421         cfiword_t cword;
422         int retval;
423
424         addr = flash_map (info, sect, offset);
425         flash_make_cmd (info, cmd, &cword);
426
427         debug ("is= cmd %x(%c) addr %p ", cmd, cmd, addr);
428         switch (info->portwidth) {
429         case FLASH_CFI_8BIT:
430                 debug ("is= %x %x\n", flash_read8(addr), cword.c);
431                 retval = (flash_read8(addr) == cword.c);
432                 break;
433         case FLASH_CFI_16BIT:
434                 debug ("is= %4.4x %4.4x\n", flash_read16(addr), cword.w);
435                 retval = (flash_read16(addr) == cword.w);
436                 break;
437         case FLASH_CFI_32BIT:
438                 debug ("is= %8.8x %8.8lx\n", flash_read32(addr), cword.l);
439                 retval = (flash_read32(addr) == cword.l);
440                 break;
441         case FLASH_CFI_64BIT:
442 #ifdef DEBUG
443                 {
444                         char str1[20];
445                         char str2[20];
446
447                         print_longlong (str1, flash_read64(addr));
448                         print_longlong (str2, cword.ll);
449                         debug ("is= %s %s\n", str1, str2);
450                 }
451 #endif
452                 retval = (flash_read64(addr) == cword.ll);
453                 break;
454         default:
455                 retval = 0;
456                 break;
457         }
458         flash_unmap(info, sect, offset, addr);
459
460         return retval;
461 }
462
463 /*-----------------------------------------------------------------------
464  */
465 static int flash_isset (flash_info_t * info, flash_sect_t sect,
466                         uint offset, uchar cmd)
467 {
468         void *addr;
469         cfiword_t cword;
470         int retval;
471
472         addr = flash_map (info, sect, offset);
473         flash_make_cmd (info, cmd, &cword);
474         switch (info->portwidth) {
475         case FLASH_CFI_8BIT:
476                 retval = ((flash_read8(addr) & cword.c) == cword.c);
477                 break;
478         case FLASH_CFI_16BIT:
479                 retval = ((flash_read16(addr) & cword.w) == cword.w);
480                 break;
481         case FLASH_CFI_32BIT:
482                 retval = ((flash_read32(addr) & cword.l) == cword.l);
483                 break;
484         case FLASH_CFI_64BIT:
485                 retval = ((flash_read64(addr) & cword.ll) == cword.ll);
486                 break;
487         default:
488                 retval = 0;
489                 break;
490         }
491         flash_unmap(info, sect, offset, addr);
492
493         return retval;
494 }
495
496 /*-----------------------------------------------------------------------
497  */
498 static int flash_toggle (flash_info_t * info, flash_sect_t sect,
499                          uint offset, uchar cmd)
500 {
501         void *addr;
502         cfiword_t cword;
503         int retval;
504
505         addr = flash_map (info, sect, offset);
506         flash_make_cmd (info, cmd, &cword);
507         switch (info->portwidth) {
508         case FLASH_CFI_8BIT:
509                 retval = flash_read8(addr) != flash_read8(addr);
510                 break;
511         case FLASH_CFI_16BIT:
512                 retval = flash_read16(addr) != flash_read16(addr);
513                 break;
514         case FLASH_CFI_32BIT:
515                 retval = flash_read32(addr) != flash_read32(addr);
516                 break;
517         case FLASH_CFI_64BIT:
518                 retval = ( (flash_read32( addr ) != flash_read32( addr )) ||
519                            (flash_read32(addr+4) != flash_read32(addr+4)) );
520                 break;
521         default:
522                 retval = 0;
523                 break;
524         }
525         flash_unmap(info, sect, offset, addr);
526
527         return retval;
528 }
529
530 /*
531  * flash_is_busy - check to see if the flash is busy
532  *
533  * This routine checks the status of the chip and returns true if the
534  * chip is busy.
535  */
536 static int flash_is_busy (flash_info_t * info, flash_sect_t sect)
537 {
538         int retval;
539
540         switch (info->vendor) {
541         case CFI_CMDSET_INTEL_PROG_REGIONS:
542         case CFI_CMDSET_INTEL_STANDARD:
543         case CFI_CMDSET_INTEL_EXTENDED:
544                 retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE);
545                 break;
546         case CFI_CMDSET_AMD_STANDARD:
547         case CFI_CMDSET_AMD_EXTENDED:
548 #ifdef CONFIG_FLASH_CFI_LEGACY
549         case CFI_CMDSET_AMD_LEGACY:
550 #endif
551                 retval = flash_toggle (info, sect, 0, AMD_STATUS_TOGGLE);
552                 break;
553         default:
554                 retval = 0;
555         }
556         debug ("flash_is_busy: %d\n", retval);
557         return retval;
558 }
559
560 /*-----------------------------------------------------------------------
561  *  wait for XSR.7 to be set. Time out with an error if it does not.
562  *  This routine does not set the flash to read-array mode.
563  */
564 static int flash_status_check (flash_info_t * info, flash_sect_t sector,
565                                ulong tout, char *prompt)
566 {
567         ulong start;
568
569 #if CONFIG_SYS_HZ != 1000
570         if ((ulong)CONFIG_SYS_HZ > 100000)
571                 tout *= (ulong)CONFIG_SYS_HZ / 1000;  /* for a big HZ, avoid overflow */
572         else
573                 tout = DIV_ROUND_UP(tout * (ulong)CONFIG_SYS_HZ, 1000);
574 #endif
575
576         /* Wait for command completion */
577 #ifdef CONFIG_SYS_LOW_RES_TIMER
578         reset_timer();
579 #endif
580         start = get_timer (0);
581         WATCHDOG_RESET();
582         while (flash_is_busy (info, sector)) {
583                 if (get_timer (start) > tout) {
584                         printf ("Flash %s timeout at address %lx data %lx\n",
585                                 prompt, info->start[sector],
586                                 flash_read_long (info, sector, 0));
587                         flash_write_cmd (info, sector, 0, info->cmd_reset);
588                         udelay(1);
589                         return ERR_TIMOUT;
590                 }
591                 udelay (1);             /* also triggers watchdog */
592         }
593         return ERR_OK;
594 }
595
596 /*-----------------------------------------------------------------------
597  * Wait for XSR.7 to be set, if it times out print an error, otherwise
598  * do a full status check.
599  *
600  * This routine sets the flash to read-array mode.
601  */
602 static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
603                                     ulong tout, char *prompt)
604 {
605         int retcode;
606
607         retcode = flash_status_check (info, sector, tout, prompt);
608         switch (info->vendor) {
609         case CFI_CMDSET_INTEL_PROG_REGIONS:
610         case CFI_CMDSET_INTEL_EXTENDED:
611         case CFI_CMDSET_INTEL_STANDARD:
612                 if ((retcode != ERR_OK)
613                     && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
614                         retcode = ERR_INVAL;
615                         printf ("Flash %s error at address %lx\n", prompt,
616                                 info->start[sector]);
617                         if (flash_isset (info, sector, 0, FLASH_STATUS_ECLBS |
618                                          FLASH_STATUS_PSLBS)) {
619                                 puts ("Command Sequence Error.\n");
620                         } else if (flash_isset (info, sector, 0,
621                                                 FLASH_STATUS_ECLBS)) {
622                                 puts ("Block Erase Error.\n");
623                                 retcode = ERR_NOT_ERASED;
624                         } else if (flash_isset (info, sector, 0,
625                                                 FLASH_STATUS_PSLBS)) {
626                                 puts ("Locking Error\n");
627                         }
628                         if (flash_isset (info, sector, 0, FLASH_STATUS_DPS)) {
629                                 puts ("Block locked.\n");
630                                 retcode = ERR_PROTECTED;
631                         }
632                         if (flash_isset (info, sector, 0, FLASH_STATUS_VPENS))
633                                 puts ("Vpp Low Error.\n");
634                 }
635                 flash_write_cmd (info, sector, 0, info->cmd_reset);
636                 udelay(1);
637                 break;
638         default:
639                 break;
640         }
641         return retcode;
642 }
643
644 static int use_flash_status_poll(flash_info_t *info)
645 {
646 #ifdef CONFIG_SYS_CFI_FLASH_STATUS_POLL
647         if (info->vendor == CFI_CMDSET_AMD_EXTENDED ||
648             info->vendor == CFI_CMDSET_AMD_STANDARD)
649                 return 1;
650 #endif
651         return 0;
652 }
653
654 static int flash_status_poll(flash_info_t *info, void *src, void *dst,
655                              ulong tout, char *prompt)
656 {
657 #ifdef CONFIG_SYS_CFI_FLASH_STATUS_POLL
658         ulong start;
659         int ready;
660
661 #if CONFIG_SYS_HZ != 1000
662         if ((ulong)CONFIG_SYS_HZ > 100000)
663                 tout *= (ulong)CONFIG_SYS_HZ / 1000;  /* for a big HZ, avoid overflow */
664         else
665                 tout = DIV_ROUND_UP(tout * (ulong)CONFIG_SYS_HZ, 1000);
666 #endif
667
668         /* Wait for command completion */
669 #ifdef CONFIG_SYS_LOW_RES_TIMER
670         reset_timer();
671 #endif
672         start = get_timer(0);
673         WATCHDOG_RESET();
674         while (1) {
675                 switch (info->portwidth) {
676                 case FLASH_CFI_8BIT:
677                         ready = flash_read8(dst) == flash_read8(src);
678                         break;
679                 case FLASH_CFI_16BIT:
680                         ready = flash_read16(dst) == flash_read16(src);
681                         break;
682                 case FLASH_CFI_32BIT:
683                         ready = flash_read32(dst) == flash_read32(src);
684                         break;
685                 case FLASH_CFI_64BIT:
686                         ready = flash_read64(dst) == flash_read64(src);
687                         break;
688                 default:
689                         ready = 0;
690                         break;
691                 }
692                 if (ready)
693                         break;
694                 if (get_timer(start) > tout) {
695                         printf("Flash %s timeout at address %lx data %lx\n",
696                                prompt, (ulong)dst, (ulong)flash_read8(dst));
697                         return ERR_TIMOUT;
698                 }
699                 udelay(1);              /* also triggers watchdog */
700         }
701 #endif /* CONFIG_SYS_CFI_FLASH_STATUS_POLL */
702         return ERR_OK;
703 }
704
705 /*-----------------------------------------------------------------------
706  */
707 static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c)
708 {
709 #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
710         unsigned short  w;
711         unsigned int    l;
712         unsigned long long ll;
713 #endif
714
715         switch (info->portwidth) {
716         case FLASH_CFI_8BIT:
717                 cword->c = c;
718                 break;
719         case FLASH_CFI_16BIT:
720 #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
721                 w = c;
722                 w <<= 8;
723                 cword->w = (cword->w >> 8) | w;
724 #else
725                 cword->w = (cword->w << 8) | c;
726 #endif
727                 break;
728         case FLASH_CFI_32BIT:
729 #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
730                 l = c;
731                 l <<= 24;
732                 cword->l = (cword->l >> 8) | l;
733 #else
734                 cword->l = (cword->l << 8) | c;
735 #endif
736                 break;
737         case FLASH_CFI_64BIT:
738 #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA)
739                 ll = c;
740                 ll <<= 56;
741                 cword->ll = (cword->ll >> 8) | ll;
742 #else
743                 cword->ll = (cword->ll << 8) | c;
744 #endif
745                 break;
746         }
747 }
748
749 /*
750  * Loop through the sector table starting from the previously found sector.
751  * Searches forwards or backwards, dependent on the passed address.
752  */
753 static flash_sect_t find_sector (flash_info_t * info, ulong addr)
754 {
755         static flash_sect_t saved_sector = 0; /* previously found sector */
756         static flash_info_t *saved_info = 0; /* previously used flash bank */
757         flash_sect_t sector = saved_sector;
758
759         if ((info != saved_info) || (sector >= info->sector_count))
760                 sector = 0;
761
762         while ((info->start[sector] < addr)
763                         && (sector < info->sector_count - 1))
764                 sector++;
765         while ((info->start[sector] > addr) && (sector > 0))
766                 /*
767                  * also decrements the sector in case of an overshot
768                  * in the first loop
769                  */
770                 sector--;
771
772         saved_sector = sector;
773         saved_info = info;
774         return sector;
775 }
776
777 /*-----------------------------------------------------------------------
778  */
779 static int flash_write_cfiword (flash_info_t * info, ulong dest,
780                                 cfiword_t cword)
781 {
782         void *dstaddr = (void *)dest;
783         int flag;
784         flash_sect_t sect = 0;
785         char sect_found = 0;
786
787         /* Check if Flash is (sufficiently) erased */
788         switch (info->portwidth) {
789         case FLASH_CFI_8BIT:
790                 flag = ((flash_read8(dstaddr) & cword.c) == cword.c);
791                 break;
792         case FLASH_CFI_16BIT:
793                 flag = ((flash_read16(dstaddr) & cword.w) == cword.w);
794                 break;
795         case FLASH_CFI_32BIT:
796                 flag = ((flash_read32(dstaddr) & cword.l) == cword.l);
797                 break;
798         case FLASH_CFI_64BIT:
799                 flag = ((flash_read64(dstaddr) & cword.ll) == cword.ll);
800                 break;
801         default:
802                 flag = 0;
803                 break;
804         }
805         if (!flag)
806                 return ERR_NOT_ERASED;
807
808         /* Disable interrupts which might cause a timeout here */
809         flag = disable_interrupts ();
810
811         switch (info->vendor) {
812         case CFI_CMDSET_INTEL_PROG_REGIONS:
813         case CFI_CMDSET_INTEL_EXTENDED:
814         case CFI_CMDSET_INTEL_STANDARD:
815                 flash_write_cmd (info, 0, 0, FLASH_CMD_CLEAR_STATUS);
816                 flash_write_cmd (info, 0, 0, FLASH_CMD_WRITE);
817                 break;
818         case CFI_CMDSET_AMD_EXTENDED:
819         case CFI_CMDSET_AMD_STANDARD:
820                 sect = find_sector(info, dest);
821                 flash_unlock_seq (info, sect);
822                 flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE);
823                 sect_found = 1;
824                 break;
825 #ifdef CONFIG_FLASH_CFI_LEGACY
826         case CFI_CMDSET_AMD_LEGACY:
827                 sect = find_sector(info, dest);
828                 flash_unlock_seq (info, 0);
829                 flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_WRITE);
830                 sect_found = 1;
831                 break;
832 #endif
833         }
834
835         switch (info->portwidth) {
836         case FLASH_CFI_8BIT:
837                 flash_write8(cword.c, dstaddr);
838                 break;
839         case FLASH_CFI_16BIT:
840                 flash_write16(cword.w, dstaddr);
841                 break;
842         case FLASH_CFI_32BIT:
843                 flash_write32(cword.l, dstaddr);
844                 break;
845         case FLASH_CFI_64BIT:
846                 flash_write64(cword.ll, dstaddr);
847                 break;
848         }
849
850         /* re-enable interrupts if necessary */
851         if (flag)
852                 enable_interrupts ();
853
854         if (!sect_found)
855                 sect = find_sector (info, dest);
856
857         if (use_flash_status_poll(info))
858                 return flash_status_poll(info, &cword, dstaddr,
859                                          info->write_tout, "write");
860         else
861                 return flash_full_status_check(info, sect,
862                                                info->write_tout, "write");
863 }
864
865 #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
866
867 static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
868                                   int len)
869 {
870         flash_sect_t sector;
871         int cnt;
872         int retcode;
873         void *src = cp;
874         void *dst = (void *)dest;
875         void *dst2 = dst;
876         int flag = 1;
877         uint offset = 0;
878         unsigned int shift;
879         uchar write_cmd;
880
881         switch (info->portwidth) {
882         case FLASH_CFI_8BIT:
883                 shift = 0;
884                 break;
885         case FLASH_CFI_16BIT:
886                 shift = 1;
887                 break;
888         case FLASH_CFI_32BIT:
889                 shift = 2;
890                 break;
891         case FLASH_CFI_64BIT:
892                 shift = 3;
893                 break;
894         default:
895                 retcode = ERR_INVAL;
896                 goto out_unmap;
897         }
898
899         cnt = len >> shift;
900
901         while ((cnt-- > 0) && (flag == 1)) {
902                 switch (info->portwidth) {
903                 case FLASH_CFI_8BIT:
904                         flag = ((flash_read8(dst2) & flash_read8(src)) ==
905                                 flash_read8(src));
906                         src += 1, dst2 += 1;
907                         break;
908                 case FLASH_CFI_16BIT:
909                         flag = ((flash_read16(dst2) & flash_read16(src)) ==
910                                 flash_read16(src));
911                         src += 2, dst2 += 2;
912                         break;
913                 case FLASH_CFI_32BIT:
914                         flag = ((flash_read32(dst2) & flash_read32(src)) ==
915                                 flash_read32(src));
916                         src += 4, dst2 += 4;
917                         break;
918                 case FLASH_CFI_64BIT:
919                         flag = ((flash_read64(dst2) & flash_read64(src)) ==
920                                 flash_read64(src));
921                         src += 8, dst2 += 8;
922                         break;
923                 }
924         }
925         if (!flag) {
926                 retcode = ERR_NOT_ERASED;
927                 goto out_unmap;
928         }
929
930         src = cp;
931         sector = find_sector (info, dest);
932
933         switch (info->vendor) {
934         case CFI_CMDSET_INTEL_PROG_REGIONS:
935         case CFI_CMDSET_INTEL_STANDARD:
936         case CFI_CMDSET_INTEL_EXTENDED:
937                 write_cmd = (info->vendor == CFI_CMDSET_INTEL_PROG_REGIONS) ?
938                                         FLASH_CMD_WRITE_BUFFER_PROG : FLASH_CMD_WRITE_TO_BUFFER;
939                 flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
940                 flash_write_cmd (info, sector, 0, FLASH_CMD_READ_STATUS);
941                 flash_write_cmd (info, sector, 0, write_cmd);
942                 retcode = flash_status_check (info, sector,
943                                               info->buffer_write_tout,
944                                               "write to buffer");
945                 if (retcode == ERR_OK) {
946                         /* reduce the number of loops by the width of
947                          * the port */
948                         cnt = len >> shift;
949                         flash_write_cmd (info, sector, 0, cnt - 1);
950                         while (cnt-- > 0) {
951                                 switch (info->portwidth) {
952                                 case FLASH_CFI_8BIT:
953                                         flash_write8(flash_read8(src), dst);
954                                         src += 1, dst += 1;
955                                         break;
956                                 case FLASH_CFI_16BIT:
957                                         flash_write16(flash_read16(src), dst);
958                                         src += 2, dst += 2;
959                                         break;
960                                 case FLASH_CFI_32BIT:
961                                         flash_write32(flash_read32(src), dst);
962                                         src += 4, dst += 4;
963                                         break;
964                                 case FLASH_CFI_64BIT:
965                                         flash_write64(flash_read64(src), dst);
966                                         src += 8, dst += 8;
967                                         break;
968                                 default:
969                                         retcode = ERR_INVAL;
970                                         goto out_unmap;
971                                 }
972                         }
973                         flash_write_cmd (info, sector, 0,
974                                          FLASH_CMD_WRITE_BUFFER_CONFIRM);
975                         retcode = flash_full_status_check (
976                                 info, sector, info->buffer_write_tout,
977                                 "buffer write");
978                 }
979
980                 break;
981
982         case CFI_CMDSET_AMD_STANDARD:
983         case CFI_CMDSET_AMD_EXTENDED:
984                 flash_unlock_seq(info,0);
985
986 #ifdef CONFIG_FLASH_SPANSION_S29WS_N
987                 offset = ((unsigned long)dst - info->start[sector]) >> shift;
988 #endif
989                 flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER);
990                 cnt = len >> shift;
991                 flash_write_cmd(info, sector, offset, cnt - 1);
992
993                 switch (info->portwidth) {
994                 case FLASH_CFI_8BIT:
995                         while (cnt-- > 0) {
996                                 flash_write8(flash_read8(src), dst);
997                                 src += 1, dst += 1;
998                         }
999                         break;
1000                 case FLASH_CFI_16BIT:
1001                         while (cnt-- > 0) {
1002                                 flash_write16(flash_read16(src), dst);
1003                                 src += 2, dst += 2;
1004                         }
1005                         break;
1006                 case FLASH_CFI_32BIT:
1007                         while (cnt-- > 0) {
1008                                 flash_write32(flash_read32(src), dst);
1009                                 src += 4, dst += 4;
1010                         }
1011                         break;
1012                 case FLASH_CFI_64BIT:
1013                         while (cnt-- > 0) {
1014                                 flash_write64(flash_read64(src), dst);
1015                                 src += 8, dst += 8;
1016                         }
1017                         break;
1018                 default:
1019                         retcode = ERR_INVAL;
1020                         goto out_unmap;
1021                 }
1022
1023                 flash_write_cmd (info, sector, 0, AMD_CMD_WRITE_BUFFER_CONFIRM);
1024                 if (use_flash_status_poll(info))
1025                         retcode = flash_status_poll(info, src - (1 << shift),
1026                                                     dst - (1 << shift),
1027                                                     info->buffer_write_tout,
1028                                                     "buffer write");
1029                 else
1030                         retcode = flash_full_status_check(info, sector,
1031                                                           info->buffer_write_tout,
1032                                                           "buffer write");
1033                 break;
1034
1035         default:
1036                 debug ("Unknown Command Set\n");
1037                 retcode = ERR_INVAL;
1038                 break;
1039         }
1040
1041 out_unmap:
1042         return retcode;
1043 }
1044 #endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
1045
1046
1047 /*-----------------------------------------------------------------------
1048  */
1049 int flash_erase (flash_info_t * info, int s_first, int s_last)
1050 {
1051         int rcode = 0;
1052         int prot;
1053         flash_sect_t sect;
1054         int st;
1055
1056         if (info->flash_id != FLASH_MAN_CFI) {
1057                 puts ("Can't erase unknown flash type - aborted\n");
1058                 return 1;
1059         }
1060         if ((s_first < 0) || (s_first > s_last)) {
1061                 puts ("- no sectors to erase\n");
1062                 return 1;
1063         }
1064
1065         prot = 0;
1066         for (sect = s_first; sect <= s_last; ++sect) {
1067                 if (info->protect[sect]) {
1068                         prot++;
1069                 }
1070         }
1071         if (prot) {
1072                 printf ("- Warning: %d protected sectors will not be erased!\n",
1073                         prot);
1074         } else if (flash_verbose) {
1075                 putc ('\n');
1076         }
1077
1078
1079         for (sect = s_first; sect <= s_last; sect++) {
1080                 if (info->protect[sect] == 0) { /* not protected */
1081 #ifdef CONFIG_SYS_FLASH_CHECK_BLANK_BEFORE_ERASE
1082                         int k;
1083                         int size;
1084                         int erased;
1085                         u32 *flash;
1086
1087                         /*
1088                          * Check if whole sector is erased
1089                          */
1090                         size = flash_sector_size(info, sect);
1091                         erased = 1;
1092                         flash = (u32 *)info->start[sect];
1093                         /* divide by 4 for longword access */
1094                         size = size >> 2;
1095                         for (k = 0; k < size; k++) {
1096                                 if (flash_read32(flash++) != 0xffffffff) {
1097                                         erased = 0;
1098                                         break;
1099                                 }
1100                         }
1101                         if (erased) {
1102                                 if (flash_verbose)
1103                                         putc(',');
1104                                 continue;
1105                         }
1106 #endif
1107                         switch (info->vendor) {
1108                         case CFI_CMDSET_INTEL_PROG_REGIONS:
1109                         case CFI_CMDSET_INTEL_STANDARD:
1110                         case CFI_CMDSET_INTEL_EXTENDED:
1111                                 flash_write_cmd (info, sect, 0,
1112                                                  FLASH_CMD_CLEAR_STATUS);
1113                                 flash_write_cmd (info, sect, 0,
1114                                                  FLASH_CMD_BLOCK_ERASE);
1115                                 flash_write_cmd (info, sect, 0,
1116                                                  FLASH_CMD_ERASE_CONFIRM);
1117                                 break;
1118                         case CFI_CMDSET_AMD_STANDARD:
1119                         case CFI_CMDSET_AMD_EXTENDED:
1120                                 flash_unlock_seq (info, sect);
1121                                 flash_write_cmd (info, sect,
1122                                                 info->addr_unlock1,
1123                                                 AMD_CMD_ERASE_START);
1124                                 flash_unlock_seq (info, sect);
1125                                 flash_write_cmd (info, sect, 0,
1126                                                  AMD_CMD_ERASE_SECTOR);
1127                                 break;
1128 #ifdef CONFIG_FLASH_CFI_LEGACY
1129                         case CFI_CMDSET_AMD_LEGACY:
1130                                 flash_unlock_seq (info, 0);
1131                                 flash_write_cmd (info, 0, info->addr_unlock1,
1132                                                 AMD_CMD_ERASE_START);
1133                                 flash_unlock_seq (info, 0);
1134                                 flash_write_cmd (info, sect, 0,
1135                                                 AMD_CMD_ERASE_SECTOR);
1136                                 break;
1137 #endif
1138                         default:
1139                                 debug ("Unkown flash vendor %d\n",
1140                                        info->vendor);
1141                                 break;
1142                         }
1143
1144                         if (use_flash_status_poll(info)) {
1145                                 cfiword_t cword = (cfiword_t)0xffffffffffffffffULL;
1146                                 void *dest;
1147                                 dest = flash_map(info, sect, 0);
1148                                 st = flash_status_poll(info, &cword, dest,
1149                                                        info->erase_blk_tout, "erase");
1150                                 flash_unmap(info, sect, 0, dest);
1151                         } else
1152                                 st = flash_full_status_check(info, sect,
1153                                                              info->erase_blk_tout,
1154                                                              "erase");
1155                         if (st)
1156                                 rcode = 1;
1157                         else if (flash_verbose)
1158                                 putc ('.');
1159                 }
1160         }
1161
1162         if (flash_verbose)
1163                 puts (" done\n");
1164
1165         return rcode;
1166 }
1167
1168 #ifdef CONFIG_SYS_FLASH_EMPTY_INFO
1169 static int sector_erased(flash_info_t *info, int i)
1170 {
1171         int k;
1172         int size;
1173         u32 *flash;
1174
1175         /*
1176          * Check if whole sector is erased
1177          */
1178         size = flash_sector_size(info, i);
1179         flash = (u32 *)info->start[i];
1180         /* divide by 4 for longword access */
1181         size = size >> 2;
1182
1183         for (k = 0; k < size; k++) {
1184                 if (flash_read32(flash++) != 0xffffffff)
1185                         return 0;       /* not erased */
1186         }
1187
1188         return 1;                       /* erased */
1189 }
1190 #endif /* CONFIG_SYS_FLASH_EMPTY_INFO */
1191
1192 void flash_print_info (flash_info_t * info)
1193 {
1194         int i;
1195
1196         if (info->flash_id != FLASH_MAN_CFI) {
1197                 puts ("missing or unknown FLASH type\n");
1198                 return;
1199         }
1200
1201         printf ("%s flash (%d x %d)",
1202                 info->name,
1203                 (info->portwidth << 3), (info->chipwidth << 3));
1204         if (info->size < 1024*1024)
1205                 printf ("  Size: %ld kB in %d Sectors\n",
1206                         info->size >> 10, info->sector_count);
1207         else
1208                 printf ("  Size: %ld MB in %d Sectors\n",
1209                         info->size >> 20, info->sector_count);
1210         printf ("  ");
1211         switch (info->vendor) {
1212                 case CFI_CMDSET_INTEL_PROG_REGIONS:
1213                         printf ("Intel Prog Regions");
1214                         break;
1215                 case CFI_CMDSET_INTEL_STANDARD:
1216                         printf ("Intel Standard");
1217                         break;
1218                 case CFI_CMDSET_INTEL_EXTENDED:
1219                         printf ("Intel Extended");
1220                         break;
1221                 case CFI_CMDSET_AMD_STANDARD:
1222                         printf ("AMD Standard");
1223                         break;
1224                 case CFI_CMDSET_AMD_EXTENDED:
1225                         printf ("AMD Extended");
1226                         break;
1227 #ifdef CONFIG_FLASH_CFI_LEGACY
1228                 case CFI_CMDSET_AMD_LEGACY:
1229                         printf ("AMD Legacy");
1230                         break;
1231 #endif
1232                 default:
1233                         printf ("Unknown (%d)", info->vendor);
1234                         break;
1235         }
1236         printf (" command set, Manufacturer ID: 0x%02X, Device ID: 0x",
1237                 info->manufacturer_id);
1238         printf (info->chipwidth == FLASH_CFI_16BIT ? "%04X" : "%02X",
1239                 info->device_id);
1240         if ((info->device_id & 0xff) == 0x7E) {
1241                 printf(info->chipwidth == FLASH_CFI_16BIT ? "%04X" : "%02X",
1242                 info->device_id2);
1243         }
1244         printf ("\n  Erase timeout: %ld ms, write timeout: %ld ms\n",
1245                 info->erase_blk_tout,
1246                 info->write_tout);
1247         if (info->buffer_size > 1) {
1248                 printf ("  Buffer write timeout: %ld ms, "
1249                         "buffer size: %d bytes\n",
1250                 info->buffer_write_tout,
1251                 info->buffer_size);
1252         }
1253
1254         puts ("\n  Sector Start Addresses:");
1255         for (i = 0; i < info->sector_count; ++i) {
1256                 if (ctrlc())
1257                         break;
1258                 if ((i % 5) == 0)
1259                         putc('\n');
1260 #ifdef CONFIG_SYS_FLASH_EMPTY_INFO
1261                 /* print empty and read-only info */
1262                 printf ("  %08lX %c %s ",
1263                         info->start[i],
1264                         sector_erased(info, i) ? 'E' : ' ',
1265                         info->protect[i] ? "RO" : "  ");
1266 #else   /* ! CONFIG_SYS_FLASH_EMPTY_INFO */
1267                 printf ("  %08lX   %s ",
1268                         info->start[i],
1269                         info->protect[i] ? "RO" : "  ");
1270 #endif
1271         }
1272         putc ('\n');
1273         return;
1274 }
1275
1276 /*-----------------------------------------------------------------------
1277  * This is used in a few places in write_buf() to show programming
1278  * progress.  Making it a function is nasty because it needs to do side
1279  * effect updates to digit and dots.  Repeated code is nasty too, so
1280  * we define it once here.
1281  */
1282 #ifdef CONFIG_FLASH_SHOW_PROGRESS
1283 #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) \
1284         if (flash_verbose) { \
1285                 dots -= dots_sub; \
1286                 if ((scale > 0) && (dots <= 0)) { \
1287                         if ((digit % 5) == 0) \
1288                                 printf ("%d", digit / 5); \
1289                         else \
1290                                 putc ('.'); \
1291                         digit--; \
1292                         dots += scale; \
1293                 } \
1294         }
1295 #else
1296 #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub)
1297 #endif
1298
1299 /*-----------------------------------------------------------------------
1300  * Copy memory to flash, returns:
1301  * 0 - OK
1302  * 1 - write timeout
1303  * 2 - Flash not erased
1304  */
1305 int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
1306 {
1307         ulong wp;
1308         uchar *p;
1309         int aln;
1310         cfiword_t cword;
1311         int i, rc;
1312 #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
1313         int buffered_size;
1314 #endif
1315 #ifdef CONFIG_FLASH_SHOW_PROGRESS
1316         int digit = CONFIG_FLASH_SHOW_PROGRESS;
1317         int scale = 0;
1318         int dots  = 0;
1319
1320         /*
1321          * Suppress if there are fewer than CONFIG_FLASH_SHOW_PROGRESS writes.
1322          */
1323         if (cnt >= CONFIG_FLASH_SHOW_PROGRESS) {
1324                 scale = (int)((cnt + CONFIG_FLASH_SHOW_PROGRESS - 1) /
1325                         CONFIG_FLASH_SHOW_PROGRESS);
1326         }
1327 #endif
1328
1329         /* get lower aligned address */
1330         wp = (addr & ~(info->portwidth - 1));
1331
1332         /* handle unaligned start */
1333         if ((aln = addr - wp) != 0) {
1334                 cword.l = 0;
1335                 p = (uchar *)wp;
1336                 for (i = 0; i < aln; ++i)
1337                         flash_add_byte (info, &cword, flash_read8(p + i));
1338
1339                 for (; (i < info->portwidth) && (cnt > 0); i++) {
1340                         flash_add_byte (info, &cword, *src++);
1341                         cnt--;
1342                 }
1343                 for (; (cnt == 0) && (i < info->portwidth); ++i)
1344                         flash_add_byte (info, &cword, flash_read8(p + i));
1345
1346                 rc = flash_write_cfiword (info, wp, cword);
1347                 if (rc != 0)
1348                         return rc;
1349
1350                 wp += i;
1351                 FLASH_SHOW_PROGRESS(scale, dots, digit, i);
1352         }
1353
1354         /* handle the aligned part */
1355 #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
1356         buffered_size = (info->portwidth / info->chipwidth);
1357         buffered_size *= info->buffer_size;
1358         while (cnt >= info->portwidth) {
1359                 /* prohibit buffer write when buffer_size is 1 */
1360                 if (info->buffer_size == 1) {
1361                         cword.l = 0;
1362                         for (i = 0; i < info->portwidth; i++)
1363                                 flash_add_byte (info, &cword, *src++);
1364                         if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
1365                                 return rc;
1366                         wp += info->portwidth;
1367                         cnt -= info->portwidth;
1368                         continue;
1369                 }
1370
1371                 /* write buffer until next buffered_size aligned boundary */
1372                 i = buffered_size - (wp % buffered_size);
1373                 if (i > cnt)
1374                         i = cnt;
1375                 if ((rc = flash_write_cfibuffer (info, wp, src, i)) != ERR_OK)
1376                         return rc;
1377                 i -= i & (info->portwidth - 1);
1378                 wp += i;
1379                 src += i;
1380                 cnt -= i;
1381                 FLASH_SHOW_PROGRESS(scale, dots, digit, i);
1382         }
1383 #else
1384         while (cnt >= info->portwidth) {
1385                 cword.l = 0;
1386                 for (i = 0; i < info->portwidth; i++) {
1387                         flash_add_byte (info, &cword, *src++);
1388                 }
1389                 if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
1390                         return rc;
1391                 wp += info->portwidth;
1392                 cnt -= info->portwidth;
1393                 FLASH_SHOW_PROGRESS(scale, dots, digit, info->portwidth);
1394         }
1395 #endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
1396
1397         if (cnt == 0) {
1398                 return (0);
1399         }
1400
1401         /*
1402          * handle unaligned tail bytes
1403          */
1404         cword.l = 0;
1405         p = (uchar *)wp;
1406         for (i = 0; (i < info->portwidth) && (cnt > 0); ++i) {
1407                 flash_add_byte (info, &cword, *src++);
1408                 --cnt;
1409         }
1410         for (; i < info->portwidth; ++i)
1411                 flash_add_byte (info, &cword, flash_read8(p + i));
1412
1413         return flash_write_cfiword (info, wp, cword);
1414 }
1415
1416 /*-----------------------------------------------------------------------
1417  */
1418 #ifdef CONFIG_SYS_FLASH_PROTECTION
1419
1420 static int cfi_protect_bugfix(flash_info_t *info, long sector, int prot)
1421 {
1422         if ((info->manufacturer_id == (uchar)INTEL_MANUFACT) &&
1423                 (info->device_id == NUMONYX_256MBIT)) {
1424                 /*
1425                  * see errata called
1426                  * "Numonyx Axcell P33/P30 Specification Update" :)
1427                  */
1428                 flash_write_cmd(info, sector, 0, FLASH_CMD_READ_ID);
1429                 if (!flash_isequal(info, sector, FLASH_OFFSET_PROTECT,
1430                                    prot)) {
1431                         /*
1432                          * cmd must come before FLASH_CMD_PROTECT + 20us
1433                          * Disable interrupts which might cause a timeout here.
1434                          */
1435                         int flag = disable_interrupts();
1436                         unsigned short cmd;
1437
1438                         if (prot)
1439                                 cmd = FLASH_CMD_PROTECT_SET;
1440                         else
1441                                 cmd = FLASH_CMD_PROTECT_CLEAR;
1442                                 flash_write_cmd(info, sector, 0,
1443                                           FLASH_CMD_PROTECT);
1444                         flash_write_cmd(info, sector, 0, cmd);
1445                         /* re-enable interrupts if necessary */
1446                         if (flag)
1447                                 enable_interrupts();
1448                 }
1449                 return 1;
1450         }
1451         return 0;
1452 }
1453
1454 int flash_real_protect (flash_info_t * info, long sector, int prot)
1455 {
1456         int retcode = 0;
1457
1458         switch (info->vendor) {
1459                 case CFI_CMDSET_INTEL_PROG_REGIONS:
1460                 case CFI_CMDSET_INTEL_STANDARD:
1461                 case CFI_CMDSET_INTEL_EXTENDED:
1462                         if (!cfi_protect_bugfix(info, sector, prot)) {
1463                                 flash_write_cmd(info, sector, 0,
1464                                          FLASH_CMD_CLEAR_STATUS);
1465                                 flash_write_cmd(info, sector, 0,
1466                                         FLASH_CMD_PROTECT);
1467                                 if (prot)
1468                                         flash_write_cmd(info, sector, 0,
1469                                                 FLASH_CMD_PROTECT_SET);
1470                                 else
1471                                         flash_write_cmd(info, sector, 0,
1472                                                 FLASH_CMD_PROTECT_CLEAR);
1473
1474                         }
1475                         break;
1476                 case CFI_CMDSET_AMD_EXTENDED:
1477                 case CFI_CMDSET_AMD_STANDARD:
1478                         /* U-Boot only checks the first byte */
1479                         if (info->manufacturer_id == (uchar)ATM_MANUFACT) {
1480                                 if (prot) {
1481                                         flash_unlock_seq (info, 0);
1482                                         flash_write_cmd (info, 0,
1483                                                         info->addr_unlock1,
1484                                                         ATM_CMD_SOFTLOCK_START);
1485                                         flash_unlock_seq (info, 0);
1486                                         flash_write_cmd (info, sector, 0,
1487                                                         ATM_CMD_LOCK_SECT);
1488                                 } else {
1489                                         flash_write_cmd (info, 0,
1490                                                         info->addr_unlock1,
1491                                                         AMD_CMD_UNLOCK_START);
1492                                         if (info->device_id == ATM_ID_BV6416)
1493                                                 flash_write_cmd (info, sector,
1494                                                         0, ATM_CMD_UNLOCK_SECT);
1495                                 }
1496                         }
1497                         if (info->manufacturer_id == (uchar)AMD_MANUFACT) {
1498                                 int flag = disable_interrupts();
1499                                 int lock_flag;
1500
1501                                 flash_unlock_seq(info, 0);
1502                                 flash_write_cmd(info, 0, info->addr_unlock1,
1503                                                 AMD_CMD_SET_PPB_ENTRY);
1504                                 lock_flag = flash_isset(info, sector, 0, 0x01);
1505                                 if (prot) {
1506                                         if (lock_flag) {
1507                                                 flash_write_cmd(info, sector, 0,
1508                                                         AMD_CMD_PPB_LOCK_BC1);
1509                                                 flash_write_cmd(info, sector, 0,
1510                                                         AMD_CMD_PPB_LOCK_BC2);
1511                                         }
1512                                         debug("sector %ld %slocked\n", sector,
1513                                                 lock_flag ? "" : "already ");
1514                                 } else {
1515                                         if (!lock_flag) {
1516                                                 debug("unlock %ld\n", sector);
1517                                                 flash_write_cmd(info, 0, 0,
1518                                                         AMD_CMD_PPB_UNLOCK_BC1);
1519                                                 flash_write_cmd(info, 0, 0,
1520                                                         AMD_CMD_PPB_UNLOCK_BC2);
1521                                         }
1522                                         debug("sector %ld %sunlocked\n", sector,
1523                                                 !lock_flag ? "" : "already ");
1524                                 }
1525                                 if (flag)
1526                                         enable_interrupts();
1527
1528                                 if (flash_status_check(info, sector,
1529                                                 info->erase_blk_tout,
1530                                                 prot ? "protect" : "unprotect"))
1531                                         printf("status check error\n");
1532
1533                                 flash_write_cmd(info, 0, 0,
1534                                                 AMD_CMD_SET_PPB_EXIT_BC1);
1535                                 flash_write_cmd(info, 0, 0,
1536                                                 AMD_CMD_SET_PPB_EXIT_BC2);
1537                         }
1538                         break;
1539 #ifdef CONFIG_FLASH_CFI_LEGACY
1540                 case CFI_CMDSET_AMD_LEGACY:
1541                         flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
1542                         flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT);
1543                         if (prot)
1544                                 flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET);
1545                         else
1546                                 flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR);
1547 #endif
1548         };
1549
1550         /*
1551          * Flash needs to be in status register read mode for
1552          * flash_full_status_check() to work correctly
1553          */
1554         flash_write_cmd(info, sector, 0, FLASH_CMD_READ_STATUS);
1555         if ((retcode =
1556              flash_full_status_check (info, sector, info->erase_blk_tout,
1557                                       prot ? "protect" : "unprotect")) == 0) {
1558
1559                 info->protect[sector] = prot;
1560
1561                 /*
1562                  * On some of Intel's flash chips (marked via legacy_unlock)
1563                  * unprotect unprotects all locking.
1564                  */
1565                 if ((prot == 0) && (info->legacy_unlock)) {
1566                         flash_sect_t i;
1567
1568                         for (i = 0; i < info->sector_count; i++) {
1569                                 if (info->protect[i])
1570                                         flash_real_protect (info, i, 1);
1571                         }
1572                 }
1573         }
1574         return retcode;
1575 }
1576
1577 /*-----------------------------------------------------------------------
1578  * flash_read_user_serial - read the OneTimeProgramming cells
1579  */
1580 void flash_read_user_serial (flash_info_t * info, void *buffer, int offset,
1581                              int len)
1582 {
1583         uchar *src;
1584         uchar *dst;
1585
1586         dst = buffer;
1587         src = flash_map (info, 0, FLASH_OFFSET_USER_PROTECTION);
1588         flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
1589         memcpy (dst, src + offset, len);
1590         flash_write_cmd (info, 0, 0, info->cmd_reset);
1591         udelay(1);
1592         flash_unmap(info, 0, FLASH_OFFSET_USER_PROTECTION, src);
1593 }
1594
1595 /*
1596  * flash_read_factory_serial - read the device Id from the protection area
1597  */
1598 void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset,
1599                                 int len)
1600 {
1601         uchar *src;
1602
1603         src = flash_map (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
1604         flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
1605         memcpy (buffer, src + offset, len);
1606         flash_write_cmd (info, 0, 0, info->cmd_reset);
1607         udelay(1);
1608         flash_unmap(info, 0, FLASH_OFFSET_INTEL_PROTECTION, src);
1609 }
1610
1611 #endif /* CONFIG_SYS_FLASH_PROTECTION */
1612
1613 /*-----------------------------------------------------------------------
1614  * Reverse the order of the erase regions in the CFI QRY structure.
1615  * This is needed for chips that are either a) correctly detected as
1616  * top-boot, or b) buggy.
1617  */
1618 static void cfi_reverse_geometry(struct cfi_qry *qry)
1619 {
1620         unsigned int i, j;
1621         u32 tmp;
1622
1623         for (i = 0, j = qry->num_erase_regions - 1; i < j; i++, j--) {
1624                 tmp = qry->erase_region_info[i];
1625                 qry->erase_region_info[i] = qry->erase_region_info[j];
1626                 qry->erase_region_info[j] = tmp;
1627         }
1628 }
1629
1630 /*-----------------------------------------------------------------------
1631  * read jedec ids from device and set corresponding fields in info struct
1632  *
1633  * Note: assume cfi->vendor, cfi->portwidth and cfi->chipwidth are correct
1634  *
1635  */
1636 static void cmdset_intel_read_jedec_ids(flash_info_t *info)
1637 {
1638         flash_write_cmd(info, 0, 0, FLASH_CMD_RESET);
1639         udelay(1);
1640         flash_write_cmd(info, 0, 0, FLASH_CMD_READ_ID);
1641         udelay(1000); /* some flash are slow to respond */
1642         info->manufacturer_id = flash_read_uchar (info,
1643                                         FLASH_OFFSET_MANUFACTURER_ID);
1644         info->device_id = (info->chipwidth == FLASH_CFI_16BIT) ?
1645                         flash_read_word (info, FLASH_OFFSET_DEVICE_ID) :
1646                         flash_read_uchar (info, FLASH_OFFSET_DEVICE_ID);
1647         flash_write_cmd(info, 0, 0, FLASH_CMD_RESET);
1648 }
1649
1650 static int cmdset_intel_init(flash_info_t *info, struct cfi_qry *qry)
1651 {
1652         info->cmd_reset = FLASH_CMD_RESET;
1653
1654         cmdset_intel_read_jedec_ids(info);
1655         flash_write_cmd(info, 0, info->cfi_offset, FLASH_CMD_CFI);
1656
1657 #ifdef CONFIG_SYS_FLASH_PROTECTION
1658         /* read legacy lock/unlock bit from intel flash */
1659         if (info->ext_addr) {
1660                 info->legacy_unlock = flash_read_uchar (info,
1661                                 info->ext_addr + 5) & 0x08;
1662         }
1663 #endif
1664
1665         return 0;
1666 }
1667
1668 static void cmdset_amd_read_jedec_ids(flash_info_t *info)
1669 {
1670         ushort bankId = 0;
1671         uchar  manuId;
1672
1673         flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
1674         flash_unlock_seq(info, 0);
1675         flash_write_cmd(info, 0, info->addr_unlock1, FLASH_CMD_READ_ID);
1676         udelay(1000); /* some flash are slow to respond */
1677
1678         manuId = flash_read_uchar (info, FLASH_OFFSET_MANUFACTURER_ID);
1679         /* JEDEC JEP106Z specifies ID codes up to bank 7 */
1680         while (manuId == FLASH_CONTINUATION_CODE && bankId < 0x800) {
1681                 bankId += 0x100;
1682                 manuId = flash_read_uchar (info,
1683                         bankId | FLASH_OFFSET_MANUFACTURER_ID);
1684         }
1685         info->manufacturer_id = manuId;
1686
1687         switch (info->chipwidth){
1688         case FLASH_CFI_8BIT:
1689                 info->device_id = flash_read_uchar (info,
1690                                                 FLASH_OFFSET_DEVICE_ID);
1691                 if (info->device_id == 0x7E) {
1692                         /* AMD 3-byte (expanded) device ids */
1693                         info->device_id2 = flash_read_uchar (info,
1694                                                 FLASH_OFFSET_DEVICE_ID2);
1695                         info->device_id2 <<= 8;
1696                         info->device_id2 |= flash_read_uchar (info,
1697                                                 FLASH_OFFSET_DEVICE_ID3);
1698                 }
1699                 break;
1700         case FLASH_CFI_16BIT:
1701                 info->device_id = flash_read_word (info,
1702                                                 FLASH_OFFSET_DEVICE_ID);
1703                 if ((info->device_id & 0xff) == 0x7E) {
1704                         /* AMD 3-byte (expanded) device ids */
1705                         info->device_id2 = flash_read_uchar (info,
1706                                                 FLASH_OFFSET_DEVICE_ID2);
1707                         info->device_id2 <<= 8;
1708                         info->device_id2 |= flash_read_uchar (info,
1709                                                 FLASH_OFFSET_DEVICE_ID3);
1710                 }
1711                 break;
1712         default:
1713                 break;
1714         }
1715         flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
1716         udelay(1);
1717 }
1718
1719 static int cmdset_amd_init(flash_info_t *info, struct cfi_qry *qry)
1720 {
1721         info->cmd_reset = AMD_CMD_RESET;
1722
1723         cmdset_amd_read_jedec_ids(info);
1724         flash_write_cmd(info, 0, info->cfi_offset, FLASH_CMD_CFI);
1725
1726 #ifdef CONFIG_SYS_FLASH_PROTECTION
1727         if (info->ext_addr && info->manufacturer_id == (uchar)AMD_MANUFACT) {
1728                 ushort spus;
1729
1730                 /* read sector protect/unprotect scheme */
1731                 spus = flash_read_uchar(info, info->ext_addr + 9);
1732                 if (spus == 0x8)
1733                         info->legacy_unlock = 1;
1734         }
1735 #endif
1736
1737         return 0;
1738 }
1739
1740 #ifdef CONFIG_FLASH_CFI_LEGACY
1741 static void flash_read_jedec_ids (flash_info_t * info)
1742 {
1743         info->manufacturer_id = 0;
1744         info->device_id       = 0;
1745         info->device_id2      = 0;
1746
1747         switch (info->vendor) {
1748         case CFI_CMDSET_INTEL_PROG_REGIONS:
1749         case CFI_CMDSET_INTEL_STANDARD:
1750         case CFI_CMDSET_INTEL_EXTENDED:
1751                 cmdset_intel_read_jedec_ids(info);
1752                 break;
1753         case CFI_CMDSET_AMD_STANDARD:
1754         case CFI_CMDSET_AMD_EXTENDED:
1755                 cmdset_amd_read_jedec_ids(info);
1756                 break;
1757         default:
1758                 break;
1759         }
1760 }
1761
1762 /*-----------------------------------------------------------------------
1763  * Call board code to request info about non-CFI flash.
1764  * board_flash_get_legacy needs to fill in at least:
1765  * info->portwidth, info->chipwidth and info->interface for Jedec probing.
1766  */
1767 static int flash_detect_legacy(phys_addr_t base, int banknum)
1768 {
1769         flash_info_t *info = &flash_info[banknum];
1770
1771         if (board_flash_get_legacy(base, banknum, info)) {
1772                 /* board code may have filled info completely. If not, we
1773                    use JEDEC ID probing. */
1774                 if (!info->vendor) {
1775                         int modes[] = {
1776                                 CFI_CMDSET_AMD_STANDARD,
1777                                 CFI_CMDSET_INTEL_STANDARD
1778                         };
1779                         int i;
1780
1781                         for (i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) {
1782                                 info->vendor = modes[i];
1783                                 info->start[0] =
1784                                         (ulong)map_physmem(base,
1785                                                            info->portwidth,
1786                                                            MAP_NOCACHE);
1787                                 if (info->portwidth == FLASH_CFI_8BIT
1788                                         && info->interface == FLASH_CFI_X8X16) {
1789                                         info->addr_unlock1 = 0x2AAA;
1790                                         info->addr_unlock2 = 0x5555;
1791                                 } else {
1792                                         info->addr_unlock1 = 0x5555;
1793                                         info->addr_unlock2 = 0x2AAA;
1794                                 }
1795                                 flash_read_jedec_ids(info);
1796                                 debug("JEDEC PROBE: ID %x %x %x\n",
1797                                                 info->manufacturer_id,
1798                                                 info->device_id,
1799                                                 info->device_id2);
1800                                 if (jedec_flash_match(info, info->start[0]))
1801                                         break;
1802                                 else
1803                                         unmap_physmem((void *)info->start[0],
1804                                                       MAP_NOCACHE);
1805                         }
1806                 }
1807
1808                 switch(info->vendor) {
1809                 case CFI_CMDSET_INTEL_PROG_REGIONS:
1810                 case CFI_CMDSET_INTEL_STANDARD:
1811                 case CFI_CMDSET_INTEL_EXTENDED:
1812                         info->cmd_reset = FLASH_CMD_RESET;
1813                         break;
1814                 case CFI_CMDSET_AMD_STANDARD:
1815                 case CFI_CMDSET_AMD_EXTENDED:
1816                 case CFI_CMDSET_AMD_LEGACY:
1817                         info->cmd_reset = AMD_CMD_RESET;
1818                         break;
1819                 }
1820                 info->flash_id = FLASH_MAN_CFI;
1821                 return 1;
1822         }
1823         return 0; /* use CFI */
1824 }
1825 #else
1826 static inline int flash_detect_legacy(phys_addr_t base, int banknum)
1827 {
1828         return 0; /* use CFI */
1829 }
1830 #endif
1831
1832 /*-----------------------------------------------------------------------
1833  * detect if flash is compatible with the Common Flash Interface (CFI)
1834  * http://www.jedec.org/download/search/jesd68.pdf
1835  */
1836 static void flash_read_cfi (flash_info_t *info, void *buf,
1837                 unsigned int start, size_t len)
1838 {
1839         u8 *p = buf;
1840         unsigned int i;
1841
1842         for (i = 0; i < len; i++)
1843                 p[i] = flash_read_uchar(info, start + i);
1844 }
1845
1846 void __flash_cmd_reset(flash_info_t *info)
1847 {
1848         /*
1849          * We do not yet know what kind of commandset to use, so we issue
1850          * the reset command in both Intel and AMD variants, in the hope
1851          * that AMD flash roms ignore the Intel command.
1852          */
1853         flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
1854         udelay(1);
1855         flash_write_cmd(info, 0, 0, FLASH_CMD_RESET);
1856 }
1857 void flash_cmd_reset(flash_info_t *info)
1858         __attribute__((weak,alias("__flash_cmd_reset")));
1859
1860 static int __flash_detect_cfi (flash_info_t * info, struct cfi_qry *qry)
1861 {
1862         int cfi_offset;
1863
1864         /* Issue FLASH reset command */
1865         flash_cmd_reset(info);
1866
1867         for (cfi_offset=0;
1868              cfi_offset < sizeof(flash_offset_cfi) / sizeof(uint);
1869              cfi_offset++) {
1870                 flash_write_cmd (info, 0, flash_offset_cfi[cfi_offset],
1871                                  FLASH_CMD_CFI);
1872                 if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q')
1873                     && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R')
1874                     && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 2, 'Y')) {
1875                         flash_read_cfi(info, qry, FLASH_OFFSET_CFI_RESP,
1876                                         sizeof(struct cfi_qry));
1877                         info->interface = le16_to_cpu(qry->interface_desc);
1878
1879                         info->cfi_offset = flash_offset_cfi[cfi_offset];
1880                         debug ("device interface is %d\n",
1881                                info->interface);
1882                         debug ("found port %d chip %d ",
1883                                info->portwidth, info->chipwidth);
1884                         debug ("port %d bits chip %d bits\n",
1885                                info->portwidth << CFI_FLASH_SHIFT_WIDTH,
1886                                info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
1887
1888                         /* calculate command offsets as in the Linux driver */
1889                         info->addr_unlock1 = 0x555;
1890                         info->addr_unlock2 = 0x2aa;
1891
1892                         /*
1893                          * modify the unlock address if we are
1894                          * in compatibility mode
1895                          */
1896                         if (    /* x8/x16 in x8 mode */
1897                                 ((info->chipwidth == FLASH_CFI_BY8) &&
1898                                         (info->interface == FLASH_CFI_X8X16)) ||
1899                                 /* x16/x32 in x16 mode */
1900                                 ((info->chipwidth == FLASH_CFI_BY16) &&
1901                                         (info->interface == FLASH_CFI_X16X32)))
1902                         {
1903                                 info->addr_unlock1 = 0xaaa;
1904                                 info->addr_unlock2 = 0x555;
1905                         }
1906
1907                         info->name = "CFI conformant";
1908                         return 1;
1909                 }
1910         }
1911
1912         return 0;
1913 }
1914
1915 static int flash_detect_cfi (flash_info_t * info, struct cfi_qry *qry)
1916 {
1917         debug ("flash detect cfi\n");
1918
1919         for (info->portwidth = CONFIG_SYS_FLASH_CFI_WIDTH;
1920              info->portwidth <= FLASH_CFI_64BIT; info->portwidth <<= 1) {
1921                 for (info->chipwidth = FLASH_CFI_BY8;
1922                      info->chipwidth <= info->portwidth;
1923                      info->chipwidth <<= 1)
1924                         if (__flash_detect_cfi(info, qry))
1925                                 return 1;
1926         }
1927         debug ("not found\n");
1928         return 0;
1929 }
1930
1931 /*
1932  * Manufacturer-specific quirks. Add workarounds for geometry
1933  * reversal, etc. here.
1934  */
1935 static void flash_fixup_amd(flash_info_t *info, struct cfi_qry *qry)
1936 {
1937         /* check if flash geometry needs reversal */
1938         if (qry->num_erase_regions > 1) {
1939                 /* reverse geometry if top boot part */
1940                 if (info->cfi_version < 0x3131) {
1941                         /* CFI < 1.1, try to guess from device id */
1942                         if ((info->device_id & 0x80) != 0)
1943                                 cfi_reverse_geometry(qry);
1944                 } else if (flash_read_uchar(info, info->ext_addr + 0xf) == 3) {
1945                         /* CFI >= 1.1, deduct from top/bottom flag */
1946                         /* note: ext_addr is valid since cfi_version > 0 */
1947                         cfi_reverse_geometry(qry);
1948                 }
1949         }
1950 }
1951
1952 static void flash_fixup_atmel(flash_info_t *info, struct cfi_qry *qry)
1953 {
1954         int reverse_geometry = 0;
1955
1956         /* Check the "top boot" bit in the PRI */
1957         if (info->ext_addr && !(flash_read_uchar(info, info->ext_addr + 6) & 1))
1958                 reverse_geometry = 1;
1959
1960         /* AT49BV6416(T) list the erase regions in the wrong order.
1961          * However, the device ID is identical with the non-broken
1962          * AT49BV642D they differ in the high byte.
1963          */
1964         if (info->device_id == 0xd6 || info->device_id == 0xd2)
1965                 reverse_geometry = !reverse_geometry;
1966
1967         if (reverse_geometry)
1968                 cfi_reverse_geometry(qry);
1969 }
1970
1971 static void flash_fixup_stm(flash_info_t *info, struct cfi_qry *qry)
1972 {
1973         /* check if flash geometry needs reversal */
1974         if (qry->num_erase_regions > 1) {
1975                 /* reverse geometry if top boot part */
1976                 if (info->cfi_version < 0x3131) {
1977                         /* CFI < 1.1, guess by device id */
1978                         if (info->device_id == 0x22CA || /* M29W320DT */
1979                             info->device_id == 0x2256 || /* M29W320ET */
1980                             info->device_id == 0x22D7) { /* M29W800DT */
1981                                 cfi_reverse_geometry(qry);
1982                         }
1983                 } else if (flash_read_uchar(info, info->ext_addr + 0xf) == 3) {
1984                         /* CFI >= 1.1, deduct from top/bottom flag */
1985                         /* note: ext_addr is valid since cfi_version > 0 */
1986                         cfi_reverse_geometry(qry);
1987                 }
1988         }
1989 }
1990
1991 /*
1992  * The following code cannot be run from FLASH!
1993  *
1994  */
1995 ulong flash_get_size (phys_addr_t base, int banknum)
1996 {
1997         flash_info_t *info = &flash_info[banknum];
1998         int i, j;
1999         flash_sect_t sect_cnt;
2000         phys_addr_t sector;
2001         unsigned long tmp;
2002         int size_ratio;
2003         uchar num_erase_regions;
2004         int erase_region_size;
2005         int erase_region_count;
2006         struct cfi_qry qry;
2007         unsigned long max_size;
2008
2009         memset(&qry, 0, sizeof(qry));
2010
2011         info->ext_addr = 0;
2012         info->cfi_version = 0;
2013 #ifdef CONFIG_SYS_FLASH_PROTECTION
2014         info->legacy_unlock = 0;
2015 #endif
2016
2017         info->start[0] = (ulong)map_physmem(base, info->portwidth, MAP_NOCACHE);
2018
2019         if (flash_detect_cfi (info, &qry)) {
2020                 info->vendor = le16_to_cpu(qry.p_id);
2021                 info->ext_addr = le16_to_cpu(qry.p_adr);
2022                 num_erase_regions = qry.num_erase_regions;
2023
2024                 if (info->ext_addr) {
2025                         info->cfi_version = (ushort) flash_read_uchar (info,
2026                                                 info->ext_addr + 3) << 8;
2027                         info->cfi_version |= (ushort) flash_read_uchar (info,
2028                                                 info->ext_addr + 4);
2029                 }
2030
2031 #ifdef DEBUG
2032                 flash_printqry (&qry);
2033 #endif
2034
2035                 switch (info->vendor) {
2036                 case CFI_CMDSET_INTEL_PROG_REGIONS:
2037                 case CFI_CMDSET_INTEL_STANDARD:
2038                 case CFI_CMDSET_INTEL_EXTENDED:
2039                         cmdset_intel_init(info, &qry);
2040                         break;
2041                 case CFI_CMDSET_AMD_STANDARD:
2042                 case CFI_CMDSET_AMD_EXTENDED:
2043                         cmdset_amd_init(info, &qry);
2044                         break;
2045                 default:
2046                         printf("CFI: Unknown command set 0x%x\n",
2047                                         info->vendor);
2048                         /*
2049                          * Unfortunately, this means we don't know how
2050                          * to get the chip back to Read mode. Might
2051                          * as well try an Intel-style reset...
2052                          */
2053                         flash_write_cmd(info, 0, 0, FLASH_CMD_RESET);
2054                         return 0;
2055                 }
2056
2057                 /* Do manufacturer-specific fixups */
2058                 switch (info->manufacturer_id) {
2059                 case 0x0001: /* AMD */
2060                 case 0x0037: /* AMIC */
2061                         flash_fixup_amd(info, &qry);
2062                         break;
2063                 case 0x001f:
2064                         flash_fixup_atmel(info, &qry);
2065                         break;
2066                 case 0x0020:
2067                         flash_fixup_stm(info, &qry);
2068                         break;
2069                 }
2070
2071                 debug ("manufacturer is %d\n", info->vendor);
2072                 debug ("manufacturer id is 0x%x\n", info->manufacturer_id);
2073                 debug ("device id is 0x%x\n", info->device_id);
2074                 debug ("device id2 is 0x%x\n", info->device_id2);
2075                 debug ("cfi version is 0x%04x\n", info->cfi_version);
2076
2077                 size_ratio = info->portwidth / info->chipwidth;
2078                 /* if the chip is x8/x16 reduce the ratio by half */
2079                 if ((info->interface == FLASH_CFI_X8X16)
2080                     && (info->chipwidth == FLASH_CFI_BY8)) {
2081                         size_ratio >>= 1;
2082                 }
2083                 debug ("size_ratio %d port %d bits chip %d bits\n",
2084                        size_ratio, info->portwidth << CFI_FLASH_SHIFT_WIDTH,
2085                        info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
2086                 info->size = 1 << qry.dev_size;
2087                 /* multiply the size by the number of chips */
2088                 info->size *= size_ratio;
2089                 max_size = cfi_flash_bank_size(banknum);
2090                 if (max_size && (info->size > max_size)) {
2091                         debug("[truncated from %ldMiB]", info->size >> 20);
2092                         info->size = max_size;
2093                 }
2094                 debug ("found %d erase regions\n", num_erase_regions);
2095                 sect_cnt = 0;
2096                 sector = base;
2097                 for (i = 0; i < num_erase_regions; i++) {
2098                         if (i > NUM_ERASE_REGIONS) {
2099                                 printf ("%d erase regions found, only %d used\n",
2100                                         num_erase_regions, NUM_ERASE_REGIONS);
2101                                 break;
2102                         }
2103
2104                         tmp = le32_to_cpu(qry.erase_region_info[i]);
2105                         debug("erase region %u: 0x%08lx\n", i, tmp);
2106
2107                         erase_region_count = (tmp & 0xffff) + 1;
2108                         tmp >>= 16;
2109                         erase_region_size =
2110                                 (tmp & 0xffff) ? ((tmp & 0xffff) * 256) : 128;
2111                         debug ("erase_region_count = %d erase_region_size = %d\n",
2112                                 erase_region_count, erase_region_size);
2113                         for (j = 0; j < erase_region_count; j++) {
2114                                 if (sector - base >= info->size)
2115                                         break;
2116                                 if (sect_cnt >= CONFIG_SYS_MAX_FLASH_SECT) {
2117                                         printf("ERROR: too many flash sectors\n");
2118                                         break;
2119                                 }
2120                                 info->start[sect_cnt] =
2121                                         (ulong)map_physmem(sector,
2122                                                            info->portwidth,
2123                                                            MAP_NOCACHE);
2124                                 sector += (erase_region_size * size_ratio);
2125
2126                                 /*
2127                                  * Only read protection status from
2128                                  * supported devices (intel...)
2129                                  */
2130                                 switch (info->vendor) {
2131                                 case CFI_CMDSET_INTEL_PROG_REGIONS:
2132                                 case CFI_CMDSET_INTEL_EXTENDED:
2133                                 case CFI_CMDSET_INTEL_STANDARD:
2134                                         /*
2135                                          * Set flash to read-id mode. Otherwise
2136                                          * reading protected status is not
2137                                          * guaranteed.
2138                                          */
2139                                         flash_write_cmd(info, sect_cnt, 0,
2140                                                         FLASH_CMD_READ_ID);
2141                                         info->protect[sect_cnt] =
2142                                                 flash_isset (info, sect_cnt,
2143                                                              FLASH_OFFSET_PROTECT,
2144                                                              FLASH_STATUS_PROTECT);
2145                                         break;
2146                                 default:
2147                                         /* default: not protected */
2148                                         info->protect[sect_cnt] = 0;
2149                                 }
2150
2151                                 sect_cnt++;
2152                         }
2153                 }
2154
2155                 info->sector_count = sect_cnt;
2156                 info->buffer_size = 1 << le16_to_cpu(qry.max_buf_write_size);
2157                 tmp = 1 << qry.block_erase_timeout_typ;
2158                 info->erase_blk_tout = tmp *
2159                         (1 << qry.block_erase_timeout_max);
2160                 tmp = (1 << qry.buf_write_timeout_typ) *
2161                         (1 << qry.buf_write_timeout_max);
2162
2163                 /* round up when converting to ms */
2164                 info->buffer_write_tout = (tmp + 999) / 1000;
2165                 tmp = (1 << qry.word_write_timeout_typ) *
2166                         (1 << qry.word_write_timeout_max);
2167                 /* round up when converting to ms */
2168                 info->write_tout = (tmp + 999) / 1000;
2169                 info->flash_id = FLASH_MAN_CFI;
2170                 if ((info->interface == FLASH_CFI_X8X16) &&
2171                     (info->chipwidth == FLASH_CFI_BY8)) {
2172                         /* XXX - Need to test on x8/x16 in parallel. */
2173                         info->portwidth >>= 1;
2174                 }
2175
2176                 flash_write_cmd (info, 0, 0, info->cmd_reset);
2177         }
2178
2179         return (info->size);
2180 }
2181
2182 #ifdef CONFIG_FLASH_CFI_MTD
2183 void flash_set_verbose(uint v)
2184 {
2185         flash_verbose = v;
2186 }
2187 #endif
2188
2189 static void cfi_flash_set_config_reg(u32 base, u16 val)
2190 {
2191 #ifdef CONFIG_SYS_CFI_FLASH_CONFIG_REGS
2192         /*
2193          * Only set this config register if really defined
2194          * to a valid value (0xffff is invalid)
2195          */
2196         if (val == 0xffff)
2197                 return;
2198
2199         /*
2200          * Set configuration register. Data is "encrypted" in the 16 lower
2201          * address bits.
2202          */
2203         flash_write16(FLASH_CMD_SETUP, (void *)(base + (val << 1)));
2204         flash_write16(FLASH_CMD_SET_CR_CONFIRM, (void *)(base + (val << 1)));
2205
2206         /*
2207          * Finally issue reset-command to bring device back to
2208          * read-array mode
2209          */
2210         flash_write16(FLASH_CMD_RESET, (void *)base);
2211 #endif
2212 }
2213
2214 /*-----------------------------------------------------------------------
2215  */
2216
2217 void flash_protect_default(void)
2218 {
2219 #if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST)
2220         int i;
2221         struct apl_s {
2222                 ulong start;
2223                 ulong size;
2224         } apl[] = CONFIG_SYS_FLASH_AUTOPROTECT_LIST;
2225 #endif
2226
2227         /* Monitor protection ON by default */
2228 #if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \
2229         (!defined(CONFIG_MONITOR_IS_IN_RAM))
2230         flash_protect(FLAG_PROTECT_SET,
2231                        CONFIG_SYS_MONITOR_BASE,
2232                        CONFIG_SYS_MONITOR_BASE + monitor_flash_len  - 1,
2233                        flash_get_info(CONFIG_SYS_MONITOR_BASE));
2234 #endif
2235
2236         /* Environment protection ON by default */
2237 #ifdef CONFIG_ENV_IS_IN_FLASH
2238         flash_protect(FLAG_PROTECT_SET,
2239                        CONFIG_ENV_ADDR,
2240                        CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
2241                        flash_get_info(CONFIG_ENV_ADDR));
2242 #endif
2243
2244         /* Redundant environment protection ON by default */
2245 #ifdef CONFIG_ENV_ADDR_REDUND
2246         flash_protect(FLAG_PROTECT_SET,
2247                        CONFIG_ENV_ADDR_REDUND,
2248                        CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
2249                        flash_get_info(CONFIG_ENV_ADDR_REDUND));
2250 #endif
2251
2252 #if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST)
2253         for (i = 0; i < (sizeof(apl) / sizeof(struct apl_s)); i++) {
2254                 debug("autoprotecting from %08lx to %08lx\n",
2255                       apl[i].start, apl[i].start + apl[i].size - 1);
2256                 flash_protect(FLAG_PROTECT_SET,
2257                                apl[i].start,
2258                                apl[i].start + apl[i].size - 1,
2259                                flash_get_info(apl[i].start));
2260         }
2261 #endif
2262 }
2263
2264 unsigned long flash_init (void)
2265 {
2266         unsigned long size = 0;
2267         int i;
2268
2269 #ifdef CONFIG_SYS_FLASH_PROTECTION
2270         /* read environment from EEPROM */
2271         char s[64];
2272         getenv_f("unlock", s, sizeof(s));
2273 #endif
2274
2275         /* Init: no FLASHes known */
2276         for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
2277                 flash_info[i].flash_id = FLASH_UNKNOWN;
2278
2279                 /* Optionally write flash configuration register */
2280                 cfi_flash_set_config_reg(cfi_flash_bank_addr(i),
2281                                          cfi_flash_config_reg(i));
2282
2283                 if (!flash_detect_legacy(cfi_flash_bank_addr(i), i))
2284                         flash_get_size(cfi_flash_bank_addr(i), i);
2285                 size += flash_info[i].size;
2286                 if (flash_info[i].flash_id == FLASH_UNKNOWN) {
2287 #ifndef CONFIG_SYS_FLASH_QUIET_TEST
2288                         printf ("## Unknown flash on Bank %d "
2289                                 "- Size = 0x%08lx = %ld MB\n",
2290                                 i+1, flash_info[i].size,
2291                                 flash_info[i].size >> 20);
2292 #endif /* CONFIG_SYS_FLASH_QUIET_TEST */
2293                 }
2294 #ifdef CONFIG_SYS_FLASH_PROTECTION
2295                 else if ((s != NULL) && (strcmp(s, "yes") == 0)) {
2296                         /*
2297                          * Only the U-Boot image and it's environment
2298                          * is protected, all other sectors are
2299                          * unprotected (unlocked) if flash hardware
2300                          * protection is used (CONFIG_SYS_FLASH_PROTECTION)
2301                          * and the environment variable "unlock" is
2302                          * set to "yes".
2303                          */
2304                         if (flash_info[i].legacy_unlock) {
2305                                 int k;
2306
2307                                 /*
2308                                  * Disable legacy_unlock temporarily,
2309                                  * since flash_real_protect would
2310                                  * relock all other sectors again
2311                                  * otherwise.
2312                                  */
2313                                 flash_info[i].legacy_unlock = 0;
2314
2315                                 /*
2316                                  * Legacy unlocking (e.g. Intel J3) ->
2317                                  * unlock only one sector. This will
2318                                  * unlock all sectors.
2319                                  */
2320                                 flash_real_protect (&flash_info[i], 0, 0);
2321
2322                                 flash_info[i].legacy_unlock = 1;
2323
2324                                 /*
2325                                  * Manually mark other sectors as
2326                                  * unlocked (unprotected)
2327                                  */
2328                                 for (k = 1; k < flash_info[i].sector_count; k++)
2329                                         flash_info[i].protect[k] = 0;
2330                         } else {
2331                                 /*
2332                                  * No legancy unlocking -> unlock all sectors
2333                                  */
2334                                 flash_protect (FLAG_PROTECT_CLEAR,
2335                                                flash_info[i].start[0],
2336                                                flash_info[i].start[0]
2337                                                + flash_info[i].size - 1,
2338                                                &flash_info[i]);
2339                         }
2340                 }
2341 #endif /* CONFIG_SYS_FLASH_PROTECTION */
2342         }
2343
2344         flash_protect_default();
2345 #ifdef CONFIG_FLASH_CFI_MTD
2346         cfi_mtd_init();
2347 #endif
2348
2349         return (size);
2350 }