Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor/stellaris: Remove unnecessary write_algorithm check
[openocd.git] / src / flash / nor / stellaris.c
diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index 712077da233d35c9f20818b35961c3688d3e7d93..6721395bb211d211512d1a6c2adf8a8c4623db2c 100644 (file)
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include "jtag/interface.h"
 #include "imp.h"
 #include <target/algorithm.h>
 #include <target/armv7m.h>
@@ -958,43 +959,41 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
 /* see contib/loaders/flash/stellaris.s for src */
 
 static const uint8_t stellaris_write_code[] = {
-/*
-       Call with :
-       r0 = buffer address
-       r1 = destination address
-       r2 = bytecount (in) - endaddr (work)
-
-       Used registers:
-       r3 = pFLASH_CTRL_BASE
-       r4 = FLASHWRITECMD
-       r5 = #1
-       r6 = bytes written
-       r7 = temp reg
-*/
-       0x07, 0x4B,                     /* ldr r3,pFLASH_CTRL_BASE */
-       0x08, 0x4C,                     /* ldr r4,FLASHWRITECMD */
-       0x01, 0x25,                     /* movs r5, 1 */
-       0x00, 0x26,                     /* movs r6, #0 */
-/* mainloop: */
-       0x19, 0x60,                     /* str  r1, [r3, #0] */
-       0x87, 0x59,                     /* ldr  r7, [r0, r6] */
-       0x5F, 0x60,                     /* str  r7, [r3, #4] */
-       0x9C, 0x60,                     /* str  r4, [r3, #8] */
-/* waitloop: */
-       0x9F, 0x68,                     /* ldr  r7, [r3, #8] */
-       0x2F, 0x42,                     /* tst  r7, r5 */
-       0xFC, 0xD1,                     /* bne  waitloop */
-       0x04, 0x31,                     /* adds r1, r1, #4 */
-       0x04, 0x36,                     /* adds r6, r6, #4 */
-       0x96, 0x42,                     /* cmp  r6, r2 */
-       0xF4, 0xD1,                     /* bne  mainloop */
-       0x00, 0xBE,                     /* bkpt #0 */
-/* pFLASH_CTRL_BASE: */
+                                                               /* write: */
+       0xDF, 0xF8, 0x40, 0x40,         /* ldr          r4, pFLASH_CTRL_BASE */
+       0xDF, 0xF8, 0x40, 0x50,         /* ldr          r5, FLASHWRITECMD */
+                                                               /* wait_fifo: */
+       0xD0, 0xF8, 0x00, 0x80,         /* ldr          r8, [r0, #0] */
+       0xB8, 0xF1, 0x00, 0x0F,         /* cmp          r8, #0 */
+       0x17, 0xD0,                                     /* beq          exit */
+       0x47, 0x68,                                     /* ldr          r7, [r0, #4] */
+       0x47, 0x45,                                     /* cmp          r7, r8 */
+       0xF7, 0xD0,                                     /* beq          wait_fifo */
+                                                               /* mainloop: */
+       0x22, 0x60,                                     /* str          r2, [r4, #0] */
+       0x02, 0xF1, 0x04, 0x02,         /* add          r2, r2, #4 */
+       0x57, 0xF8, 0x04, 0x8B,         /* ldr          r8, [r7], #4 */
+       0xC4, 0xF8, 0x04, 0x80,         /* str          r8, [r4, #4] */
+       0xA5, 0x60,                                     /* str          r5, [r4, #8] */
+                                                               /* busy: */
+       0xD4, 0xF8, 0x08, 0x80,         /* ldr          r8, [r4, #8] */
+       0x18, 0xF0, 0x01, 0x0F,         /* tst          r8, #1 */
+       0xFA, 0xD1,                                     /* bne          busy */
+       0x8F, 0x42,                                     /* cmp          r7, r1 */
+       0x28, 0xBF,                                     /* it           cs */
+       0x00, 0xF1, 0x08, 0x07,         /* addcs        r7, r0, #8 */
+       0x47, 0x60,                                     /* str          r7, [r0, #4] */
+       0x01, 0x3B,                                     /* subs         r3, r3, #1 */
+       0x03, 0xB1,                                     /* cbz          r3, exit */
+       0xE2, 0xE7,                                     /* b            wait_fifo */
+                                                               /* exit: */
+       0x00, 0xBE,                                     /* bkpt         #0 */
+
+       /* pFLASH_CTRL_BASE: */
        0x00, 0xD0, 0x0F, 0x40, /* .word        0x400FD000 */
-/* FLASHWRITECMD: */
+       /* FLASHWRITECMD: */
        0x01, 0x00, 0x42, 0xA4  /* .word        0xA4420001 */
 };
