wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1 | /* |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 2 | * (C) Copyright 2002-2004 |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 3 | * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com |
| 4 | * |
| 5 | * Copyright (C) 2003 Arabella Software Ltd. |
| 6 | * Yuli Barcohen <yuli@arabellasw.com> |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 7 | * |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 8 | * Copyright (C) 2004 |
| 9 | * Ed Okerson |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 10 | * |
| 11 | * Copyright (C) 2006 |
| 12 | * Tolunay Orkun <listmember@orkun.us> |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 13 | * |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 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 | * |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 32 | */ |
| 33 | |
| 34 | /* The DEBUG define must be before common to enable debugging */ |
wdenk | 2ebee31 | 2004-02-23 19:30:57 +0000 | [diff] [blame] | 35 | /* #define DEBUG */ |
| 36 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 37 | #include <common.h> |
| 38 | #include <asm/processor.h> |
Haiying Wang | c123a38 | 2007-02-21 16:52:31 +0100 | [diff] [blame] | 39 | #include <asm/io.h> |
wdenk | aeba06f | 2004-06-09 17:34:58 +0000 | [diff] [blame] | 40 | #include <asm/byteorder.h> |
wdenk | d0245fc | 2005-04-13 10:02:42 +0000 | [diff] [blame] | 41 | #include <environment.h> |
Stefan Roese | 6e83e34 | 2009-10-27 15:15:55 +0100 | [diff] [blame] | 42 | #include <mtd/cfi_flash.h> |
Jens Scharsig (BuS Elektronik) | 287a158 | 2012-01-27 09:29:53 +0100 | [diff] [blame] | 43 | #include <watchdog.h> |
wdenk | e537b3b | 2004-02-23 23:54:43 +0000 | [diff] [blame] | 44 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 45 | /* |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 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. |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 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 |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 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 |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 61 | * |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 62 | * Define CONFIG_SYS_WRITE_SWAPPED_DATA, if you have to swap the Bytes between |
Heiko Schocher | 800db31 | 2007-01-19 18:05:26 +0100 | [diff] [blame] | 63 | * reading and writing ... (yes there is such a Hardware). |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 64 | */ |
| 65 | |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 66 | static uint flash_offset_cfi[2] = { FLASH_OFFSET_CFI, FLASH_OFFSET_CFI_ALT }; |
Mike Frysinger | c2c093d | 2010-12-22 09:41:13 -0500 | [diff] [blame] | 67 | #ifdef CONFIG_FLASH_CFI_MTD |
Piotr Ziecik | 2a7493c | 2008-11-17 15:49:32 +0100 | [diff] [blame] | 68 | static uint flash_verbose = 1; |
Mike Frysinger | c2c093d | 2010-12-22 09:41:13 -0500 | [diff] [blame] | 69 | #else |
| 70 | #define flash_verbose 1 |
| 71 | #endif |
Wolfgang Denk | afa0dd0 | 2006-12-27 01:26:13 +0100 | [diff] [blame] | 72 | |
Wolfgang Denk | 9f5fb0f | 2008-08-08 16:39:54 +0200 | [diff] [blame] | 73 | flash_info_t flash_info[CFI_MAX_FLASH_BANKS]; /* FLASH chips info */ |
| 74 | |
Stefan Roese | c865e6c | 2006-02-28 15:29:58 +0100 | [diff] [blame] | 75 | /* |
| 76 | * Check if chip width is defined. If not, start detecting with 8bit. |
| 77 | */ |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 78 | #ifndef CONFIG_SYS_FLASH_CFI_WIDTH |
| 79 | #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_8BIT |
Stefan Roese | c865e6c | 2006-02-28 15:29:58 +0100 | [diff] [blame] | 80 | #endif |
| 81 | |
Stefan Roese | ab93564 | 2010-10-25 18:31:48 +0200 | [diff] [blame] | 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 | |
Stefan Roese | fb9a730 | 2010-08-31 10:00:10 +0200 | [diff] [blame] | 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 | |
Stefan Roese | 7e7dda8 | 2010-08-30 10:11:51 +0200 | [diff] [blame] | 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 | |
Ilya Yanok | 755c180 | 2010-10-21 17:20:12 +0200 | [diff] [blame] | 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 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 118 | static void __flash_write8(u8 value, void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 119 | { |
| 120 | __raw_writeb(value, addr); |
| 121 | } |
| 122 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 123 | static void __flash_write16(u16 value, void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 124 | { |
| 125 | __raw_writew(value, addr); |
| 126 | } |
| 127 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 128 | static void __flash_write32(u32 value, void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 129 | { |
| 130 | __raw_writel(value, addr); |
| 131 | } |
| 132 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 133 | static void __flash_write64(u64 value, void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 134 | { |
| 135 | /* No architectures currently implement __raw_writeq() */ |
| 136 | *(volatile u64 *)addr = value; |
| 137 | } |
| 138 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 139 | static u8 __flash_read8(void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 140 | { |
| 141 | return __raw_readb(addr); |
| 142 | } |
| 143 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 144 | static u16 __flash_read16(void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 145 | { |
| 146 | return __raw_readw(addr); |
| 147 | } |
| 148 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 149 | static u32 __flash_read32(void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 150 | { |
| 151 | return __raw_readl(addr); |
| 152 | } |
| 153 | |
Daniel Hellstrom | cfd7138 | 2008-03-28 20:40:19 +0100 | [diff] [blame] | 154 | static u64 __flash_read64(void *addr) |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 155 | { |
| 156 | /* No architectures currently implement __raw_readq() */ |
| 157 | return *(volatile u64 *)addr; |
| 158 | } |
| 159 | |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 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"))); |
Daniel Hellstrom | cfd7138 | 2008-03-28 20:40:19 +0100 | [diff] [blame] | 168 | u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64"))); |
Stefan Roese | 38ae982 | 2008-11-17 14:45:22 +0100 | [diff] [blame] | 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 |
Daniel Hellstrom | cfd7138 | 2008-03-28 20:40:19 +0100 | [diff] [blame] | 179 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 180 | /*----------------------------------------------------------------------- |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 181 | */ |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 182 | #if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) |
Heiko Schocher | 4c0f005 | 2009-02-10 09:53:29 +0100 | [diff] [blame] | 183 | flash_info_t *flash_get_info(ulong base) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 184 | { |
| 185 | int i; |
Stefan Roese | 6c7c2dc | 2010-08-30 11:14:38 +0200 | [diff] [blame] | 186 | flash_info_t *info = NULL; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 187 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 188 | for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 189 | info = & flash_info[i]; |
| 190 | if (info->size && info->start[0] <= base && |
| 191 | base <= info->start[0] + info->size - 1) |
| 192 | break; |
| 193 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 194 | |
Stefan Roese | 6c7c2dc | 2010-08-30 11:14:38 +0200 | [diff] [blame] | 195 | return info; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 196 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 197 | #endif |
| 198 | |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 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 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 207 | /*----------------------------------------------------------------------- |
| 208 | * create an address based on the offset and the port width |
| 209 | */ |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 210 | static inline void * |
| 211 | flash_map (flash_info_t * info, flash_sect_t sect, uint offset) |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 212 | { |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 213 | unsigned int byte_offset = offset * info->portwidth; |
| 214 | |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 215 | return (void *)(info->start[sect] + byte_offset); |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 216 | } |
| 217 | |
| 218 | static inline void flash_unmap(flash_info_t *info, flash_sect_t sect, |
| 219 | unsigned int offset, void *addr) |
| 220 | { |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 221 | } |
| 222 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 223 | /*----------------------------------------------------------------------- |
| 224 | * make a proper sized command based on the port and chip widths |
| 225 | */ |
Sebastian Siewior | 7746ed8 | 2008-07-15 13:35:23 +0200 | [diff] [blame] | 226 | static void flash_make_cmd(flash_info_t *info, u32 cmd, void *cmdbuf) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 227 | { |
| 228 | int i; |
Vasiliy Leoenenko | c47c0d4 | 2008-05-07 21:24:44 +0400 | [diff] [blame] | 229 | int cword_offset; |
| 230 | int cp_offset; |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 231 | #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Sebastian Siewior | d528cd6 | 2008-07-16 20:04:49 +0200 | [diff] [blame] | 232 | u32 cmd_le = cpu_to_le32(cmd); |
| 233 | #endif |
Vasiliy Leoenenko | c47c0d4 | 2008-05-07 21:24:44 +0400 | [diff] [blame] | 234 | uchar val; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 235 | uchar *cp = (uchar *) cmdbuf; |
| 236 | |
Vasiliy Leoenenko | c47c0d4 | 2008-05-07 21:24:44 +0400 | [diff] [blame] | 237 | for (i = info->portwidth; i > 0; i--){ |
| 238 | cword_offset = (info->portwidth-i)%info->chipwidth; |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 239 | #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Vasiliy Leoenenko | c47c0d4 | 2008-05-07 21:24:44 +0400 | [diff] [blame] | 240 | cp_offset = info->portwidth - i; |
Sebastian Siewior | d528cd6 | 2008-07-16 20:04:49 +0200 | [diff] [blame] | 241 | val = *((uchar*)&cmd_le + cword_offset); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 242 | #else |
Vasiliy Leoenenko | c47c0d4 | 2008-05-07 21:24:44 +0400 | [diff] [blame] | 243 | cp_offset = i - 1; |
Sebastian Siewior | 7746ed8 | 2008-07-15 13:35:23 +0200 | [diff] [blame] | 244 | val = *((uchar*)&cmd + sizeof(u32) - cword_offset - 1); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 245 | #endif |
Sebastian Siewior | 7746ed8 | 2008-07-15 13:35:23 +0200 | [diff] [blame] | 246 | cp[cp_offset] = (cword_offset >= sizeof(u32)) ? 0x00 : val; |
Vasiliy Leoenenko | c47c0d4 | 2008-05-07 21:24:44 +0400 | [diff] [blame] | 247 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 248 | } |
| 249 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 250 | #ifdef DEBUG |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 251 | /*----------------------------------------------------------------------- |
| 252 | * Debug support |
| 253 | */ |
Haavard Skinnemoen | 670a323 | 2007-12-13 12:56:29 +0100 | [diff] [blame] | 254 | static void print_longlong (char *str, unsigned long long data) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 255 | { |
| 256 | int i; |
| 257 | char *cp; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 258 | |
Wolfgang Denk | 49f4f6a | 2009-02-04 09:42:20 +0100 | [diff] [blame] | 259 | cp = (char *) &data; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 260 | for (i = 0; i < 8; i++) |
| 261 | sprintf (&str[i * 2], "%2.2x", *cp++); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 262 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 263 | |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 264 | static void flash_printqry (struct cfi_qry *qry) |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 265 | { |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 266 | u8 *p = (u8 *)qry; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 267 | int x, y; |
| 268 | |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 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(" "); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 274 | for (y = 0; y < 16; y++) { |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 275 | unsigned char c = p[x + y]; |
| 276 | if (c >= 0x20 && c <= 0x7e) |
| 277 | debug("%c", c); |
| 278 | else |
| 279 | debug("."); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 280 | } |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 281 | debug("\n"); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 282 | } |
| 283 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 284 | #endif |
| 285 | |
| 286 | |
| 287 | /*----------------------------------------------------------------------- |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 288 | * read a character at a port width address |
| 289 | */ |
Haavard Skinnemoen | 670a323 | 2007-12-13 12:56:29 +0100 | [diff] [blame] | 290 | static inline uchar flash_read_uchar (flash_info_t * info, uint offset) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 291 | { |
| 292 | uchar *cp; |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 293 | uchar retval; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 294 | |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 295 | cp = flash_map (info, 0, offset); |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 296 | #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 297 | retval = flash_read8(cp); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 298 | #else |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 299 | retval = flash_read8(cp + info->portwidth - 1); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 300 | #endif |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 301 | flash_unmap (info, 0, offset, cp); |
| 302 | return retval; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 303 | } |
| 304 | |
| 305 | /*----------------------------------------------------------------------- |
Tor Krill | 7f2a305 | 2008-03-28 11:29:10 +0100 | [diff] [blame] | 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 | /*----------------------------------------------------------------------- |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 320 | * read a long word by picking the least significant byte of each maximum |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 321 | * port size word. Swap for ppc format. |
| 322 | */ |
Haavard Skinnemoen | 670a323 | 2007-12-13 12:56:29 +0100 | [diff] [blame] | 323 | static ulong flash_read_long (flash_info_t * info, flash_sect_t sect, |
| 324 | uint offset) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 325 | { |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 326 | uchar *addr; |
| 327 | ulong retval; |
| 328 | |
| 329 | #ifdef DEBUG |
| 330 | int x; |
| 331 | #endif |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 332 | addr = flash_map (info, sect, offset); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 333 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 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++) { |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 338 | debug ("addr[%x] = 0x%x\n", x, flash_read8(addr + x)); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 339 | } |
| 340 | #endif |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 341 | #if defined(__LITTLE_ENDIAN) || defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 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)); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 346 | #else |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 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))); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 351 | #endif |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 352 | flash_unmap(info, sect, offset, addr); |
| 353 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 354 | return retval; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 355 | } |
| 356 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 357 | /* |
| 358 | * Write a proper sized command to the correct address |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 359 | */ |
Stefan Roese | 6e83e34 | 2009-10-27 15:15:55 +0100 | [diff] [blame] | 360 | void flash_write_cmd (flash_info_t * info, flash_sect_t sect, |
| 361 | uint offset, u32 cmd) |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 362 | { |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 363 | |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 364 | void *addr; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 365 | cfiword_t cword; |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 366 | |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 367 | addr = flash_map (info, sect, offset); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 368 | flash_make_cmd (info, cmd, &cword); |
| 369 | switch (info->portwidth) { |
| 370 | case FLASH_CFI_8BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 371 | debug ("fwc addr %p cmd %x %x 8bit x %d bit\n", addr, cmd, |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 372 | cword.c, info->chipwidth << CFI_FLASH_SHIFT_WIDTH); |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 373 | flash_write8(cword.c, addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 374 | break; |
| 375 | case FLASH_CFI_16BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 376 | debug ("fwc addr %p cmd %x %4.4x 16bit x %d bit\n", addr, |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 377 | cmd, cword.w, |
| 378 | info->chipwidth << CFI_FLASH_SHIFT_WIDTH); |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 379 | flash_write16(cword.w, addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 380 | break; |
| 381 | case FLASH_CFI_32BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 382 | debug ("fwc addr %p cmd %x %8.8lx 32bit x %d bit\n", addr, |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 383 | cmd, cword.l, |
| 384 | info->chipwidth << CFI_FLASH_SHIFT_WIDTH); |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 385 | flash_write32(cword.l, addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 386 | break; |
| 387 | case FLASH_CFI_64BIT: |
| 388 | #ifdef DEBUG |
| 389 | { |
| 390 | char str[20]; |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 391 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 392 | print_longlong (str, cword.ll); |
| 393 | |
| 394 | debug ("fwrite addr %p cmd %x %s 64 bit x %d bit\n", |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 395 | addr, cmd, str, |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 396 | info->chipwidth << CFI_FLASH_SHIFT_WIDTH); |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 397 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 398 | #endif |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 399 | flash_write64(cword.ll, addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 400 | break; |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 401 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 402 | |
| 403 | /* Ensure all the instructions are fully finished */ |
| 404 | sync(); |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 405 | |
| 406 | flash_unmap(info, sect, offset, addr); |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 407 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 408 | |
| 409 | static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect) |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 410 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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); |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 413 | } |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 414 | |
| 415 | /*----------------------------------------------------------------------- |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 416 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 417 | static int flash_isequal (flash_info_t * info, flash_sect_t sect, |
| 418 | uint offset, uchar cmd) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 419 | { |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 420 | void *addr; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 421 | cfiword_t cword; |
| 422 | int retval; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 423 | |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 424 | addr = flash_map (info, sect, offset); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 425 | flash_make_cmd (info, cmd, &cword); |
Stefan Roese | efef95b | 2006-04-01 13:41:03 +0200 | [diff] [blame] | 426 | |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 427 | debug ("is= cmd %x(%c) addr %p ", cmd, cmd, addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 428 | switch (info->portwidth) { |
| 429 | case FLASH_CFI_8BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 430 | debug ("is= %x %x\n", flash_read8(addr), cword.c); |
| 431 | retval = (flash_read8(addr) == cword.c); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 432 | break; |
| 433 | case FLASH_CFI_16BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 434 | debug ("is= %4.4x %4.4x\n", flash_read16(addr), cword.w); |
| 435 | retval = (flash_read16(addr) == cword.w); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 436 | break; |
| 437 | case FLASH_CFI_32BIT: |
Andrew Klossner | 7ddfafc | 2008-08-21 07:12:26 -0700 | [diff] [blame] | 438 | debug ("is= %8.8x %8.8lx\n", flash_read32(addr), cword.l); |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 439 | retval = (flash_read32(addr) == cword.l); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 440 | break; |
| 441 | case FLASH_CFI_64BIT: |
| 442 | #ifdef DEBUG |
| 443 | { |
| 444 | char str1[20]; |
| 445 | char str2[20]; |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 446 | |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 447 | print_longlong (str1, flash_read64(addr)); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 448 | print_longlong (str2, cword.ll); |
| 449 | debug ("is= %s %s\n", str1, str2); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 450 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 451 | #endif |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 452 | retval = (flash_read64(addr) == cword.ll); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 453 | break; |
| 454 | default: |
| 455 | retval = 0; |
| 456 | break; |
| 457 | } |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 458 | flash_unmap(info, sect, offset, addr); |
| 459 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 460 | return retval; |
| 461 | } |
Stefan Roese | efef95b | 2006-04-01 13:41:03 +0200 | [diff] [blame] | 462 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 463 | /*----------------------------------------------------------------------- |
| 464 | */ |
| 465 | static int flash_isset (flash_info_t * info, flash_sect_t sect, |
| 466 | uint offset, uchar cmd) |
| 467 | { |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 468 | void *addr; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 469 | cfiword_t cword; |
| 470 | int retval; |
Stefan Roese | efef95b | 2006-04-01 13:41:03 +0200 | [diff] [blame] | 471 | |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 472 | addr = flash_map (info, sect, offset); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 473 | flash_make_cmd (info, cmd, &cword); |
| 474 | switch (info->portwidth) { |
| 475 | case FLASH_CFI_8BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 476 | retval = ((flash_read8(addr) & cword.c) == cword.c); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 477 | break; |
| 478 | case FLASH_CFI_16BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 479 | retval = ((flash_read16(addr) & cword.w) == cword.w); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 480 | break; |
| 481 | case FLASH_CFI_32BIT: |
Stefan Roese | d4e37c0 | 2008-01-02 14:05:37 +0100 | [diff] [blame] | 482 | retval = ((flash_read32(addr) & cword.l) == cword.l); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 483 | break; |
| 484 | case FLASH_CFI_64BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 485 | retval = ((flash_read64(addr) & cword.ll) == cword.ll); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 486 | break; |
| 487 | default: |
| 488 | retval = 0; |
| 489 | break; |
| 490 | } |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 491 | flash_unmap(info, sect, offset, addr); |
| 492 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 493 | return retval; |
| 494 | } |
Stefan Roese | efef95b | 2006-04-01 13:41:03 +0200 | [diff] [blame] | 495 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 496 | /*----------------------------------------------------------------------- |
| 497 | */ |
| 498 | static int flash_toggle (flash_info_t * info, flash_sect_t sect, |
| 499 | uint offset, uchar cmd) |
| 500 | { |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 501 | void *addr; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 502 | cfiword_t cword; |
| 503 | int retval; |
wdenk | e85b7a5 | 2004-10-10 22:16:06 +0000 | [diff] [blame] | 504 | |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 505 | addr = flash_map (info, sect, offset); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 506 | flash_make_cmd (info, cmd, &cword); |
| 507 | switch (info->portwidth) { |
| 508 | case FLASH_CFI_8BIT: |
Stefan Roese | cff2b49 | 2008-06-16 10:40:02 +0200 | [diff] [blame] | 509 | retval = flash_read8(addr) != flash_read8(addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 510 | break; |
| 511 | case FLASH_CFI_16BIT: |
Stefan Roese | cff2b49 | 2008-06-16 10:40:02 +0200 | [diff] [blame] | 512 | retval = flash_read16(addr) != flash_read16(addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 513 | break; |
| 514 | case FLASH_CFI_32BIT: |
Stefan Roese | cff2b49 | 2008-06-16 10:40:02 +0200 | [diff] [blame] | 515 | retval = flash_read32(addr) != flash_read32(addr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 516 | break; |
| 517 | case FLASH_CFI_64BIT: |
Wolfgang Denk | 600e183 | 2008-10-31 01:12:28 +0100 | [diff] [blame] | 518 | retval = ( (flash_read32( addr ) != flash_read32( addr )) || |
| 519 | (flash_read32(addr+4) != flash_read32(addr+4)) ); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 520 | break; |
| 521 | default: |
| 522 | retval = 0; |
| 523 | break; |
| 524 | } |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 525 | flash_unmap(info, sect, offset, addr); |
| 526 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 527 | return retval; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 528 | } |
| 529 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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. |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 535 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 536 | static int flash_is_busy (flash_info_t * info, flash_sect_t sect) |
wdenk | 5c71a7a | 2005-05-16 15:23:22 +0000 | [diff] [blame] | 537 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 538 | int retval; |
wdenk | 5c71a7a | 2005-05-16 15:23:22 +0000 | [diff] [blame] | 539 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 540 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 541 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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; |
wdenk | 5c71a7a | 2005-05-16 15:23:22 +0000 | [diff] [blame] | 555 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 556 | debug ("flash_is_busy: %d\n", retval); |
| 557 | return retval; |
wdenk | 5c71a7a | 2005-05-16 15:23:22 +0000 | [diff] [blame] | 558 | } |
| 559 | |
| 560 | /*----------------------------------------------------------------------- |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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. |
wdenk | 5c71a7a | 2005-05-16 15:23:22 +0000 | [diff] [blame] | 563 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 564 | static int flash_status_check (flash_info_t * info, flash_sect_t sector, |
| 565 | ulong tout, char *prompt) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 566 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 567 | ulong start; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 568 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 569 | #if CONFIG_SYS_HZ != 1000 |
Renato Andreola | ac6693d | 2010-03-24 23:00:47 +0800 | [diff] [blame] | 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); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 574 | #endif |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 575 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 576 | /* Wait for command completion */ |
Graeme Russ | 13ec42b | 2011-07-15 02:18:56 +0000 | [diff] [blame] | 577 | #ifdef CONFIG_SYS_LOW_RES_TIMER |
Thomas Chou | 4b7e668 | 2010-04-01 11:15:05 +0800 | [diff] [blame] | 578 | reset_timer(); |
Graeme Russ | 13ec42b | 2011-07-15 02:18:56 +0000 | [diff] [blame] | 579 | #endif |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 580 | start = get_timer (0); |
Jens Scharsig (BuS Elektronik) | 287a158 | 2012-01-27 09:29:53 +0100 | [diff] [blame] | 581 | WATCHDOG_RESET(); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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); |
Aaron Williams | ffcef2f | 2011-04-12 00:59:04 -0700 | [diff] [blame] | 588 | udelay(1); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 589 | return ERR_TIMOUT; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 590 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 591 | udelay (1); /* also triggers watchdog */ |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 592 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 593 | return ERR_OK; |
| 594 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 595 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 606 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 607 | retcode = flash_status_check (info, sector, tout, prompt); |
| 608 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 609 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 610 | case CFI_CMDSET_INTEL_EXTENDED: |
| 611 | case CFI_CMDSET_INTEL_STANDARD: |
Ed Swarthout | 2da1410 | 2008-10-09 01:26:36 -0500 | [diff] [blame] | 612 | if ((retcode != ERR_OK) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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"); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 627 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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"); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 634 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 635 | flash_write_cmd (info, sector, 0, info->cmd_reset); |
Aaron Williams | ffcef2f | 2011-04-12 00:59:04 -0700 | [diff] [blame] | 636 | udelay(1); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 637 | break; |
| 638 | default: |
| 639 | break; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 640 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 641 | return retcode; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 642 | } |
| 643 | |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 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 */ |
Graeme Russ | 13ec42b | 2011-07-15 02:18:56 +0000 | [diff] [blame] | 669 | #ifdef CONFIG_SYS_LOW_RES_TIMER |
Thomas Chou | 4b7e668 | 2010-04-01 11:15:05 +0800 | [diff] [blame] | 670 | reset_timer(); |
Graeme Russ | 13ec42b | 2011-07-15 02:18:56 +0000 | [diff] [blame] | 671 | #endif |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 672 | start = get_timer(0); |
Jens Scharsig (BuS Elektronik) | 287a158 | 2012-01-27 09:29:53 +0100 | [diff] [blame] | 673 | WATCHDOG_RESET(); |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 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 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 705 | /*----------------------------------------------------------------------- |
| 706 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 707 | static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 708 | { |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 709 | #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 710 | unsigned short w; |
| 711 | unsigned int l; |
| 712 | unsigned long long ll; |
| 713 | #endif |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 714 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 715 | switch (info->portwidth) { |
| 716 | case FLASH_CFI_8BIT: |
| 717 | cword->c = c; |
| 718 | break; |
| 719 | case FLASH_CFI_16BIT: |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 720 | #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 721 | w = c; |
| 722 | w <<= 8; |
| 723 | cword->w = (cword->w >> 8) | w; |
| 724 | #else |
| 725 | cword->w = (cword->w << 8) | c; |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 726 | #endif |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 727 | break; |
| 728 | case FLASH_CFI_32BIT: |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 729 | #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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: |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 738 | #if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SYS_WRITE_SWAPPED_DATA) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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; |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 746 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 747 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 748 | |
Jens Gehrlein | 8ee4add | 2008-12-16 17:25:55 +0100 | [diff] [blame] | 749 | /* |
| 750 | * Loop through the sector table starting from the previously found sector. |
| 751 | * Searches forwards or backwards, dependent on the passed address. |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 752 | */ |
| 753 | static flash_sect_t find_sector (flash_info_t * info, ulong addr) |
| 754 | { |
Jens Gehrlein | 8ee4add | 2008-12-16 17:25:55 +0100 | [diff] [blame] | 755 | static flash_sect_t saved_sector = 0; /* previously found sector */ |
Martin Krause | be9d568 | 2011-03-21 18:07:56 +0100 | [diff] [blame] | 756 | static flash_info_t *saved_info = 0; /* previously used flash bank */ |
Jens Gehrlein | 8ee4add | 2008-12-16 17:25:55 +0100 | [diff] [blame] | 757 | flash_sect_t sector = saved_sector; |
| 758 | |
Martin Krause | be9d568 | 2011-03-21 18:07:56 +0100 | [diff] [blame] | 759 | if ((info != saved_info) || (sector >= info->sector_count)) |
| 760 | sector = 0; |
| 761 | |
Jens Gehrlein | 8ee4add | 2008-12-16 17:25:55 +0100 | [diff] [blame] | 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--; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 771 | |
Jens Gehrlein | 8ee4add | 2008-12-16 17:25:55 +0100 | [diff] [blame] | 772 | saved_sector = sector; |
Martin Krause | be9d568 | 2011-03-21 18:07:56 +0100 | [diff] [blame] | 773 | saved_info = info; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 774 | return sector; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 775 | } |
| 776 | |
| 777 | /*----------------------------------------------------------------------- |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 778 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 779 | static int flash_write_cfiword (flash_info_t * info, ulong dest, |
| 780 | cfiword_t cword) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 781 | { |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 782 | void *dstaddr = (void *)dest; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 783 | int flag; |
Jens Gehrlein | 1e814cf | 2008-12-16 17:25:54 +0100 | [diff] [blame] | 784 | flash_sect_t sect = 0; |
| 785 | char sect_found = 0; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 786 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 787 | /* Check if Flash is (sufficiently) erased */ |
| 788 | switch (info->portwidth) { |
| 789 | case FLASH_CFI_8BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 790 | flag = ((flash_read8(dstaddr) & cword.c) == cword.c); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 791 | break; |
| 792 | case FLASH_CFI_16BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 793 | flag = ((flash_read16(dstaddr) & cword.w) == cword.w); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 794 | break; |
| 795 | case FLASH_CFI_32BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 796 | flag = ((flash_read32(dstaddr) & cword.l) == cword.l); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 797 | break; |
| 798 | case FLASH_CFI_64BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 799 | flag = ((flash_read64(dstaddr) & cword.ll) == cword.ll); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 800 | break; |
| 801 | default: |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 802 | flag = 0; |
| 803 | break; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 804 | } |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 805 | if (!flag) |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 806 | return ERR_NOT_ERASED; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 807 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 808 | /* Disable interrupts which might cause a timeout here */ |
| 809 | flag = disable_interrupts (); |
Stefan Roese | c865e6c | 2006-02-28 15:29:58 +0100 | [diff] [blame] | 810 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 811 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 812 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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: |
Ed Swarthout | 2da1410 | 2008-10-09 01:26:36 -0500 | [diff] [blame] | 820 | sect = find_sector(info, dest); |
| 821 | flash_unlock_seq (info, sect); |
| 822 | flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE); |
Jens Gehrlein | 1e814cf | 2008-12-16 17:25:54 +0100 | [diff] [blame] | 823 | sect_found = 1; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 824 | break; |
Po-Yu Chuang | 3f48340 | 2009-07-10 18:03:57 +0800 | [diff] [blame] | 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 |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 833 | } |
| 834 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 835 | switch (info->portwidth) { |
| 836 | case FLASH_CFI_8BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 837 | flash_write8(cword.c, dstaddr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 838 | break; |
| 839 | case FLASH_CFI_16BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 840 | flash_write16(cword.w, dstaddr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 841 | break; |
| 842 | case FLASH_CFI_32BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 843 | flash_write32(cword.l, dstaddr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 844 | break; |
| 845 | case FLASH_CFI_64BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 846 | flash_write64(cword.ll, dstaddr); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 847 | break; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 848 | } |
| 849 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 850 | /* re-enable interrupts if necessary */ |
| 851 | if (flag) |
| 852 | enable_interrupts (); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 853 | |
Jens Gehrlein | 1e814cf | 2008-12-16 17:25:54 +0100 | [diff] [blame] | 854 | if (!sect_found) |
| 855 | sect = find_sector (info, dest); |
| 856 | |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 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"); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 863 | } |
| 864 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 865 | #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 866 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 867 | static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, |
| 868 | int len) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 869 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 870 | flash_sect_t sector; |
| 871 | int cnt; |
| 872 | int retcode; |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 873 | void *src = cp; |
Stefan Roese | 42c6ace | 2009-02-05 11:25:57 +0100 | [diff] [blame] | 874 | void *dst = (void *)dest; |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 875 | void *dst2 = dst; |
Tao Hou | dd3b455 | 2012-03-15 23:33:58 +0800 | [diff] [blame] | 876 | int flag = 1; |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 877 | uint offset = 0; |
| 878 | unsigned int shift; |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 879 | uchar write_cmd; |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 880 | |
| 881 | switch (info->portwidth) { |
| 882 | case FLASH_CFI_8BIT: |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 883 | shift = 0; |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 884 | break; |
| 885 | case FLASH_CFI_16BIT: |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 886 | shift = 1; |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 887 | break; |
| 888 | case FLASH_CFI_32BIT: |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 889 | shift = 2; |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 890 | break; |
| 891 | case FLASH_CFI_64BIT: |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 892 | shift = 3; |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 893 | break; |
| 894 | default: |
| 895 | retcode = ERR_INVAL; |
| 896 | goto out_unmap; |
| 897 | } |
| 898 | |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 899 | cnt = len >> shift; |
| 900 | |
Tao Hou | dd3b455 | 2012-03-15 23:33:58 +0800 | [diff] [blame] | 901 | while ((cnt-- > 0) && (flag == 1)) { |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 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 | } |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 929 | |
Stefan Roese | 707c146 | 2007-12-27 07:50:54 +0100 | [diff] [blame] | 930 | src = cp; |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 931 | sector = find_sector (info, dest); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 932 | |
| 933 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 934 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 935 | case CFI_CMDSET_INTEL_STANDARD: |
| 936 | case CFI_CMDSET_INTEL_EXTENDED: |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 937 | write_cmd = (info->vendor == CFI_CMDSET_INTEL_PROG_REGIONS) ? |
| 938 | FLASH_CMD_WRITE_BUFFER_PROG : FLASH_CMD_WRITE_TO_BUFFER; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 939 | flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 940 | flash_write_cmd (info, sector, 0, FLASH_CMD_READ_STATUS); |
| 941 | flash_write_cmd (info, sector, 0, write_cmd); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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 */ |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 948 | cnt = len >> shift; |
Vasiliy Leoenenko | c47c0d4 | 2008-05-07 21:24:44 +0400 | [diff] [blame] | 949 | flash_write_cmd (info, sector, 0, cnt - 1); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 950 | while (cnt-- > 0) { |
| 951 | switch (info->portwidth) { |
| 952 | case FLASH_CFI_8BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 953 | flash_write8(flash_read8(src), dst); |
| 954 | src += 1, dst += 1; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 955 | break; |
| 956 | case FLASH_CFI_16BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 957 | flash_write16(flash_read16(src), dst); |
| 958 | src += 2, dst += 2; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 959 | break; |
| 960 | case FLASH_CFI_32BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 961 | flash_write32(flash_read32(src), dst); |
| 962 | src += 4, dst += 4; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 963 | break; |
| 964 | case FLASH_CFI_64BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 965 | flash_write64(flash_read64(src), dst); |
| 966 | src += 8, dst += 8; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 967 | break; |
| 968 | default: |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 969 | retcode = ERR_INVAL; |
| 970 | goto out_unmap; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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 | } |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 979 | |
| 980 | break; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 981 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 982 | case CFI_CMDSET_AMD_STANDARD: |
| 983 | case CFI_CMDSET_AMD_EXTENDED: |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 984 | flash_unlock_seq(info,0); |
Guennadi Liakhovetski | 183284f | 2008-04-03 13:36:02 +0200 | [diff] [blame] | 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; |
John Schmoller | ee35588 | 2009-08-12 10:55:47 -0500 | [diff] [blame] | 991 | flash_write_cmd(info, sector, offset, cnt - 1); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 992 | |
| 993 | switch (info->portwidth) { |
| 994 | case FLASH_CFI_8BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 995 | while (cnt-- > 0) { |
| 996 | flash_write8(flash_read8(src), dst); |
| 997 | src += 1, dst += 1; |
| 998 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 999 | break; |
| 1000 | case FLASH_CFI_16BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 1001 | while (cnt-- > 0) { |
| 1002 | flash_write16(flash_read16(src), dst); |
| 1003 | src += 2, dst += 2; |
| 1004 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1005 | break; |
| 1006 | case FLASH_CFI_32BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 1007 | while (cnt-- > 0) { |
| 1008 | flash_write32(flash_read32(src), dst); |
| 1009 | src += 4, dst += 4; |
| 1010 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1011 | break; |
| 1012 | case FLASH_CFI_64BIT: |
Haavard Skinnemoen | 21b95b4 | 2007-12-13 12:56:32 +0100 | [diff] [blame] | 1013 | while (cnt-- > 0) { |
| 1014 | flash_write64(flash_read64(src), dst); |
| 1015 | src += 8, dst += 8; |
| 1016 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1017 | break; |
| 1018 | default: |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1019 | retcode = ERR_INVAL; |
| 1020 | goto out_unmap; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1021 | } |
| 1022 | |
| 1023 | flash_write_cmd (info, sector, 0, AMD_CMD_WRITE_BUFFER_CONFIRM); |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 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"); |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1033 | break; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1034 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1035 | default: |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1036 | debug ("Unknown Command Set\n"); |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1037 | retcode = ERR_INVAL; |
| 1038 | break; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1039 | } |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1040 | |
| 1041 | out_unmap: |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1042 | return retcode; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1043 | } |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1044 | #endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1045 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1046 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1047 | /*----------------------------------------------------------------------- |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1048 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1049 | int flash_erase (flash_info_t * info, int s_first, int s_last) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1050 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1051 | int rcode = 0; |
| 1052 | int prot; |
| 1053 | flash_sect_t sect; |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 1054 | int st; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1055 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 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 | } |
Stefan Roese | efef95b | 2006-04-01 13:41:03 +0200 | [diff] [blame] | 1064 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1065 | prot = 0; |
| 1066 | for (sect = s_first; sect <= s_last; ++sect) { |
| 1067 | if (info->protect[sect]) { |
| 1068 | prot++; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1069 | } |
| 1070 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1071 | if (prot) { |
| 1072 | printf ("- Warning: %d protected sectors will not be erased!\n", |
| 1073 | prot); |
Piotr Ziecik | 2a7493c | 2008-11-17 15:49:32 +0100 | [diff] [blame] | 1074 | } else if (flash_verbose) { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1075 | putc ('\n'); |
| 1076 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1077 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1078 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1079 | for (sect = s_first; sect <= s_last; sect++) { |
| 1080 | if (info->protect[sect] == 0) { /* not protected */ |
| 1081 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 1082 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1083 | case CFI_CMDSET_INTEL_STANDARD: |
| 1084 | case CFI_CMDSET_INTEL_EXTENDED: |
| 1085 | flash_write_cmd (info, sect, 0, |
| 1086 | FLASH_CMD_CLEAR_STATUS); |
| 1087 | flash_write_cmd (info, sect, 0, |
| 1088 | FLASH_CMD_BLOCK_ERASE); |
| 1089 | flash_write_cmd (info, sect, 0, |
| 1090 | FLASH_CMD_ERASE_CONFIRM); |
| 1091 | break; |
| 1092 | case CFI_CMDSET_AMD_STANDARD: |
| 1093 | case CFI_CMDSET_AMD_EXTENDED: |
| 1094 | flash_unlock_seq (info, sect); |
| 1095 | flash_write_cmd (info, sect, |
| 1096 | info->addr_unlock1, |
| 1097 | AMD_CMD_ERASE_START); |
| 1098 | flash_unlock_seq (info, sect); |
| 1099 | flash_write_cmd (info, sect, 0, |
| 1100 | AMD_CMD_ERASE_SECTOR); |
| 1101 | break; |
| 1102 | #ifdef CONFIG_FLASH_CFI_LEGACY |
| 1103 | case CFI_CMDSET_AMD_LEGACY: |
| 1104 | flash_unlock_seq (info, 0); |
| 1105 | flash_write_cmd (info, 0, info->addr_unlock1, |
| 1106 | AMD_CMD_ERASE_START); |
| 1107 | flash_unlock_seq (info, 0); |
| 1108 | flash_write_cmd (info, sect, 0, |
| 1109 | AMD_CMD_ERASE_SECTOR); |
| 1110 | break; |
| 1111 | #endif |
| 1112 | default: |
| 1113 | debug ("Unkown flash vendor %d\n", |
| 1114 | info->vendor); |
| 1115 | break; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1116 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1117 | |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 1118 | if (use_flash_status_poll(info)) { |
| 1119 | cfiword_t cword = (cfiword_t)0xffffffffffffffffULL; |
| 1120 | void *dest; |
| 1121 | dest = flash_map(info, sect, 0); |
| 1122 | st = flash_status_poll(info, &cword, dest, |
| 1123 | info->erase_blk_tout, "erase"); |
| 1124 | flash_unmap(info, sect, 0, dest); |
| 1125 | } else |
| 1126 | st = flash_full_status_check(info, sect, |
| 1127 | info->erase_blk_tout, |
| 1128 | "erase"); |
| 1129 | if (st) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1130 | rcode = 1; |
Thomas Chou | 076767a | 2010-03-26 08:17:00 +0800 | [diff] [blame] | 1131 | else if (flash_verbose) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1132 | putc ('.'); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1133 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1134 | } |
Piotr Ziecik | 2a7493c | 2008-11-17 15:49:32 +0100 | [diff] [blame] | 1135 | |
| 1136 | if (flash_verbose) |
| 1137 | puts (" done\n"); |
| 1138 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1139 | return rcode; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1140 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1141 | |
Stefan Roese | b6f508d | 2010-08-13 09:36:36 +0200 | [diff] [blame] | 1142 | #ifdef CONFIG_SYS_FLASH_EMPTY_INFO |
| 1143 | static int sector_erased(flash_info_t *info, int i) |
| 1144 | { |
| 1145 | int k; |
| 1146 | int size; |
Stefan Roese | a9153f2 | 2010-10-25 18:31:39 +0200 | [diff] [blame] | 1147 | u32 *flash; |
Stefan Roese | b6f508d | 2010-08-13 09:36:36 +0200 | [diff] [blame] | 1148 | |
| 1149 | /* |
| 1150 | * Check if whole sector is erased |
| 1151 | */ |
| 1152 | size = flash_sector_size(info, i); |
Stefan Roese | a9153f2 | 2010-10-25 18:31:39 +0200 | [diff] [blame] | 1153 | flash = (u32 *)info->start[i]; |
Stefan Roese | b6f508d | 2010-08-13 09:36:36 +0200 | [diff] [blame] | 1154 | /* divide by 4 for longword access */ |
| 1155 | size = size >> 2; |
| 1156 | |
| 1157 | for (k = 0; k < size; k++) { |
Stefan Roese | a9153f2 | 2010-10-25 18:31:39 +0200 | [diff] [blame] | 1158 | if (flash_read32(flash++) != 0xffffffff) |
Stefan Roese | b6f508d | 2010-08-13 09:36:36 +0200 | [diff] [blame] | 1159 | return 0; /* not erased */ |
| 1160 | } |
| 1161 | |
| 1162 | return 1; /* erased */ |
| 1163 | } |
| 1164 | #endif /* CONFIG_SYS_FLASH_EMPTY_INFO */ |
| 1165 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1166 | void flash_print_info (flash_info_t * info) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1167 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1168 | int i; |
wdenk | 369d43d | 2004-03-14 14:09:05 +0000 | [diff] [blame] | 1169 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1170 | if (info->flash_id != FLASH_MAN_CFI) { |
| 1171 | puts ("missing or unknown FLASH type\n"); |
| 1172 | return; |
| 1173 | } |
| 1174 | |
Peter Tyser | 0b5a263 | 2010-12-28 18:12:05 -0600 | [diff] [blame] | 1175 | printf ("%s flash (%d x %d)", |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1176 | info->name, |
| 1177 | (info->portwidth << 3), (info->chipwidth << 3)); |
| 1178 | if (info->size < 1024*1024) |
| 1179 | printf (" Size: %ld kB in %d Sectors\n", |
| 1180 | info->size >> 10, info->sector_count); |
| 1181 | else |
| 1182 | printf (" Size: %ld MB in %d Sectors\n", |
| 1183 | info->size >> 20, info->sector_count); |
| 1184 | printf (" "); |
| 1185 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 1186 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
| 1187 | printf ("Intel Prog Regions"); |
| 1188 | break; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1189 | case CFI_CMDSET_INTEL_STANDARD: |
| 1190 | printf ("Intel Standard"); |
| 1191 | break; |
| 1192 | case CFI_CMDSET_INTEL_EXTENDED: |
| 1193 | printf ("Intel Extended"); |
| 1194 | break; |
| 1195 | case CFI_CMDSET_AMD_STANDARD: |
| 1196 | printf ("AMD Standard"); |
| 1197 | break; |
| 1198 | case CFI_CMDSET_AMD_EXTENDED: |
| 1199 | printf ("AMD Extended"); |
| 1200 | break; |
| 1201 | #ifdef CONFIG_FLASH_CFI_LEGACY |
| 1202 | case CFI_CMDSET_AMD_LEGACY: |
| 1203 | printf ("AMD Legacy"); |
| 1204 | break; |
wdenk | 369d43d | 2004-03-14 14:09:05 +0000 | [diff] [blame] | 1205 | #endif |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1206 | default: |
| 1207 | printf ("Unknown (%d)", info->vendor); |
| 1208 | break; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1209 | } |
Philippe De Muyter | 35bc081 | 2010-08-10 16:54:52 +0200 | [diff] [blame] | 1210 | printf (" command set, Manufacturer ID: 0x%02X, Device ID: 0x", |
| 1211 | info->manufacturer_id); |
| 1212 | printf (info->chipwidth == FLASH_CFI_16BIT ? "%04X" : "%02X", |
| 1213 | info->device_id); |
Heiko Schocher | 27cea50 | 2011-04-11 14:16:19 +0200 | [diff] [blame] | 1214 | if ((info->device_id & 0xff) == 0x7E) { |
| 1215 | printf(info->chipwidth == FLASH_CFI_16BIT ? "%04X" : "%02X", |
| 1216 | info->device_id2); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1217 | } |
| 1218 | printf ("\n Erase timeout: %ld ms, write timeout: %ld ms\n", |
| 1219 | info->erase_blk_tout, |
| 1220 | info->write_tout); |
| 1221 | if (info->buffer_size > 1) { |
| 1222 | printf (" Buffer write timeout: %ld ms, " |
| 1223 | "buffer size: %d bytes\n", |
| 1224 | info->buffer_write_tout, |
| 1225 | info->buffer_size); |
| 1226 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1227 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1228 | puts ("\n Sector Start Addresses:"); |
| 1229 | for (i = 0; i < info->sector_count; ++i) { |
Kim Phillips | c8836f1 | 2010-07-26 18:35:39 -0500 | [diff] [blame] | 1230 | if (ctrlc()) |
Stefan Roese | b6f508d | 2010-08-13 09:36:36 +0200 | [diff] [blame] | 1231 | break; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1232 | if ((i % 5) == 0) |
Stefan Roese | b6f508d | 2010-08-13 09:36:36 +0200 | [diff] [blame] | 1233 | putc('\n'); |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1234 | #ifdef CONFIG_SYS_FLASH_EMPTY_INFO |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1235 | /* print empty and read-only info */ |
| 1236 | printf (" %08lX %c %s ", |
| 1237 | info->start[i], |
Stefan Roese | b6f508d | 2010-08-13 09:36:36 +0200 | [diff] [blame] | 1238 | sector_erased(info, i) ? 'E' : ' ', |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1239 | info->protect[i] ? "RO" : " "); |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1240 | #else /* ! CONFIG_SYS_FLASH_EMPTY_INFO */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1241 | printf (" %08lX %s ", |
| 1242 | info->start[i], |
| 1243 | info->protect[i] ? "RO" : " "); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1244 | #endif |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1245 | } |
| 1246 | putc ('\n'); |
| 1247 | return; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1248 | } |
| 1249 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1250 | /*----------------------------------------------------------------------- |
Jerry Van Baren | aae7357 | 2008-03-08 13:48:01 -0500 | [diff] [blame] | 1251 | * This is used in a few places in write_buf() to show programming |
| 1252 | * progress. Making it a function is nasty because it needs to do side |
| 1253 | * effect updates to digit and dots. Repeated code is nasty too, so |
| 1254 | * we define it once here. |
| 1255 | */ |
Stefan Roese | 7758c16 | 2008-03-19 07:09:26 +0100 | [diff] [blame] | 1256 | #ifdef CONFIG_FLASH_SHOW_PROGRESS |
| 1257 | #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) \ |
Piotr Ziecik | 2a7493c | 2008-11-17 15:49:32 +0100 | [diff] [blame] | 1258 | if (flash_verbose) { \ |
| 1259 | dots -= dots_sub; \ |
| 1260 | if ((scale > 0) && (dots <= 0)) { \ |
| 1261 | if ((digit % 5) == 0) \ |
| 1262 | printf ("%d", digit / 5); \ |
| 1263 | else \ |
| 1264 | putc ('.'); \ |
| 1265 | digit--; \ |
| 1266 | dots += scale; \ |
| 1267 | } \ |
Jerry Van Baren | aae7357 | 2008-03-08 13:48:01 -0500 | [diff] [blame] | 1268 | } |
Stefan Roese | 7758c16 | 2008-03-19 07:09:26 +0100 | [diff] [blame] | 1269 | #else |
| 1270 | #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) |
| 1271 | #endif |
Jerry Van Baren | aae7357 | 2008-03-08 13:48:01 -0500 | [diff] [blame] | 1272 | |
| 1273 | /*----------------------------------------------------------------------- |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1274 | * Copy memory to flash, returns: |
| 1275 | * 0 - OK |
| 1276 | * 1 - write timeout |
| 1277 | * 2 - Flash not erased |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1278 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1279 | int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1280 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1281 | ulong wp; |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1282 | uchar *p; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1283 | int aln; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1284 | cfiword_t cword; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1285 | int i, rc; |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1286 | #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1287 | int buffered_size; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1288 | #endif |
Jerry Van Baren | aae7357 | 2008-03-08 13:48:01 -0500 | [diff] [blame] | 1289 | #ifdef CONFIG_FLASH_SHOW_PROGRESS |
| 1290 | int digit = CONFIG_FLASH_SHOW_PROGRESS; |
| 1291 | int scale = 0; |
| 1292 | int dots = 0; |
| 1293 | |
| 1294 | /* |
| 1295 | * Suppress if there are fewer than CONFIG_FLASH_SHOW_PROGRESS writes. |
| 1296 | */ |
| 1297 | if (cnt >= CONFIG_FLASH_SHOW_PROGRESS) { |
| 1298 | scale = (int)((cnt + CONFIG_FLASH_SHOW_PROGRESS - 1) / |
| 1299 | CONFIG_FLASH_SHOW_PROGRESS); |
| 1300 | } |
| 1301 | #endif |
| 1302 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1303 | /* get lower aligned address */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1304 | wp = (addr & ~(info->portwidth - 1)); |
Haiying Wang | c123a38 | 2007-02-21 16:52:31 +0100 | [diff] [blame] | 1305 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1306 | /* handle unaligned start */ |
| 1307 | if ((aln = addr - wp) != 0) { |
| 1308 | cword.l = 0; |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1309 | p = (uchar *)wp; |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1310 | for (i = 0; i < aln; ++i) |
| 1311 | flash_add_byte (info, &cword, flash_read8(p + i)); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1312 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1313 | for (; (i < info->portwidth) && (cnt > 0); i++) { |
| 1314 | flash_add_byte (info, &cword, *src++); |
| 1315 | cnt--; |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1316 | } |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1317 | for (; (cnt == 0) && (i < info->portwidth); ++i) |
| 1318 | flash_add_byte (info, &cword, flash_read8(p + i)); |
| 1319 | |
| 1320 | rc = flash_write_cfiword (info, wp, cword); |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1321 | if (rc != 0) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1322 | return rc; |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1323 | |
| 1324 | wp += i; |
Stefan Roese | 7758c16 | 2008-03-19 07:09:26 +0100 | [diff] [blame] | 1325 | FLASH_SHOW_PROGRESS(scale, dots, digit, i); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1326 | } |
| 1327 | |
| 1328 | /* handle the aligned part */ |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1329 | #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1330 | buffered_size = (info->portwidth / info->chipwidth); |
| 1331 | buffered_size *= info->buffer_size; |
| 1332 | while (cnt >= info->portwidth) { |
| 1333 | /* prohibit buffer write when buffer_size is 1 */ |
| 1334 | if (info->buffer_size == 1) { |
| 1335 | cword.l = 0; |
| 1336 | for (i = 0; i < info->portwidth; i++) |
| 1337 | flash_add_byte (info, &cword, *src++); |
| 1338 | if ((rc = flash_write_cfiword (info, wp, cword)) != 0) |
| 1339 | return rc; |
| 1340 | wp += info->portwidth; |
| 1341 | cnt -= info->portwidth; |
| 1342 | continue; |
| 1343 | } |
| 1344 | |
| 1345 | /* write buffer until next buffered_size aligned boundary */ |
| 1346 | i = buffered_size - (wp % buffered_size); |
| 1347 | if (i > cnt) |
| 1348 | i = cnt; |
| 1349 | if ((rc = flash_write_cfibuffer (info, wp, src, i)) != ERR_OK) |
| 1350 | return rc; |
| 1351 | i -= i & (info->portwidth - 1); |
| 1352 | wp += i; |
| 1353 | src += i; |
| 1354 | cnt -= i; |
Stefan Roese | 7758c16 | 2008-03-19 07:09:26 +0100 | [diff] [blame] | 1355 | FLASH_SHOW_PROGRESS(scale, dots, digit, i); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1356 | } |
| 1357 | #else |
| 1358 | while (cnt >= info->portwidth) { |
| 1359 | cword.l = 0; |
| 1360 | for (i = 0; i < info->portwidth; i++) { |
| 1361 | flash_add_byte (info, &cword, *src++); |
| 1362 | } |
| 1363 | if ((rc = flash_write_cfiword (info, wp, cword)) != 0) |
| 1364 | return rc; |
| 1365 | wp += info->portwidth; |
| 1366 | cnt -= info->portwidth; |
Stefan Roese | 7758c16 | 2008-03-19 07:09:26 +0100 | [diff] [blame] | 1367 | FLASH_SHOW_PROGRESS(scale, dots, digit, info->portwidth); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1368 | } |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1369 | #endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */ |
Jerry Van Baren | aae7357 | 2008-03-08 13:48:01 -0500 | [diff] [blame] | 1370 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1371 | if (cnt == 0) { |
| 1372 | return (0); |
| 1373 | } |
| 1374 | |
| 1375 | /* |
| 1376 | * handle unaligned tail bytes |
| 1377 | */ |
| 1378 | cword.l = 0; |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1379 | p = (uchar *)wp; |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1380 | for (i = 0; (i < info->portwidth) && (cnt > 0); ++i) { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1381 | flash_add_byte (info, &cword, *src++); |
| 1382 | --cnt; |
| 1383 | } |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1384 | for (; i < info->portwidth; ++i) |
| 1385 | flash_add_byte (info, &cword, flash_read8(p + i)); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1386 | |
| 1387 | return flash_write_cfiword (info, wp, cword); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1388 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1389 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1390 | /*----------------------------------------------------------------------- |
| 1391 | */ |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1392 | #ifdef CONFIG_SYS_FLASH_PROTECTION |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1393 | |
| 1394 | int flash_real_protect (flash_info_t * info, long sector, int prot) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1395 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1396 | int retcode = 0; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1397 | |
Rafael Campos | 13d2b61 | 2008-07-31 10:22:20 +0200 | [diff] [blame] | 1398 | switch (info->vendor) { |
| 1399 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
| 1400 | case CFI_CMDSET_INTEL_STANDARD: |
Nick Spence | ec81b47 | 2008-08-19 22:21:16 -0700 | [diff] [blame] | 1401 | case CFI_CMDSET_INTEL_EXTENDED: |
Philippe De Muyter | ca6cd16 | 2010-08-17 18:40:25 +0200 | [diff] [blame] | 1402 | /* |
| 1403 | * see errata called |
| 1404 | * "Numonyx Axcell P33/P30 Specification Update" :) |
| 1405 | */ |
| 1406 | flash_write_cmd (info, sector, 0, FLASH_CMD_READ_ID); |
| 1407 | if (!flash_isequal (info, sector, FLASH_OFFSET_PROTECT, |
| 1408 | prot)) { |
| 1409 | /* |
| 1410 | * cmd must come before FLASH_CMD_PROTECT + 20us |
| 1411 | * Disable interrupts which might cause a timeout here. |
| 1412 | */ |
| 1413 | int flag = disable_interrupts (); |
| 1414 | unsigned short cmd; |
| 1415 | |
| 1416 | if (prot) |
| 1417 | cmd = FLASH_CMD_PROTECT_SET; |
| 1418 | else |
| 1419 | cmd = FLASH_CMD_PROTECT_CLEAR; |
| 1420 | |
Rafael Campos | 13d2b61 | 2008-07-31 10:22:20 +0200 | [diff] [blame] | 1421 | flash_write_cmd (info, sector, 0, |
Philippe De Muyter | ca6cd16 | 2010-08-17 18:40:25 +0200 | [diff] [blame] | 1422 | FLASH_CMD_PROTECT); |
| 1423 | flash_write_cmd (info, sector, 0, cmd); |
| 1424 | /* re-enable interrupts if necessary */ |
| 1425 | if (flag) |
| 1426 | enable_interrupts (); |
| 1427 | } |
Rafael Campos | 13d2b61 | 2008-07-31 10:22:20 +0200 | [diff] [blame] | 1428 | break; |
| 1429 | case CFI_CMDSET_AMD_EXTENDED: |
| 1430 | case CFI_CMDSET_AMD_STANDARD: |
Rafael Campos | 13d2b61 | 2008-07-31 10:22:20 +0200 | [diff] [blame] | 1431 | /* U-Boot only checks the first byte */ |
| 1432 | if (info->manufacturer_id == (uchar)ATM_MANUFACT) { |
| 1433 | if (prot) { |
| 1434 | flash_unlock_seq (info, 0); |
| 1435 | flash_write_cmd (info, 0, |
| 1436 | info->addr_unlock1, |
| 1437 | ATM_CMD_SOFTLOCK_START); |
| 1438 | flash_unlock_seq (info, 0); |
| 1439 | flash_write_cmd (info, sector, 0, |
| 1440 | ATM_CMD_LOCK_SECT); |
| 1441 | } else { |
| 1442 | flash_write_cmd (info, 0, |
| 1443 | info->addr_unlock1, |
| 1444 | AMD_CMD_UNLOCK_START); |
| 1445 | if (info->device_id == ATM_ID_BV6416) |
| 1446 | flash_write_cmd (info, sector, |
| 1447 | 0, ATM_CMD_UNLOCK_SECT); |
| 1448 | } |
| 1449 | } |
| 1450 | break; |
TsiChung Liew | b8c1929 | 2008-08-19 16:53:39 +0000 | [diff] [blame] | 1451 | #ifdef CONFIG_FLASH_CFI_LEGACY |
| 1452 | case CFI_CMDSET_AMD_LEGACY: |
| 1453 | flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); |
| 1454 | flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT); |
| 1455 | if (prot) |
| 1456 | flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET); |
| 1457 | else |
| 1458 | flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR); |
| 1459 | #endif |
Rafael Campos | 13d2b61 | 2008-07-31 10:22:20 +0200 | [diff] [blame] | 1460 | }; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1461 | |
Stefan Roese | 5215df1 | 2010-10-25 18:31:29 +0200 | [diff] [blame] | 1462 | /* |
| 1463 | * Flash needs to be in status register read mode for |
| 1464 | * flash_full_status_check() to work correctly |
| 1465 | */ |
| 1466 | flash_write_cmd(info, sector, 0, FLASH_CMD_READ_STATUS); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1467 | if ((retcode = |
| 1468 | flash_full_status_check (info, sector, info->erase_blk_tout, |
| 1469 | prot ? "protect" : "unprotect")) == 0) { |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1470 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1471 | info->protect[sector] = prot; |
| 1472 | |
| 1473 | /* |
| 1474 | * On some of Intel's flash chips (marked via legacy_unlock) |
| 1475 | * unprotect unprotects all locking. |
| 1476 | */ |
| 1477 | if ((prot == 0) && (info->legacy_unlock)) { |
| 1478 | flash_sect_t i; |
| 1479 | |
| 1480 | for (i = 0; i < info->sector_count; i++) { |
| 1481 | if (info->protect[i]) |
| 1482 | flash_real_protect (info, i, 1); |
| 1483 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1484 | } |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1485 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1486 | return retcode; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1487 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1488 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1489 | /*----------------------------------------------------------------------- |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1490 | * flash_read_user_serial - read the OneTimeProgramming cells |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1491 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1492 | void flash_read_user_serial (flash_info_t * info, void *buffer, int offset, |
| 1493 | int len) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1494 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1495 | uchar *src; |
| 1496 | uchar *dst; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1497 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1498 | dst = buffer; |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1499 | src = flash_map (info, 0, FLASH_OFFSET_USER_PROTECTION); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1500 | flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID); |
| 1501 | memcpy (dst, src + offset, len); |
| 1502 | flash_write_cmd (info, 0, 0, info->cmd_reset); |
Aaron Williams | ffcef2f | 2011-04-12 00:59:04 -0700 | [diff] [blame] | 1503 | udelay(1); |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1504 | flash_unmap(info, 0, FLASH_OFFSET_USER_PROTECTION, src); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1505 | } |
| 1506 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1507 | /* |
| 1508 | * flash_read_factory_serial - read the device Id from the protection area |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1509 | */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1510 | void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset, |
| 1511 | int len) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1512 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1513 | uchar *src; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1514 | |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1515 | src = flash_map (info, 0, FLASH_OFFSET_INTEL_PROTECTION); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1516 | flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID); |
| 1517 | memcpy (buffer, src + offset, len); |
| 1518 | flash_write_cmd (info, 0, 0, info->cmd_reset); |
Aaron Williams | ffcef2f | 2011-04-12 00:59:04 -0700 | [diff] [blame] | 1519 | udelay(1); |
Haavard Skinnemoen | e3ea188 | 2007-12-13 12:56:34 +0100 | [diff] [blame] | 1520 | flash_unmap(info, 0, FLASH_OFFSET_INTEL_PROTECTION, src); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1521 | } |
| 1522 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1523 | #endif /* CONFIG_SYS_FLASH_PROTECTION */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1524 | |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1525 | /*----------------------------------------------------------------------- |
| 1526 | * Reverse the order of the erase regions in the CFI QRY structure. |
| 1527 | * This is needed for chips that are either a) correctly detected as |
| 1528 | * top-boot, or b) buggy. |
| 1529 | */ |
| 1530 | static void cfi_reverse_geometry(struct cfi_qry *qry) |
| 1531 | { |
| 1532 | unsigned int i, j; |
| 1533 | u32 tmp; |
| 1534 | |
| 1535 | for (i = 0, j = qry->num_erase_regions - 1; i < j; i++, j--) { |
| 1536 | tmp = qry->erase_region_info[i]; |
| 1537 | qry->erase_region_info[i] = qry->erase_region_info[j]; |
| 1538 | qry->erase_region_info[j] = tmp; |
| 1539 | } |
| 1540 | } |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1541 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1542 | /*----------------------------------------------------------------------- |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1543 | * read jedec ids from device and set corresponding fields in info struct |
| 1544 | * |
| 1545 | * Note: assume cfi->vendor, cfi->portwidth and cfi->chipwidth are correct |
| 1546 | * |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1547 | */ |
| 1548 | static void cmdset_intel_read_jedec_ids(flash_info_t *info) |
| 1549 | { |
| 1550 | flash_write_cmd(info, 0, 0, FLASH_CMD_RESET); |
Aaron Williams | ffcef2f | 2011-04-12 00:59:04 -0700 | [diff] [blame] | 1551 | udelay(1); |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1552 | flash_write_cmd(info, 0, 0, FLASH_CMD_READ_ID); |
| 1553 | udelay(1000); /* some flash are slow to respond */ |
| 1554 | info->manufacturer_id = flash_read_uchar (info, |
| 1555 | FLASH_OFFSET_MANUFACTURER_ID); |
Philippe De Muyter | 35bc081 | 2010-08-10 16:54:52 +0200 | [diff] [blame] | 1556 | info->device_id = (info->chipwidth == FLASH_CFI_16BIT) ? |
| 1557 | flash_read_word (info, FLASH_OFFSET_DEVICE_ID) : |
| 1558 | flash_read_uchar (info, FLASH_OFFSET_DEVICE_ID); |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1559 | flash_write_cmd(info, 0, 0, FLASH_CMD_RESET); |
| 1560 | } |
| 1561 | |
| 1562 | static int cmdset_intel_init(flash_info_t *info, struct cfi_qry *qry) |
| 1563 | { |
| 1564 | info->cmd_reset = FLASH_CMD_RESET; |
| 1565 | |
| 1566 | cmdset_intel_read_jedec_ids(info); |
| 1567 | flash_write_cmd(info, 0, info->cfi_offset, FLASH_CMD_CFI); |
| 1568 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1569 | #ifdef CONFIG_SYS_FLASH_PROTECTION |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1570 | /* read legacy lock/unlock bit from intel flash */ |
| 1571 | if (info->ext_addr) { |
| 1572 | info->legacy_unlock = flash_read_uchar (info, |
| 1573 | info->ext_addr + 5) & 0x08; |
| 1574 | } |
| 1575 | #endif |
| 1576 | |
| 1577 | return 0; |
| 1578 | } |
| 1579 | |
| 1580 | static void cmdset_amd_read_jedec_ids(flash_info_t *info) |
| 1581 | { |
Niklaus Giger | f447f71 | 2009-07-22 17:13:24 +0200 | [diff] [blame] | 1582 | ushort bankId = 0; |
| 1583 | uchar manuId; |
| 1584 | |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1585 | flash_write_cmd(info, 0, 0, AMD_CMD_RESET); |
| 1586 | flash_unlock_seq(info, 0); |
| 1587 | flash_write_cmd(info, 0, info->addr_unlock1, FLASH_CMD_READ_ID); |
| 1588 | udelay(1000); /* some flash are slow to respond */ |
Tor Krill | 7f2a305 | 2008-03-28 11:29:10 +0100 | [diff] [blame] | 1589 | |
Niklaus Giger | f447f71 | 2009-07-22 17:13:24 +0200 | [diff] [blame] | 1590 | manuId = flash_read_uchar (info, FLASH_OFFSET_MANUFACTURER_ID); |
| 1591 | /* JEDEC JEP106Z specifies ID codes up to bank 7 */ |
| 1592 | while (manuId == FLASH_CONTINUATION_CODE && bankId < 0x800) { |
| 1593 | bankId += 0x100; |
| 1594 | manuId = flash_read_uchar (info, |
| 1595 | bankId | FLASH_OFFSET_MANUFACTURER_ID); |
| 1596 | } |
| 1597 | info->manufacturer_id = manuId; |
Tor Krill | 7f2a305 | 2008-03-28 11:29:10 +0100 | [diff] [blame] | 1598 | |
| 1599 | switch (info->chipwidth){ |
| 1600 | case FLASH_CFI_8BIT: |
| 1601 | info->device_id = flash_read_uchar (info, |
| 1602 | FLASH_OFFSET_DEVICE_ID); |
| 1603 | if (info->device_id == 0x7E) { |
| 1604 | /* AMD 3-byte (expanded) device ids */ |
| 1605 | info->device_id2 = flash_read_uchar (info, |
| 1606 | FLASH_OFFSET_DEVICE_ID2); |
| 1607 | info->device_id2 <<= 8; |
| 1608 | info->device_id2 |= flash_read_uchar (info, |
| 1609 | FLASH_OFFSET_DEVICE_ID3); |
| 1610 | } |
| 1611 | break; |
| 1612 | case FLASH_CFI_16BIT: |
| 1613 | info->device_id = flash_read_word (info, |
| 1614 | FLASH_OFFSET_DEVICE_ID); |
Heiko Schocher | 27cea50 | 2011-04-11 14:16:19 +0200 | [diff] [blame] | 1615 | if ((info->device_id & 0xff) == 0x7E) { |
| 1616 | /* AMD 3-byte (expanded) device ids */ |
| 1617 | info->device_id2 = flash_read_uchar (info, |
| 1618 | FLASH_OFFSET_DEVICE_ID2); |
| 1619 | info->device_id2 <<= 8; |
| 1620 | info->device_id2 |= flash_read_uchar (info, |
| 1621 | FLASH_OFFSET_DEVICE_ID3); |
| 1622 | } |
Tor Krill | 7f2a305 | 2008-03-28 11:29:10 +0100 | [diff] [blame] | 1623 | break; |
| 1624 | default: |
| 1625 | break; |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1626 | } |
| 1627 | flash_write_cmd(info, 0, 0, AMD_CMD_RESET); |
Aaron Williams | ffcef2f | 2011-04-12 00:59:04 -0700 | [diff] [blame] | 1628 | udelay(1); |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1629 | } |
| 1630 | |
| 1631 | static int cmdset_amd_init(flash_info_t *info, struct cfi_qry *qry) |
| 1632 | { |
| 1633 | info->cmd_reset = AMD_CMD_RESET; |
| 1634 | |
| 1635 | cmdset_amd_read_jedec_ids(info); |
| 1636 | flash_write_cmd(info, 0, info->cfi_offset, FLASH_CMD_CFI); |
| 1637 | |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1638 | return 0; |
| 1639 | } |
| 1640 | |
| 1641 | #ifdef CONFIG_FLASH_CFI_LEGACY |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1642 | static void flash_read_jedec_ids (flash_info_t * info) |
| 1643 | { |
| 1644 | info->manufacturer_id = 0; |
| 1645 | info->device_id = 0; |
| 1646 | info->device_id2 = 0; |
| 1647 | |
| 1648 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 1649 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1650 | case CFI_CMDSET_INTEL_STANDARD: |
| 1651 | case CFI_CMDSET_INTEL_EXTENDED: |
Michael Schwingen | 5fb0aa4 | 2008-01-12 20:29:47 +0100 | [diff] [blame] | 1652 | cmdset_intel_read_jedec_ids(info); |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1653 | break; |
| 1654 | case CFI_CMDSET_AMD_STANDARD: |
| 1655 | case CFI_CMDSET_AMD_EXTENDED: |
Michael Schwingen | 5fb0aa4 | 2008-01-12 20:29:47 +0100 | [diff] [blame] | 1656 | cmdset_amd_read_jedec_ids(info); |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1657 | break; |
| 1658 | default: |
| 1659 | break; |
| 1660 | } |
| 1661 | } |
| 1662 | |
| 1663 | /*----------------------------------------------------------------------- |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1664 | * Call board code to request info about non-CFI flash. |
| 1665 | * board_flash_get_legacy needs to fill in at least: |
| 1666 | * info->portwidth, info->chipwidth and info->interface for Jedec probing. |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 1667 | */ |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1668 | static int flash_detect_legacy(phys_addr_t base, int banknum) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1669 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1670 | flash_info_t *info = &flash_info[banknum]; |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 1671 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1672 | if (board_flash_get_legacy(base, banknum, info)) { |
| 1673 | /* board code may have filled info completely. If not, we |
| 1674 | use JEDEC ID probing. */ |
| 1675 | if (!info->vendor) { |
| 1676 | int modes[] = { |
| 1677 | CFI_CMDSET_AMD_STANDARD, |
| 1678 | CFI_CMDSET_INTEL_STANDARD |
| 1679 | }; |
| 1680 | int i; |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 1681 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1682 | for (i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) { |
| 1683 | info->vendor = modes[i]; |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1684 | info->start[0] = |
| 1685 | (ulong)map_physmem(base, |
Stefan Roese | b844370 | 2009-02-05 11:44:52 +0100 | [diff] [blame] | 1686 | info->portwidth, |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1687 | MAP_NOCACHE); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1688 | if (info->portwidth == FLASH_CFI_8BIT |
| 1689 | && info->interface == FLASH_CFI_X8X16) { |
| 1690 | info->addr_unlock1 = 0x2AAA; |
| 1691 | info->addr_unlock2 = 0x5555; |
| 1692 | } else { |
| 1693 | info->addr_unlock1 = 0x5555; |
| 1694 | info->addr_unlock2 = 0x2AAA; |
| 1695 | } |
| 1696 | flash_read_jedec_ids(info); |
| 1697 | debug("JEDEC PROBE: ID %x %x %x\n", |
| 1698 | info->manufacturer_id, |
| 1699 | info->device_id, |
| 1700 | info->device_id2); |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1701 | if (jedec_flash_match(info, info->start[0])) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1702 | break; |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1703 | else |
Stefan Roese | b844370 | 2009-02-05 11:44:52 +0100 | [diff] [blame] | 1704 | unmap_physmem((void *)info->start[0], |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1705 | MAP_NOCACHE); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1706 | } |
| 1707 | } |
| 1708 | |
| 1709 | switch(info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 1710 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1711 | case CFI_CMDSET_INTEL_STANDARD: |
| 1712 | case CFI_CMDSET_INTEL_EXTENDED: |
| 1713 | info->cmd_reset = FLASH_CMD_RESET; |
| 1714 | break; |
| 1715 | case CFI_CMDSET_AMD_STANDARD: |
| 1716 | case CFI_CMDSET_AMD_EXTENDED: |
| 1717 | case CFI_CMDSET_AMD_LEGACY: |
| 1718 | info->cmd_reset = AMD_CMD_RESET; |
| 1719 | break; |
| 1720 | } |
| 1721 | info->flash_id = FLASH_MAN_CFI; |
| 1722 | return 1; |
| 1723 | } |
| 1724 | return 0; /* use CFI */ |
| 1725 | } |
| 1726 | #else |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1727 | static inline int flash_detect_legacy(phys_addr_t base, int banknum) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1728 | { |
| 1729 | return 0; /* use CFI */ |
| 1730 | } |
| 1731 | #endif |
| 1732 | |
| 1733 | /*----------------------------------------------------------------------- |
| 1734 | * detect if flash is compatible with the Common Flash Interface (CFI) |
| 1735 | * http://www.jedec.org/download/search/jesd68.pdf |
| 1736 | */ |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1737 | static void flash_read_cfi (flash_info_t *info, void *buf, |
| 1738 | unsigned int start, size_t len) |
| 1739 | { |
| 1740 | u8 *p = buf; |
| 1741 | unsigned int i; |
| 1742 | |
| 1743 | for (i = 0; i < len; i++) |
| 1744 | p[i] = flash_read_uchar(info, start + i); |
| 1745 | } |
Stefan Roese | 6e83e34 | 2009-10-27 15:15:55 +0100 | [diff] [blame] | 1746 | |
| 1747 | void __flash_cmd_reset(flash_info_t *info) |
| 1748 | { |
| 1749 | /* |
| 1750 | * We do not yet know what kind of commandset to use, so we issue |
| 1751 | * the reset command in both Intel and AMD variants, in the hope |
| 1752 | * that AMD flash roms ignore the Intel command. |
| 1753 | */ |
| 1754 | flash_write_cmd(info, 0, 0, AMD_CMD_RESET); |
Aaron Williams | ffcef2f | 2011-04-12 00:59:04 -0700 | [diff] [blame] | 1755 | udelay(1); |
Stefan Roese | 6e83e34 | 2009-10-27 15:15:55 +0100 | [diff] [blame] | 1756 | flash_write_cmd(info, 0, 0, FLASH_CMD_RESET); |
| 1757 | } |
| 1758 | void flash_cmd_reset(flash_info_t *info) |
| 1759 | __attribute__((weak,alias("__flash_cmd_reset"))); |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1760 | |
| 1761 | static int __flash_detect_cfi (flash_info_t * info, struct cfi_qry *qry) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1762 | { |
| 1763 | int cfi_offset; |
| 1764 | |
Stefan Roese | 6e83e34 | 2009-10-27 15:15:55 +0100 | [diff] [blame] | 1765 | /* Issue FLASH reset command */ |
| 1766 | flash_cmd_reset(info); |
Michael Schwingen | 4661cf7 | 2008-02-18 23:16:35 +0100 | [diff] [blame] | 1767 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1768 | for (cfi_offset=0; |
| 1769 | cfi_offset < sizeof(flash_offset_cfi) / sizeof(uint); |
| 1770 | cfi_offset++) { |
| 1771 | flash_write_cmd (info, 0, flash_offset_cfi[cfi_offset], |
| 1772 | FLASH_CMD_CFI); |
| 1773 | if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q') |
| 1774 | && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R') |
| 1775 | && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 2, 'Y')) { |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1776 | flash_read_cfi(info, qry, FLASH_OFFSET_CFI_RESP, |
| 1777 | sizeof(struct cfi_qry)); |
| 1778 | info->interface = le16_to_cpu(qry->interface_desc); |
| 1779 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 1780 | info->cfi_offset = flash_offset_cfi[cfi_offset]; |
| 1781 | debug ("device interface is %d\n", |
| 1782 | info->interface); |
| 1783 | debug ("found port %d chip %d ", |
| 1784 | info->portwidth, info->chipwidth); |
| 1785 | debug ("port %d bits chip %d bits\n", |
| 1786 | info->portwidth << CFI_FLASH_SHIFT_WIDTH, |
| 1787 | info->chipwidth << CFI_FLASH_SHIFT_WIDTH); |
| 1788 | |
| 1789 | /* calculate command offsets as in the Linux driver */ |
| 1790 | info->addr_unlock1 = 0x555; |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 1791 | info->addr_unlock2 = 0x2aa; |
| 1792 | |
| 1793 | /* |
| 1794 | * modify the unlock address if we are |
| 1795 | * in compatibility mode |
| 1796 | */ |
| 1797 | if ( /* x8/x16 in x8 mode */ |
| 1798 | ((info->chipwidth == FLASH_CFI_BY8) && |
| 1799 | (info->interface == FLASH_CFI_X8X16)) || |
| 1800 | /* x16/x32 in x16 mode */ |
| 1801 | ((info->chipwidth == FLASH_CFI_BY16) && |
| 1802 | (info->interface == FLASH_CFI_X16X32))) |
| 1803 | { |
| 1804 | info->addr_unlock1 = 0xaaa; |
| 1805 | info->addr_unlock2 = 0x555; |
| 1806 | } |
| 1807 | |
| 1808 | info->name = "CFI conformant"; |
| 1809 | return 1; |
| 1810 | } |
| 1811 | } |
| 1812 | |
| 1813 | return 0; |
| 1814 | } |
| 1815 | |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1816 | static int flash_detect_cfi (flash_info_t * info, struct cfi_qry *qry) |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 1817 | { |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1818 | debug ("flash detect cfi\n"); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1819 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1820 | for (info->portwidth = CONFIG_SYS_FLASH_CFI_WIDTH; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1821 | info->portwidth <= FLASH_CFI_64BIT; info->portwidth <<= 1) { |
| 1822 | for (info->chipwidth = FLASH_CFI_BY8; |
| 1823 | info->chipwidth <= info->portwidth; |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 1824 | info->chipwidth <<= 1) |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1825 | if (__flash_detect_cfi(info, qry)) |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 1826 | return 1; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1827 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1828 | debug ("not found\n"); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1829 | return 0; |
| 1830 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1831 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1832 | /* |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1833 | * Manufacturer-specific quirks. Add workarounds for geometry |
| 1834 | * reversal, etc. here. |
| 1835 | */ |
| 1836 | static void flash_fixup_amd(flash_info_t *info, struct cfi_qry *qry) |
| 1837 | { |
| 1838 | /* check if flash geometry needs reversal */ |
| 1839 | if (qry->num_erase_regions > 1) { |
| 1840 | /* reverse geometry if top boot part */ |
| 1841 | if (info->cfi_version < 0x3131) { |
| 1842 | /* CFI < 1.1, try to guess from device id */ |
| 1843 | if ((info->device_id & 0x80) != 0) |
| 1844 | cfi_reverse_geometry(qry); |
| 1845 | } else if (flash_read_uchar(info, info->ext_addr + 0xf) == 3) { |
| 1846 | /* CFI >= 1.1, deduct from top/bottom flag */ |
| 1847 | /* note: ext_addr is valid since cfi_version > 0 */ |
| 1848 | cfi_reverse_geometry(qry); |
| 1849 | } |
| 1850 | } |
| 1851 | } |
| 1852 | |
| 1853 | static void flash_fixup_atmel(flash_info_t *info, struct cfi_qry *qry) |
| 1854 | { |
| 1855 | int reverse_geometry = 0; |
| 1856 | |
| 1857 | /* Check the "top boot" bit in the PRI */ |
| 1858 | if (info->ext_addr && !(flash_read_uchar(info, info->ext_addr + 6) & 1)) |
| 1859 | reverse_geometry = 1; |
| 1860 | |
| 1861 | /* AT49BV6416(T) list the erase regions in the wrong order. |
| 1862 | * However, the device ID is identical with the non-broken |
Ulf Samuelsson | 07f9b4e | 2009-03-27 23:26:43 +0100 | [diff] [blame] | 1863 | * AT49BV642D they differ in the high byte. |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1864 | */ |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1865 | if (info->device_id == 0xd6 || info->device_id == 0xd2) |
| 1866 | reverse_geometry = !reverse_geometry; |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1867 | |
| 1868 | if (reverse_geometry) |
| 1869 | cfi_reverse_geometry(qry); |
| 1870 | } |
| 1871 | |
Richard Retanubun | be4dca2 | 2009-01-14 08:44:26 -0500 | [diff] [blame] | 1872 | static void flash_fixup_stm(flash_info_t *info, struct cfi_qry *qry) |
| 1873 | { |
| 1874 | /* check if flash geometry needs reversal */ |
| 1875 | if (qry->num_erase_regions > 1) { |
| 1876 | /* reverse geometry if top boot part */ |
| 1877 | if (info->cfi_version < 0x3131) { |
Mike Frysinger | 02a3786 | 2011-04-10 16:06:29 -0400 | [diff] [blame] | 1878 | /* CFI < 1.1, guess by device id */ |
| 1879 | if (info->device_id == 0x22CA || /* M29W320DT */ |
| 1880 | info->device_id == 0x2256 || /* M29W320ET */ |
| 1881 | info->device_id == 0x22D7) { /* M29W800DT */ |
Richard Retanubun | be4dca2 | 2009-01-14 08:44:26 -0500 | [diff] [blame] | 1882 | cfi_reverse_geometry(qry); |
| 1883 | } |
Mike Frysinger | 97dd899 | 2011-05-09 18:33:36 -0400 | [diff] [blame] | 1884 | } else if (flash_read_uchar(info, info->ext_addr + 0xf) == 3) { |
| 1885 | /* CFI >= 1.1, deduct from top/bottom flag */ |
| 1886 | /* note: ext_addr is valid since cfi_version > 0 */ |
| 1887 | cfi_reverse_geometry(qry); |
Richard Retanubun | be4dca2 | 2009-01-14 08:44:26 -0500 | [diff] [blame] | 1888 | } |
| 1889 | } |
| 1890 | } |
| 1891 | |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1892 | /* |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1893 | * The following code cannot be run from FLASH! |
| 1894 | * |
| 1895 | */ |
Anatolij Gustschin | 6acb77b | 2010-11-28 02:13:33 +0100 | [diff] [blame] | 1896 | ulong flash_get_size (phys_addr_t base, int banknum) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1897 | { |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1898 | flash_info_t *info = &flash_info[banknum]; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1899 | int i, j; |
| 1900 | flash_sect_t sect_cnt; |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1901 | phys_addr_t sector; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1902 | unsigned long tmp; |
| 1903 | int size_ratio; |
| 1904 | uchar num_erase_regions; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1905 | int erase_region_size; |
| 1906 | int erase_region_count; |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1907 | struct cfi_qry qry; |
Anatolij Gustschin | 6acb77b | 2010-11-28 02:13:33 +0100 | [diff] [blame] | 1908 | unsigned long max_size; |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1909 | |
Kumar Gala | 899032b | 2008-05-15 15:13:08 -0500 | [diff] [blame] | 1910 | memset(&qry, 0, sizeof(qry)); |
| 1911 | |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1912 | info->ext_addr = 0; |
| 1913 | info->cfi_version = 0; |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 1914 | #ifdef CONFIG_SYS_FLASH_PROTECTION |
Stefan Roese | efef95b | 2006-04-01 13:41:03 +0200 | [diff] [blame] | 1915 | info->legacy_unlock = 0; |
| 1916 | #endif |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1917 | |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 1918 | info->start[0] = (ulong)map_physmem(base, info->portwidth, MAP_NOCACHE); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1919 | |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1920 | if (flash_detect_cfi (info, &qry)) { |
| 1921 | info->vendor = le16_to_cpu(qry.p_id); |
| 1922 | info->ext_addr = le16_to_cpu(qry.p_adr); |
| 1923 | num_erase_regions = qry.num_erase_regions; |
| 1924 | |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1925 | if (info->ext_addr) { |
| 1926 | info->cfi_version = (ushort) flash_read_uchar (info, |
| 1927 | info->ext_addr + 3) << 8; |
| 1928 | info->cfi_version |= (ushort) flash_read_uchar (info, |
| 1929 | info->ext_addr + 4); |
| 1930 | } |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1931 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1932 | #ifdef DEBUG |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 1933 | flash_printqry (&qry); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1934 | #endif |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1935 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1936 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 1937 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1938 | case CFI_CMDSET_INTEL_STANDARD: |
| 1939 | case CFI_CMDSET_INTEL_EXTENDED: |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1940 | cmdset_intel_init(info, &qry); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1941 | break; |
| 1942 | case CFI_CMDSET_AMD_STANDARD: |
| 1943 | case CFI_CMDSET_AMD_EXTENDED: |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1944 | cmdset_amd_init(info, &qry); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1945 | break; |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 1946 | default: |
| 1947 | printf("CFI: Unknown command set 0x%x\n", |
| 1948 | info->vendor); |
| 1949 | /* |
| 1950 | * Unfortunately, this means we don't know how |
| 1951 | * to get the chip back to Read mode. Might |
| 1952 | * as well try an Intel-style reset... |
| 1953 | */ |
| 1954 | flash_write_cmd(info, 0, 0, FLASH_CMD_RESET); |
| 1955 | return 0; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1956 | } |
wdenk | 6cfa84e | 2004-02-10 00:03:41 +0000 | [diff] [blame] | 1957 | |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1958 | /* Do manufacturer-specific fixups */ |
| 1959 | switch (info->manufacturer_id) { |
Mario Schuknecht | 5c3579e | 2011-02-21 13:13:14 +0100 | [diff] [blame] | 1960 | case 0x0001: /* AMD */ |
| 1961 | case 0x0037: /* AMIC */ |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1962 | flash_fixup_amd(info, &qry); |
| 1963 | break; |
| 1964 | case 0x001f: |
| 1965 | flash_fixup_atmel(info, &qry); |
| 1966 | break; |
Richard Retanubun | be4dca2 | 2009-01-14 08:44:26 -0500 | [diff] [blame] | 1967 | case 0x0020: |
| 1968 | flash_fixup_stm(info, &qry); |
| 1969 | break; |
Haavard Skinnemoen | 750ea7f | 2007-12-14 15:36:18 +0100 | [diff] [blame] | 1970 | } |
| 1971 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1972 | debug ("manufacturer is %d\n", info->vendor); |
Stefan Roese | 1279748 | 2006-11-13 13:55:24 +0100 | [diff] [blame] | 1973 | debug ("manufacturer id is 0x%x\n", info->manufacturer_id); |
| 1974 | debug ("device id is 0x%x\n", info->device_id); |
| 1975 | debug ("device id2 is 0x%x\n", info->device_id2); |
| 1976 | debug ("cfi version is 0x%04x\n", info->cfi_version); |
| 1977 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1978 | size_ratio = info->portwidth / info->chipwidth; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1979 | /* if the chip is x8/x16 reduce the ratio by half */ |
| 1980 | if ((info->interface == FLASH_CFI_X8X16) |
| 1981 | && (info->chipwidth == FLASH_CFI_BY8)) { |
| 1982 | size_ratio >>= 1; |
| 1983 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1984 | debug ("size_ratio %d port %d bits chip %d bits\n", |
| 1985 | size_ratio, info->portwidth << CFI_FLASH_SHIFT_WIDTH, |
| 1986 | info->chipwidth << CFI_FLASH_SHIFT_WIDTH); |
Ilya Yanok | 755c180 | 2010-10-21 17:20:12 +0200 | [diff] [blame] | 1987 | info->size = 1 << qry.dev_size; |
| 1988 | /* multiply the size by the number of chips */ |
| 1989 | info->size *= size_ratio; |
Anatolij Gustschin | 6acb77b | 2010-11-28 02:13:33 +0100 | [diff] [blame] | 1990 | max_size = cfi_flash_bank_size(banknum); |
Ilya Yanok | 755c180 | 2010-10-21 17:20:12 +0200 | [diff] [blame] | 1991 | if (max_size && (info->size > max_size)) { |
| 1992 | debug("[truncated from %ldMiB]", info->size >> 20); |
| 1993 | info->size = max_size; |
| 1994 | } |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1995 | debug ("found %d erase regions\n", num_erase_regions); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 1996 | sect_cnt = 0; |
| 1997 | sector = base; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 1998 | for (i = 0; i < num_erase_regions; i++) { |
| 1999 | if (i > NUM_ERASE_REGIONS) { |
wdenk | e537b3b | 2004-02-23 23:54:43 +0000 | [diff] [blame] | 2000 | printf ("%d erase regions found, only %d used\n", |
| 2001 | num_erase_regions, NUM_ERASE_REGIONS); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2002 | break; |
| 2003 | } |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 2004 | |
Haavard Skinnemoen | c4d478b | 2007-12-14 15:36:17 +0100 | [diff] [blame] | 2005 | tmp = le32_to_cpu(qry.erase_region_info[i]); |
| 2006 | debug("erase region %u: 0x%08lx\n", i, tmp); |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 2007 | |
| 2008 | erase_region_count = (tmp & 0xffff) + 1; |
| 2009 | tmp >>= 16; |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 2010 | erase_region_size = |
| 2011 | (tmp & 0xffff) ? ((tmp & 0xffff) * 256) : 128; |
wdenk | aeba06f | 2004-06-09 17:34:58 +0000 | [diff] [blame] | 2012 | debug ("erase_region_count = %d erase_region_size = %d\n", |
wdenk | e537b3b | 2004-02-23 23:54:43 +0000 | [diff] [blame] | 2013 | erase_region_count, erase_region_size); |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 2014 | for (j = 0; j < erase_region_count; j++) { |
Ilya Yanok | 755c180 | 2010-10-21 17:20:12 +0200 | [diff] [blame] | 2015 | if (sector - base >= info->size) |
| 2016 | break; |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2017 | if (sect_cnt >= CONFIG_SYS_MAX_FLASH_SECT) { |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 2018 | printf("ERROR: too many flash sectors\n"); |
| 2019 | break; |
| 2020 | } |
Becky Bruce | 9d1f6af | 2009-02-02 16:34:51 -0600 | [diff] [blame] | 2021 | info->start[sect_cnt] = |
| 2022 | (ulong)map_physmem(sector, |
| 2023 | info->portwidth, |
| 2024 | MAP_NOCACHE); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2025 | sector += (erase_region_size * size_ratio); |
wdenk | 26c5843 | 2005-01-09 17:12:27 +0000 | [diff] [blame] | 2026 | |
| 2027 | /* |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 2028 | * Only read protection status from |
| 2029 | * supported devices (intel...) |
wdenk | 26c5843 | 2005-01-09 17:12:27 +0000 | [diff] [blame] | 2030 | */ |
| 2031 | switch (info->vendor) { |
Vasiliy Leoenenko | 7d1794c | 2008-05-07 21:25:33 +0400 | [diff] [blame] | 2032 | case CFI_CMDSET_INTEL_PROG_REGIONS: |
wdenk | 26c5843 | 2005-01-09 17:12:27 +0000 | [diff] [blame] | 2033 | case CFI_CMDSET_INTEL_EXTENDED: |
| 2034 | case CFI_CMDSET_INTEL_STANDARD: |
Stefan Roese | 5215df1 | 2010-10-25 18:31:29 +0200 | [diff] [blame] | 2035 | /* |
| 2036 | * Set flash to read-id mode. Otherwise |
| 2037 | * reading protected status is not |
| 2038 | * guaranteed. |
| 2039 | */ |
| 2040 | flash_write_cmd(info, sect_cnt, 0, |
| 2041 | FLASH_CMD_READ_ID); |
wdenk | 26c5843 | 2005-01-09 17:12:27 +0000 | [diff] [blame] | 2042 | info->protect[sect_cnt] = |
| 2043 | flash_isset (info, sect_cnt, |
| 2044 | FLASH_OFFSET_PROTECT, |
| 2045 | FLASH_STATUS_PROTECT); |
| 2046 | break; |
| 2047 | default: |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 2048 | /* default: not protected */ |
| 2049 | info->protect[sect_cnt] = 0; |
wdenk | 26c5843 | 2005-01-09 17:12:27 +0000 | [diff] [blame] | 2050 | } |
| 2051 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2052 | sect_cnt++; |
| 2053 | } |
| 2054 | } |
| 2055 | |
| 2056 | info->sector_count = sect_cnt; |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 2057 | info->buffer_size = 1 << le16_to_cpu(qry.max_buf_write_size); |
| 2058 | tmp = 1 << qry.block_erase_timeout_typ; |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 2059 | info->erase_blk_tout = tmp * |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 2060 | (1 << qry.block_erase_timeout_max); |
| 2061 | tmp = (1 << qry.buf_write_timeout_typ) * |
| 2062 | (1 << qry.buf_write_timeout_max); |
| 2063 | |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 2064 | /* round up when converting to ms */ |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 2065 | info->buffer_write_tout = (tmp + 999) / 1000; |
| 2066 | tmp = (1 << qry.word_write_timeout_typ) * |
| 2067 | (1 << qry.word_write_timeout_max); |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 2068 | /* round up when converting to ms */ |
Haavard Skinnemoen | 53baec7 | 2007-12-14 15:36:16 +0100 | [diff] [blame] | 2069 | info->write_tout = (tmp + 999) / 1000; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2070 | info->flash_id = FLASH_MAN_CFI; |
Haavard Skinnemoen | d523e39 | 2007-12-13 12:56:28 +0100 | [diff] [blame] | 2071 | if ((info->interface == FLASH_CFI_X8X16) && |
| 2072 | (info->chipwidth == FLASH_CFI_BY8)) { |
| 2073 | /* XXX - Need to test on x8/x16 in parallel. */ |
| 2074 | info->portwidth >>= 1; |
wdenk | ed2ac4b | 2004-03-14 18:23:55 +0000 | [diff] [blame] | 2075 | } |
Mike Frysinger | 59404ee | 2008-10-02 01:55:38 -0400 | [diff] [blame] | 2076 | |
| 2077 | flash_write_cmd (info, 0, 0, info->cmd_reset); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2078 | } |
| 2079 | |
wdenk | e65527f | 2004-02-12 00:47:09 +0000 | [diff] [blame] | 2080 | return (info->size); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2081 | } |
| 2082 | |
Mike Frysinger | c2c093d | 2010-12-22 09:41:13 -0500 | [diff] [blame] | 2083 | #ifdef CONFIG_FLASH_CFI_MTD |
Piotr Ziecik | 2a7493c | 2008-11-17 15:49:32 +0100 | [diff] [blame] | 2084 | void flash_set_verbose(uint v) |
| 2085 | { |
| 2086 | flash_verbose = v; |
| 2087 | } |
Mike Frysinger | c2c093d | 2010-12-22 09:41:13 -0500 | [diff] [blame] | 2088 | #endif |
Piotr Ziecik | 2a7493c | 2008-11-17 15:49:32 +0100 | [diff] [blame] | 2089 | |
Stefan Roese | ab93564 | 2010-10-25 18:31:48 +0200 | [diff] [blame] | 2090 | static void cfi_flash_set_config_reg(u32 base, u16 val) |
| 2091 | { |
| 2092 | #ifdef CONFIG_SYS_CFI_FLASH_CONFIG_REGS |
| 2093 | /* |
| 2094 | * Only set this config register if really defined |
| 2095 | * to a valid value (0xffff is invalid) |
| 2096 | */ |
| 2097 | if (val == 0xffff) |
| 2098 | return; |
| 2099 | |
| 2100 | /* |
| 2101 | * Set configuration register. Data is "encrypted" in the 16 lower |
| 2102 | * address bits. |
| 2103 | */ |
| 2104 | flash_write16(FLASH_CMD_SETUP, (void *)(base + (val << 1))); |
| 2105 | flash_write16(FLASH_CMD_SET_CR_CONFIRM, (void *)(base + (val << 1))); |
| 2106 | |
| 2107 | /* |
| 2108 | * Finally issue reset-command to bring device back to |
| 2109 | * read-array mode |
| 2110 | */ |
| 2111 | flash_write16(FLASH_CMD_RESET, (void *)base); |
| 2112 | #endif |
| 2113 | } |
| 2114 | |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2115 | /*----------------------------------------------------------------------- |
| 2116 | */ |
Heiko Schocher | ef0946a | 2011-04-04 08:10:21 +0200 | [diff] [blame] | 2117 | |
| 2118 | void flash_protect_default(void) |
| 2119 | { |
Peter Tyser | 4f3c60d | 2011-04-13 11:46:56 -0500 | [diff] [blame] | 2120 | #if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST) |
| 2121 | int i; |
| 2122 | struct apl_s { |
| 2123 | ulong start; |
| 2124 | ulong size; |
| 2125 | } apl[] = CONFIG_SYS_FLASH_AUTOPROTECT_LIST; |
| 2126 | #endif |
| 2127 | |
Heiko Schocher | ef0946a | 2011-04-04 08:10:21 +0200 | [diff] [blame] | 2128 | /* Monitor protection ON by default */ |
| 2129 | #if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \ |
| 2130 | (!defined(CONFIG_MONITOR_IS_IN_RAM)) |
| 2131 | flash_protect(FLAG_PROTECT_SET, |
| 2132 | CONFIG_SYS_MONITOR_BASE, |
| 2133 | CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, |
| 2134 | flash_get_info(CONFIG_SYS_MONITOR_BASE)); |
| 2135 | #endif |
| 2136 | |
| 2137 | /* Environment protection ON by default */ |
| 2138 | #ifdef CONFIG_ENV_IS_IN_FLASH |
| 2139 | flash_protect(FLAG_PROTECT_SET, |
| 2140 | CONFIG_ENV_ADDR, |
| 2141 | CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, |
| 2142 | flash_get_info(CONFIG_ENV_ADDR)); |
| 2143 | #endif |
| 2144 | |
| 2145 | /* Redundant environment protection ON by default */ |
| 2146 | #ifdef CONFIG_ENV_ADDR_REDUND |
| 2147 | flash_protect(FLAG_PROTECT_SET, |
| 2148 | CONFIG_ENV_ADDR_REDUND, |
| 2149 | CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, |
| 2150 | flash_get_info(CONFIG_ENV_ADDR_REDUND)); |
| 2151 | #endif |
| 2152 | |
| 2153 | #if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST) |
| 2154 | for (i = 0; i < (sizeof(apl) / sizeof(struct apl_s)); i++) { |
Marek Vasut | cb1622e | 2011-10-21 14:17:05 +0000 | [diff] [blame] | 2155 | debug("autoprotecting from %08lx to %08lx\n", |
Heiko Schocher | ef0946a | 2011-04-04 08:10:21 +0200 | [diff] [blame] | 2156 | apl[i].start, apl[i].start + apl[i].size - 1); |
| 2157 | flash_protect(FLAG_PROTECT_SET, |
| 2158 | apl[i].start, |
| 2159 | apl[i].start + apl[i].size - 1, |
| 2160 | flash_get_info(apl[i].start)); |
| 2161 | } |
| 2162 | #endif |
| 2163 | } |
| 2164 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2165 | unsigned long flash_init (void) |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2166 | { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2167 | unsigned long size = 0; |
| 2168 | int i; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2169 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2170 | #ifdef CONFIG_SYS_FLASH_PROTECTION |
Eric Schumann | 8f7ee7d | 2009-03-21 09:59:34 -0400 | [diff] [blame] | 2171 | /* read environment from EEPROM */ |
| 2172 | char s[64]; |
Wolfgang Denk | 76af278 | 2010-07-24 21:55:43 +0200 | [diff] [blame] | 2173 | getenv_f("unlock", s, sizeof(s)); |
Michael Schwingen | 73d044d | 2007-12-07 23:35:02 +0100 | [diff] [blame] | 2174 | #endif |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2175 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2176 | /* Init: no FLASHes known */ |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2177 | for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) { |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2178 | flash_info[i].flash_id = FLASH_UNKNOWN; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2179 | |
Stefan Roese | ab93564 | 2010-10-25 18:31:48 +0200 | [diff] [blame] | 2180 | /* Optionally write flash configuration register */ |
| 2181 | cfi_flash_set_config_reg(cfi_flash_bank_addr(i), |
| 2182 | cfi_flash_config_reg(i)); |
| 2183 | |
Stefan Roese | 7e7dda8 | 2010-08-30 10:11:51 +0200 | [diff] [blame] | 2184 | if (!flash_detect_legacy(cfi_flash_bank_addr(i), i)) |
Anatolij Gustschin | 6acb77b | 2010-11-28 02:13:33 +0100 | [diff] [blame] | 2185 | flash_get_size(cfi_flash_bank_addr(i), i); |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2186 | size += flash_info[i].size; |
| 2187 | if (flash_info[i].flash_id == FLASH_UNKNOWN) { |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2188 | #ifndef CONFIG_SYS_FLASH_QUIET_TEST |
Peter Tyser | 0b5a263 | 2010-12-28 18:12:05 -0600 | [diff] [blame] | 2189 | printf ("## Unknown flash on Bank %d " |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2190 | "- Size = 0x%08lx = %ld MB\n", |
| 2191 | i+1, flash_info[i].size, |
John Schmoller | 61665db | 2010-09-29 13:49:05 -0500 | [diff] [blame] | 2192 | flash_info[i].size >> 20); |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2193 | #endif /* CONFIG_SYS_FLASH_QUIET_TEST */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2194 | } |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2195 | #ifdef CONFIG_SYS_FLASH_PROTECTION |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2196 | else if ((s != NULL) && (strcmp(s, "yes") == 0)) { |
| 2197 | /* |
| 2198 | * Only the U-Boot image and it's environment |
| 2199 | * is protected, all other sectors are |
| 2200 | * unprotected (unlocked) if flash hardware |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2201 | * protection is used (CONFIG_SYS_FLASH_PROTECTION) |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2202 | * and the environment variable "unlock" is |
| 2203 | * set to "yes". |
| 2204 | */ |
| 2205 | if (flash_info[i].legacy_unlock) { |
| 2206 | int k; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2207 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2208 | /* |
| 2209 | * Disable legacy_unlock temporarily, |
| 2210 | * since flash_real_protect would |
| 2211 | * relock all other sectors again |
| 2212 | * otherwise. |
| 2213 | */ |
| 2214 | flash_info[i].legacy_unlock = 0; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2215 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2216 | /* |
| 2217 | * Legacy unlocking (e.g. Intel J3) -> |
| 2218 | * unlock only one sector. This will |
| 2219 | * unlock all sectors. |
| 2220 | */ |
| 2221 | flash_real_protect (&flash_info[i], 0, 0); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2222 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2223 | flash_info[i].legacy_unlock = 1; |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2224 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2225 | /* |
| 2226 | * Manually mark other sectors as |
| 2227 | * unlocked (unprotected) |
| 2228 | */ |
| 2229 | for (k = 1; k < flash_info[i].sector_count; k++) |
| 2230 | flash_info[i].protect[k] = 0; |
| 2231 | } else { |
| 2232 | /* |
| 2233 | * No legancy unlocking -> unlock all sectors |
| 2234 | */ |
| 2235 | flash_protect (FLAG_PROTECT_CLEAR, |
| 2236 | flash_info[i].start[0], |
| 2237 | flash_info[i].start[0] |
| 2238 | + flash_info[i].size - 1, |
| 2239 | &flash_info[i]); |
Stefan Roese | c865e6c | 2006-02-28 15:29:58 +0100 | [diff] [blame] | 2240 | } |
Stefan Roese | c865e6c | 2006-02-28 15:29:58 +0100 | [diff] [blame] | 2241 | } |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 2242 | #endif /* CONFIG_SYS_FLASH_PROTECTION */ |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2243 | } |
Stefan Roese | c865e6c | 2006-02-28 15:29:58 +0100 | [diff] [blame] | 2244 | |
Heiko Schocher | ef0946a | 2011-04-04 08:10:21 +0200 | [diff] [blame] | 2245 | flash_protect_default(); |
Piotr Ziecik | 3e939e9 | 2008-11-17 15:57:58 +0100 | [diff] [blame] | 2246 | #ifdef CONFIG_FLASH_CFI_MTD |
| 2247 | cfi_mtd_init(); |
| 2248 | #endif |
| 2249 | |
Haavard Skinnemoen | 6dd763c | 2007-10-06 18:55:36 +0200 | [diff] [blame] | 2250 | return (size); |
wdenk | 2cefd15 | 2004-02-08 22:55:38 +0000 | [diff] [blame] | 2251 | } |