Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
fallback for no implementation of multi word CFI write. Successful codepath not affected.
[openocd.git] / src / flash / cfi.c
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 6aad04a7ec7e14f3106752654568bae72c699834..fea75a741ff4470440c375ae3d03b9ddffdccaa0 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -45,7 +45,6 @@ int cfi_protect(struct flash_bank_s *bank, int set, int first, int last);
 int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
 int cfi_probe(struct flash_bank_s *bank);
 int cfi_auto_probe(struct flash_bank_s *bank);
-int cfi_erase_check(struct flash_bank_s *bank);
 int cfi_protect_check(struct flash_bank_s *bank);
 int cfi_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
@@ -67,7 +66,7 @@ flash_driver_t cfi_flash =
        .write = cfi_write,
        .probe = cfi_probe,
        .auto_probe = cfi_auto_probe,
-       .erase_check = cfi_erase_check,
+       .erase_check = default_flash_blank_check,
        .protect_check = cfi_protect_check,
        .info = cfi_info
 };
@@ -94,6 +93,7 @@ cfi_fixup_t cfi_jedec_fixups[] = {
        {CFI_MFR_ST, 0x00D6, cfi_fixup_non_cfi, NULL},
        {CFI_MFR_AMD, 0x2223, cfi_fixup_non_cfi, NULL},
        {CFI_MFR_AMD, 0x22ab, cfi_fixup_non_cfi, NULL},
+       {CFI_MFR_FUJITSU, 0x226b, cfi_fixup_non_cfi, NULL},
        {0, 0, NULL, NULL}
 };
 
