Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
src: add loader src description
[openocd.git] / src / flash / nor / str9x.c
diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index d0c1278f572f9f35d4d9742ac267e75b8c19bed0..1e71753e67edc5110100dc6af989ba438886b79a 100644 (file)
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -223,6 +223,7 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
        uint32_t adr;
        uint8_t status;
        uint8_t erase_cmd;
+       int total_timeout;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -230,16 +231,27 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /*A slower but stable way of erasing*/
-       /* Erase sector command */
-       erase_cmd = 0x20;
+       /* Check if we can erase whole bank */
+       if ((first == 0) && (last == (bank->num_sectors - 1)))
+       {
+               /* Optimize to run erase bank command instead of sector */
+               erase_cmd = 0x80;
+                /* Add timeout duration since erase bank takes more time */
+               total_timeout = 1000 * bank->num_sectors;
+       }
+       else
+       {
+               /* Erase sector command */
+               erase_cmd = 0x20;
+               total_timeout = 1000;
+       }
 
        for (i = first; i <= last; i++)
        {
                int retval;
                adr = bank->base + bank->sectors[i].offset;
 
-               /* erase sectors */
+               /* erase sectors or block */
                if ((retval = target_write_u16(target, adr, erase_cmd)) != ERROR_OK)
                {
                        return retval;
@@ -256,7 +268,8 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                }
 
                int timeout;
-               for (timeout = 0; timeout < 1000; timeout++) {
+               for (timeout = 0; timeout < total_timeout; timeout++) 
+               {
                        if ((retval = target_read_u8(target, adr, &status)) != ERROR_OK)
                        {
                                return retval;
@@ -265,7 +278,7 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                                break;
                        alive_sleep(1);
                }
-               if (timeout == 1000)
+               if (timeout == total_timeout)
                {
                        LOG_ERROR("erase timed out");
                        return ERROR_FAIL;
@@ -288,6 +301,10 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                        LOG_ERROR("error erasing flash bank, status: 0x%x", status);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
+
+               /* If we ran erase bank command, we are finished */
+               if (erase_cmd == 0x80)
+                       break;
        }
 
        for (i = first; i <= last; i++)
@@ -340,14 +357,16 @@ static int str9x_write_block(struct flash_bank *bank,
 {
        struct str9x_flash_bank *str9x_info = bank->driver_priv;
        struct target *target = bank->target;
-       uint32_t buffer_size = 8192;
+       uint32_t buffer_size = 32768;
        struct working_area *source;
        uint32_t address = bank->base + offset;
        struct reg_param reg_params[4];
        struct arm_algorithm armv4_5_info;
        int retval = ERROR_OK;
 
-       uint32_t str9x_flash_write_code[] = {
+       /* see contib/loaders/flash/str9x.s for src */
+
+       static const uint32_t str9x_flash_write_code[] = {
                                        /* write:                               */
                0xe3c14003,     /*      bic     r4, r1, #3              */
                0xe3a03040,     /*      mov     r3, #0x40               */
@@ -369,25 +388,29 @@ static int str9x_write_block(struct flash_bank *bank,
                0xe2522001,     /*      subs r2, r2, #1         */
                0x1affffed,     /*      bne write                       */
                                        /* exit:                                */
-               0xeafffffe,     /*      b exit                          */
+               0xe1200070,     /*      bkpt #0                         */
        };
 
        /* flash write code */
-       if (target_alloc_working_area(target, 4 * 19, &str9x_info->write_algorithm) != ERROR_OK)
+       if (target_alloc_working_area(target, sizeof(str9x_flash_write_code),
+                       &str9x_info->write_algorithm) != ERROR_OK)
        {
                LOG_WARNING("no working area available, can't do block memory writes");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        };
 
-       target_write_buffer(target, str9x_info->write_algorithm->address, 19 * 4, (uint8_t*)str9x_flash_write_code);
+       target_write_buffer(target, str9x_info->write_algorithm->address,
+                       sizeof(str9x_flash_write_code),
+                       (uint8_t*)str9x_flash_write_code);
 
        /* memory buffer */
-       while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)
+       while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK)
        {
                buffer_size /= 2;
                if (buffer_size <= 256)
                {
-                       /* if we already allocated the writing code, but failed to get a buffer, free the algorithm */
+                       /* if we already allocated the writing code, but failed to get a
+                        * buffer, free the algorithm */
                        if (str9x_info->write_algorithm)
                                target_free_working_area(target, str9x_info->write_algorithm);
 
@@ -415,7 +438,9 @@ static int str9x_write_block(struct flash_bank *bank,
                buf_set_u32(reg_params[1].value, 0, 32, address);
                buf_set_u32(reg_params[2].value, 0, 32, thisrun_count);
 
-               if ((retval = target_run_algorithm(target, 0, NULL, 4, reg_params, str9x_info->write_algorithm->address, str9x_info->write_algorithm->address + (18 * 4), 10000, &armv4_5_info)) != ERROR_OK)
+               if ((retval = target_run_algorithm(target, 0, NULL, 4, reg_params,
+                               str9x_info->write_algorithm->address,
+                               0, 10000, &armv4_5_info)) != ERROR_OK)
                {
                        LOG_ERROR("error executing str9x flash write algorithm");
                        retval = ERROR_FLASH_OPERATION_FAILED;
@@ -557,7 +582,7 @@ static int str9x_write(struct flash_bank *bank,
        if (bytes_remaining)
        {
                uint8_t last_halfword[2] = {0xff, 0xff};
-               int i = 0;
+               i = 0;
 
                while (bytes_remaining > 0)
                {
@@ -614,7 +639,7 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
 }
 #endif
 
-static int str9x_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_str9x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "str9x flash driver info");
        return ERROR_OK;
@@ -668,7 +693,7 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
 static const struct command_registration str9x_config_command_handlers[] = {
        {
                .name = "flash_config",
-               .handler = &str9x_handle_flash_config_command,
+               .handler = str9x_handle_flash_config_command,
                .mode = COMMAND_EXEC,
                .help = "Configure str9x flash controller, prior to "
                        "programming the flash.",
@@ -676,6 +701,7 @@ static const struct command_registration str9x_config_command_handlers[] = {
        },
        COMMAND_REGISTRATION_DONE
 };
+
 static const struct command_registration str9x_command_handlers[] = {
        {
                .name = "str9x",
@@ -687,15 +713,16 @@ static const struct command_registration str9x_command_handlers[] = {
 };
 
 struct flash_driver str9x_flash = {
-               .name = "str9x",
-               .commands = str9x_command_handlers,
-               .flash_bank_command = &str9x_flash_bank_command,
-               .erase = &str9x_erase,
-               .protect = &str9x_protect,
-               .write = &str9x_write,
-               .probe = &str9x_probe,
-               .auto_probe = &str9x_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &str9x_protect_check,
-               .info = &str9x_info,
-       };
+       .name = "str9x",
+       .commands = str9x_command_handlers,
+       .flash_bank_command = str9x_flash_bank_command,
+       .erase = str9x_erase,
+       .protect = str9x_protect,
+       .write = str9x_write,
+       .read = default_flash_read,
+       .probe = str9x_probe,
+       .auto_probe = str9x_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = str9x_protect_check,
+       .info = get_str9x_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)