-
 static int stellaris_write_block(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t wcount)
 {
@@ -1003,7 +1002,7 @@ static int stellaris_write_block(struct flash_bank *bank,
        struct working_area *source;
        struct working_area *write_algorithm;
        uint32_t address = bank->base + offset;
-       struct reg_param reg_params[3];
+       struct reg_param reg_params[4];
        struct armv7m_algorithm armv7m_info;
        int retval = ERROR_OK;
 
@@ -1039,7 +1038,7 @@ static int stellaris_write_block(struct flash_bank *bank,
                                target_name(target), (unsigned) buffer_size);
        };
 
-       retval = target_write_buffer(target, write_algorithm->address,
+       target_write_buffer(target, write_algorithm->address,
                        sizeof(stellaris_write_code),
                        (uint8_t *) stellaris_write_code);
 
@@ -1049,39 +1048,22 @@ static int stellaris_write_block(struct flash_bank *bank,
        init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
        init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
+       init_reg_param(&reg_params[3], "r3", 32, PARAM_OUT);
 
-       while (wcount > 0) {
-               uint32_t thisrun_count = (wcount > (buffer_size / 4)) ? (buffer_size / 4) : wcount;
-
-               target_write_buffer(target, source->address, thisrun_count * 4, buffer);
-
-               buf_set_u32(reg_params[0].value, 0, 32, source->address);
-               buf_set_u32(reg_params[1].value, 0, 32, address);
-               buf_set_u32(reg_params[2].value, 0, 32, 4*thisrun_count);
-               LOG_DEBUG("Algorithm flash write %u words to 0x%" PRIx32
-                               ", %u remaining",
-                               (unsigned) thisrun_count, address,
-                               (unsigned) (wcount - thisrun_count));
-               retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
-                               write_algorithm->address,
-                               0,
-                               10000, &armv7m_info);
-               if (retval != ERROR_OK) {
-                       LOG_ERROR("error %d executing stellaris "
-                                       "flash write algorithm",
-                                       retval);
-                       retval = ERROR_FLASH_OPERATION_FAILED;
-                       break;
-               }
+       buf_set_u32(reg_params[0].value, 0, 32, source->address);
+       buf_set_u32(reg_params[1].value, 0, 32, source->address + source->size);
+       buf_set_u32(reg_params[2].value, 0, 32, address);
+       buf_set_u32(reg_params[3].value, 0, 32, wcount);
 
-               buffer += thisrun_count * 4;
-               address += thisrun_count * 4;
-               wcount -= thisrun_count;
-       }
+       retval = target_run_flash_async_algorithm(target, buffer, wcount, 4,
+                       0, NULL,
+                       4, reg_params,
+                       source->address, source->size,
+                       write_algorithm->address, 0,
+                       &armv7m_info);
 
-       /* REVISIT we could speed up writing multi-section images by
-        * not freeing the initialized write_algorithm this way.
-        */
+       if (retval == ERROR_FLASH_OPERATION_FAILED)
+               LOG_ERROR("error %d executing stellaris flash write algorithm", retval);
 
        target_free_working_area(target, write_algorithm);
        target_free_working_area(target, source);
@@ -1089,6 +1071,7 @@ static int stellaris_write_block(struct flash_bank *bank,
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
        destroy_reg_param(&reg_params[2]);
+       destroy_reg_param(&reg_params[3]);
 
        return retval;
 }
@@ -1347,7 +1330,7 @@ COMMAND_HANDLER(stellaris_handle_recover_command)
                LOG_ERROR("Can't recover Stellaris flash without SRST");
                return ERROR_FAIL;
        }
-       jtag_add_reset(0, 1);
+       adapter_assert_reset();
 
        for (int i = 0; i < 5; i++) {
                retval = dap_to_swd(bank->target);
@@ -1360,7 +1343,7 @@ COMMAND_HANDLER(stellaris_handle_recover_command)
        }
 
        /* de-assert SRST */
-       jtag_add_reset(0, 0);
+       adapter_deassert_reset();
        retval = jtag_execute_queue();
 
        /* wait 400+ msec ... OK, "1+ second" is simpler */
@@ -1414,7 +1397,7 @@ struct flash_driver stellaris_flash = {
        .read = default_flash_read,
        .probe = stellaris_probe,
        .auto_probe = stellaris_probe,
-       .erase_check = default_flash_mem_blank_check,
+       .erase_check = default_flash_blank_check,
        .protect_check = stellaris_protect_check,
        .info = get_stellaris_info,
 };
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)