@@ -105,6 +105,7 @@ cfi_fixup_t cfi_0002_fixups[] = {
        {CFI_MFR_SST, 0x00D7, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
        {CFI_MFR_SST, 0x2780, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
        {CFI_MFR_ATMEL, 0x00C8, cfi_fixup_atmel_reversed_erase_regions, NULL},
+       {CFI_MFR_FUJITSU, 0x226b, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
        {CFI_MFR_ANY, CFI_ID_ANY, cfi_fixup_0002_erase_regions, NULL},
        {0, 0, NULL, NULL}
 };
@@ -355,6 +356,7 @@ int cfi_read_intel_pri_ext(flash_bank_t *bank)
                target->type->write_memory(target, flash_address(bank, 0, 0x0), bank->bus_width, 1, command);
                cfi_command(bank, 0xff, command);
                target->type->write_memory(target, flash_address(bank, 0, 0x0), bank->bus_width, 1, command);
+               LOG_ERROR("Could not read bank flash bank information");
                return ERROR_FLASH_BANK_INVALID;
        }
 
@@ -408,6 +410,7 @@ int cfi_read_spansion_pri_ext(flash_bank_t *bank)
        {
                cfi_command(bank, 0xf0, command);
                target->type->write_memory(target, flash_address(bank, 0, 0x0), bank->bus_width, 1, command);
+               LOG_ERROR("Could not read spansion bank information");
                return ERROR_FLASH_BANK_INVALID;
        }
 
@@ -476,6 +479,7 @@ int cfi_read_atmel_pri_ext(flash_bank_t *bank)
        {
                cfi_command(bank, 0xf0, command);
                target->type->write_memory(target, flash_address(bank, 0, 0x0), bank->bus_width, 1, command);
+               LOG_ERROR("Could not read atmel bank information");
                return ERROR_FLASH_BANK_INVALID;
        }
 
@@ -627,7 +631,6 @@ int cfi_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **
        bank->driver_priv = cfi_info;
 
        cfi_info->write_algorithm = NULL;
-       cfi_info->erase_check_algorithm = NULL;
 
        cfi_info->x16_as_x8 = 0;
        cfi_info->jedec_probe = 0;
@@ -1735,21 +1738,25 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                        /* fall back to memory writes */
                        while (count >= bank->bus_width)
                        {
+                               int fallback;
                                if ((write_p & 0xff) == 0)
                                {
                                        LOG_INFO("Programming at %08x, count %08x bytes remaining", write_p, count);
                                }
+                               fallback = 1;
                                if ((bufferwsize > 0) && (count >= buffersize) && !(write_p & buffermask))
                                {
                                        retval = cfi_write_words(bank, buffer, bufferwsize, write_p);
-                                       if (retval != ERROR_OK)
-                                               return retval;
-
-                                       buffer += buffersize;
-                                       write_p += buffersize;
-                                       count -= buffersize;
+                                       if (retval == ERROR_OK)
+                                       {
+                                               buffer += buffersize;
+                                               write_p += buffersize;
+                                               count -= buffersize;
+                                               fallback=0;
+                                       }
                                }
-                               else
+                               /* try the slow way? */
+                               if (fallback)
                                {
                                        for (i = 0; i < bank->bus_width; i++)
                                                current_word[i] = 0;
@@ -1937,6 +1944,7 @@ int cfi_probe(struct flash_bank_s *bank)
                        target->type->write_memory(target, flash_address(bank, 0, 0x0), bank->bus_width, 1, command);
                        cfi_command(bank, 0xff, command);
                        target->type->write_memory(target, flash_address(bank, 0, 0x0), bank->bus_width, 1, command);
+                       LOG_ERROR("Could not probe bank");
                        return ERROR_FLASH_BANK_INVALID;
                }
 
@@ -2092,121 +2100,6 @@ int cfi_auto_probe(struct flash_bank_s *bank)
        return cfi_probe(bank);
 }
 
-int cfi_erase_check(struct flash_bank_s *bank)
-{
-       cfi_flash_bank_t *cfi_info = bank->driver_priv;
-       target_t *target = bank->target;
-       int i;
-       int retval;
-
-       if (bank->target->state != TARGET_HALTED)
-       {
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
-       if (!cfi_info->erase_check_algorithm)
-       {
-               u32 erase_check_code[] =
-               {
-                       0xe4d03001,     /* ldrb r3, [r0], #1    */
-                       0xe0022003, /* and r2, r2, r3           */
-                       0xe2511001, /* subs r1, r1, #1          */
-                       0x1afffffb,     /* b -4                                 */
-                       0xeafffffe      /* b 0                                  */
-               };
-
-               /* make sure we have a working area */
-               if (target_alloc_working_area(target, 20, &cfi_info->erase_check_algorithm) != ERROR_OK)
-               {
-                       LOG_WARNING("no working area available, falling back to slow memory reads");
-               }
-               else
-               {
-                       u8 erase_check_code_buf[5 * 4];
-
-                       for (i = 0; i < 5; i++)
-                               target_buffer_set_u32(target, erase_check_code_buf + (i*4), erase_check_code[i]);
-
-                       /* write algorithm code to working area */
-                       target->type->write_memory(target, cfi_info->erase_check_algorithm->address, 4, 5, erase_check_code_buf);
-               }
-       }
-
-       if (!cfi_info->erase_check_algorithm)
-       {
-               u32 *buffer = malloc(4096);
-
-               for (i = 0; i < bank->num_sectors; i++)
-               {
-                       u32 address = bank->base + bank->sectors[i].offset;
-                       u32 size = bank->sectors[i].size;
-                       u32 check = 0xffffffffU;
-                       int erased = 1;
-
-                       while (size > 0)
-                       {
-                               u32 thisrun_size = (size > 4096) ? 4096 : size;
-                               int j;
-
-                               target->type->read_memory(target, address, 4, thisrun_size / 4, (u8*)buffer);
-
-                               for (j = 0; j < thisrun_size / 4; j++)
-                                       check &= buffer[j];
-
-                               if (check != 0xffffffff)
-                               {
-                                       erased = 0;
-                                       break;
-                               }
-
-                               size -= thisrun_size;
-                               address += thisrun_size;
-                       }
-
-                       bank->sectors[i].is_erased = erased;
-               }
-
-               free(buffer);
-       }
-       else
-       {
-               for (i = 0; i < bank->num_sectors; i++)
-               {
-                       u32 address = bank->base + bank->sectors[i].offset;
-                       u32 size = bank->sectors[i].size;
-
-                       reg_param_t reg_params[3];
-                       armv4_5_algorithm_t armv4_5_info;
-
-                       armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
-                       armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
-                       armv4_5_info.core_state = ARMV4_5_STATE_ARM;
-
-                       init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
-                       buf_set_u32(reg_params[0].value, 0, 32, address);
-
-                       init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
-                       buf_set_u32(reg_params[1].value, 0, 32, size);
-
-                       init_reg_param(&reg_params[2], "r2", 32, PARAM_IN_OUT);
-                       buf_set_u32(reg_params[2].value, 0, 32, 0xff);
-
-                       if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, cfi_info->erase_check_algorithm->address, cfi_info->erase_check_algorithm->address + 0x10, 10000, &armv4_5_info)) != ERROR_OK)
-                               return ERROR_FLASH_OPERATION_FAILED;
-
-                       if (buf_get_u32(reg_params[2].value, 0, 32) == 0xff)
-                               bank->sectors[i].is_erased = 1;
-                       else
-                               bank->sectors[i].is_erased = 0;
-
-                       destroy_reg_param(&reg_params[0]);
-                       destroy_reg_param(&reg_params[1]);
-                       destroy_reg_param(&reg_params[2]);
-               }
-       }
-
-       return ERROR_OK;
-}
 
 int cfi_intel_protect_check(struct flash_bank_s *bank)
 {
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)