flash: dynamically allocate working storage

[openocd.git] / src / flash / flash.c

diff --git a/src/flash/flash.c b/src/flash/flash.c
index b960c64edd9d9c3295798f65c3084b4a8abc307f..e2136b7091772d5507c4ca9a4cf3f3967d358894 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -189,6 +189,8 @@ struct flash_bank *get_flash_bank_by_name(const char *name)
        struct flash_bank *bank;
        for (bank = flash_banks; NULL != bank; bank = bank->next)
        {
+               if (strcmp(bank->name, name) == 0)
+                       return bank;
                if (!flash_driver_name_matches(bank->driver->name, name))
                        continue;
                if (++found < requested)
@@ -239,25 +241,27 @@ COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
 
 COMMAND_HANDLER(handle_flash_bank_command)
 {
-       int retval;
-       int i;
-       int found = 0;
-       struct target *target;
-
-       if (CMD_ARGC < 6)
+       if (CMD_ARGC < 7)
        {
+               LOG_ERROR("usage: flash bank <name> <driver> "
+                               "<base> <size> <chip_width> <bus_width>");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
+       // save bank name and advance arguments for compatibility
+       const char *bank_name = *CMD_ARGV++;
+       CMD_ARGC--;
 
+       struct target *target;
        if ((target = get_target(CMD_ARGV[5])) == NULL)
        {
                LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
                return ERROR_FAIL;
        }
 
-       for (i = 0; flash_drivers[i]; i++)
+       const char *driver_name = CMD_ARGV[0];
+       for (unsigned i = 0; flash_drivers[i]; i++)
        {
-               if (strcmp(CMD_ARGV[0], flash_drivers[i]->name) != 0)
+               if (strcmp(driver_name, flash_drivers[i]->name) != 0)
                        continue;
 
                struct flash_bank *p, *c;
@@ -265,11 +269,12 @@ COMMAND_HANDLER(handle_flash_bank_command)
                /* register flash specific commands */
                if (flash_drivers[i]->register_commands(CMD_CTX) != ERROR_OK)
                {
-                       LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
+                       LOG_ERROR("couldn't register '%s' commands", driver_name);
                        return ERROR_FAIL;
                }
 
                c = malloc(sizeof(struct flash_bank));
+               c->name = strdup(bank_name);
                c->target = target;
                c->driver = flash_drivers[i];
                c->driver_priv = NULL;
@@ -281,10 +286,12 @@ COMMAND_HANDLER(handle_flash_bank_command)
                c->sectors = NULL;
                c->next = NULL;
 
+               int retval;
                retval = CALL_COMMAND_HANDLER(flash_drivers[i]->flash_bank_command, c);
                if (ERROR_OK != retval)
                {
-                       LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , CMD_ARGV[0], c->base);
+                       LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32,
+                                       driver_name, c->base);
                        free(c);
                        return retval;
                }
@@ -305,17 +312,12 @@ COMMAND_HANDLER(handle_flash_bank_command)
                        c->bank_number = 0;
                }
 
-               found = 1;
+               return ERROR_OK;
        }
 
        /* no matching flash driver found */
-       if (!found)
-       {
-               LOG_ERROR("flash driver '%s' not found", CMD_ARGV[0]);
-               return ERROR_FAIL;
-       }
-
-       return ERROR_OK;
+       LOG_ERROR("flash driver '%s' not found", driver_name);
+       return ERROR_FAIL;
 }
 
 COMMAND_HANDLER(handle_flash_info_command)
@@ -726,24 +728,40 @@ COMMAND_HANDLER(handle_flash_fill_command)
        uint32_t address;
        uint32_t pattern;
        uint32_t count;
-       uint8_t chunk[1024];
-       uint8_t readback[1024];
        uint32_t wrote = 0;
        uint32_t cur_size = 0;
        uint32_t chunk_count;
        struct target *target = get_current_target(CMD_CTX);
        uint32_t i;
        uint32_t wordsize;
+       int retval = ERROR_OK;
+
+       static size_t const chunksize = 1024;
+       uint8_t *chunk = malloc(chunksize);
+       if (chunk == NULL)
+               return ERROR_FAIL;
+
+       uint8_t *readback = malloc(chunksize);
+       if (readback == NULL)
+       {
+               free(chunk);
+               return ERROR_FAIL;
+       }
+
 
        if (CMD_ARGC != 3)
-               return ERROR_COMMAND_SYNTAX_ERROR;
+       {
+               retval = ERROR_COMMAND_SYNTAX_ERROR;
+               goto done;
+       }
+
 
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], pattern);
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count);
 
        if (count == 0)
-               return ERROR_OK;
+               goto done;
 
        switch (CMD_NAME[4])
        {
@@ -757,10 +775,11 @@ COMMAND_HANDLER(handle_flash_fill_command)
                wordsize = 1;
                break;
        default:
-               return ERROR_COMMAND_SYNTAX_ERROR;
+               retval = ERROR_COMMAND_SYNTAX_ERROR;
+               goto done;
        }
 
-       chunk_count = MIN(count, (1024 / wordsize));
+       chunk_count = MIN(count, (chunksize / wordsize));
        switch (wordsize)
        {
        case 4:
@@ -793,15 +812,22 @@ COMMAND_HANDLER(handle_flash_fill_command)
                bank = get_flash_bank_by_addr(target, address);
                if (bank == NULL)
                {
-                       return ERROR_FAIL;
+                       retval = ERROR_FAIL;
+                       goto done;
                }
                err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size);
                if (err != ERROR_OK)
-                       return err;
+               {
+                       retval = err;
+                       goto done;
+               }
 
                err = target_read_buffer(target, address + wrote, cur_size, readback);
                if (err != ERROR_OK)
-                       return err;
+               {
+                       retval = err;
+                       goto done;
+               }
 
                unsigned i;
                for (i = 0; i < cur_size; i++)
@@ -810,7 +836,8 @@ COMMAND_HANDLER(handle_flash_fill_command)
                        {
                                LOG_ERROR("Verfication error address 0x%08" PRIx32 ", read back 0x%02x, expected 0x%02x",
                                                  address + wrote + i, readback[i], chunk[i]);
-                               return ERROR_FAIL;
+                               retval = ERROR_FAIL;
+                               goto done;
                        }
                }
        }
@@ -821,7 +848,12 @@ COMMAND_HANDLER(handle_flash_fill_command)
                                " in %fs (%0.3f kb/s)", wrote, address,
                                duration_elapsed(&bench), duration_kbps(&bench, wrote));
        }
-       return ERROR_OK;
+
+       done:
+       free(readback);
+       free(chunk);
+
+       return retval;
 }
 
 COMMAND_HANDLER(handle_flash_write_bank_command)
@@ -1150,10 +1182,10 @@ int flash_write(struct target *target, struct image *image, uint32_t *written, i
 int default_flash_mem_blank_check(struct flash_bank *bank)
 {
        struct target *target = bank->target;
-       uint8_t buffer[1024];
-       int buffer_size = sizeof(buffer);
+       const int buffer_size = 1024;
        int i;
        uint32_t nBytes;
+       int retval = ERROR_OK;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -1161,6 +1193,8 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
                return ERROR_TARGET_NOT_HALTED;
        }
 
+       uint8_t *buffer = malloc(buffer_size);
+
        for (i = 0; i < bank->num_sectors; i++)
        {
                uint32_t j;
@@ -1169,7 +1203,6 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
                for (j = 0; j < bank->sectors[i].size; j += buffer_size)
                {
                        uint32_t chunk;
-                       int retval;
                        chunk = buffer_size;
                        if (chunk > (j - bank->sectors[i].size))
                        {
@@ -1178,7 +1211,9 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
 
                        retval = target_read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer);
                        if (retval != ERROR_OK)
-                               return retval;
+                       {
+                               goto done;
+                       }
 
                        for (nBytes = 0; nBytes < chunk; nBytes++)
                        {
@@ -1191,7 +1226,10 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
                }
        }
 
-       return ERROR_OK;
+       done:
+       free(buffer);
+
+       return retval;
 }
 
 int default_flash_blank_check(struct flash_bank *bank)